gitphp 0.2.9.1 :: ckanext-datagovau.git/commitdiff

Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-datagovau

2 files changed: (show all)
ckanext/datagovau/templates/header.html
ckanext/datagovau/templates/package/snippets/resource_form.html

file:a/ckanext/datagovau/templates/header.html -> file:b/ckanext/datagovau/templates/header.html

{% ckan_extends %}	{% ckan_extends %}

	{% block header_account_logged %}
	{% if c.userobj.sysadmin %}
	<li>
	<a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
	<i class="icon-legal"> Sysadmin settings</i>
	</a>
	</li>
	{% endif %}
	<li>
	<a href="{{ h.url_for(controller='user', action='read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
	{{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
	<span class="username">{{ c.userobj.display_name }}</span>
	</a>
	</li>
	{% set new_activities = h.new_activities() %}
	<li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
	{% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities) %}
	<a href="{{ h.url_for(controller='user', action='dashboard') }}" title="{{ notifications_tooltip }}">
	<i class="icon-dashboard"> notifications_tooltip</i>
	<span>{{ new_activities }}</span>
	</a>
	</li>
	{% block header_account_settings_link %}
	<li>
	<a href="{{ h.url_for(controller='user', action='edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
	<i class="icon-cog"> Edit settings</i>
	</a>
	</li>
	{% endblock %}
	{% block header_account_log_out_link %}
	<li>
	<a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
	<i class="icon-signout"> Log out</i>
	</a>
	</li>
	{% endblock %}

{% block header_site_navigation %}	{% block header_site_navigation %}
<nav class="section navigation">	<nav class="section navigation">
<ul class="nav nav-pills">	<ul class="nav nav-pills">
{% block header_site_navigation_tabs %}	{% block header_site_navigation_tabs %}
{{ h.build_nav_main(	{{ h.build_nav_main(
('search', _('Datasets')),	('search', _('Datasets')),
('organizations_index', _('Organizations')),	('organizations_index', _('Organizations')),
('about', _('About')),	('about', _('About')),
('stats', _('Site Statistics'))	('stats', _('Site Statistics'))
) }}	) }}
<li><a href="/related">Use Cases</a></li>	<li><a href="/related">Use Cases</a></li>
<li><a href="https://datagovau.ideascale.com/">Feedback/Request Data</a></li>	<li><a href="https://datagovau.ideascale.com/">Feedback/Request Data</a></li>
{% endblock %}	{% endblock %}
</ul>	</ul>
</nav>	</nav>
{% endblock %}	{% endblock %}

file:a/ckanext/datagovau/templates/package/snippets/resource_form.html -> file:b/ckanext/datagovau/templates/package/snippets/resource_form.html

{% ckan_extends %}	{% ckan_extends %}

{% block basic_fields_url %}	{% block basic_fields_url %}
{% set is_upload = (data.url_type == 'upload') %}	{% set is_upload = (data.url_type == 'upload') %}
{% set field_url='url' %}	{% set field_url='url' %}
{% set field_upload='upload' %}	{% set field_upload='upload' %}
{% set field_clear='clear_upload' %}	{% set field_clear='clear_upload' %}
{% set is_upload_enabled=h.uploads_enabled() %}	{% set is_upload_enabled=h.uploads_enabled() %}
{% set is_url=data.url and not is_upload %}	{% set is_url=data.url and not is_upload %}
{% set upload_label=_('File') %}	{% set upload_label=_('File') %}
{% set url_label=_('URL') %}	{% set url_label=_('URL') %}

{% set placeholder = placeholder if placeholder else _('http://example.com/my-image.jpg') %}	{% set placeholder = placeholder if placeholder else _('http://example.com/my-image.jpg') %}
{% set url_label = url_label or _('Image URL') %}	{% set url_label = url_label or _('Image URL') %}
{% set upload_label = upload_label or _('Image') %}	{% set upload_label = upload_label or _('Image') %}

{% if is_upload_enabled %}	{% if is_upload_enabled %}
<div class="image-upload" data-module="image-upload" data-module-is_url="{{ 'true' if is_url else 'false' }}" data-module-is_upload="{{ 'true' if is_upload else 'false' }}"	<div class="image-upload" data-module="image-upload" data-module-is_url="{{ 'true' if is_url else 'false' }}" data-module-is_upload="{{ 'true' if is_upload else 'false' }}"
data-module-field_url="{{ field_url }}" data-module-field_upload="{{ field_upload }}" data-module-field_clear="{{ field_clear }}" data-module-upload_label="{{ upload_label }}">	data-module-field_url="{{ field_url }}" data-module-field_upload="{{ field_upload }}" data-module-field_clear="{{ field_clear }}" data-module-upload_label="{{ upload_label }}">
{% endif %}	{% endif %}

{% call form.input(field_url, label=url_label, id='field-image-url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) %}	{% call form.input(field_url, label=url_label, id='field-image-url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) %}
<span id="autoupdate_form">	<span id="autoupdate_form">
{% call form.select('autoupdate', label=_('Generate API from this Link'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], selected='Active', error=errors.autoupdate) %}	{% call form.select('autoupdate', label=_('Generate API from this Link'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], selected='Inactive', error=errors.autoupdate) %}
<br/>	<br/>
Where a file is compatible with either CKAN or GeoServer we will attempt to make a functional end-point for this resource. The link provided above will also be checked for a new version based on the update frequency as set at the dataset level.	Where a file is compatible with either CKAN or GeoServer we will attempt to make a functional end-point for this resource. The link provided above will also be checked for a new version based on the update frequency as set at the dataset level.
</span>	</span>
{% endcall %}	{% endcall %}
{% endcall %}	{% endcall %}

{% if is_upload_enabled %}	{% if is_upload_enabled %}
{{ form.input(field_upload, label=upload_label, id='field-image-upload', type='file', placeholder='', value='', error='', classes=['control-full']) }}	{{ form.input(field_upload, label=upload_label, id='field-image-upload', type='file', placeholder='', value='', error='', classes=['control-full']) }}
{% if is_upload %}	{% if is_upload %}
{{form.checkbox(field_clear, label=_('Clear Upload'), id='field-clear-upload', value='true', error='', classes=['control-full']) }}	{{form.checkbox(field_clear, label=_('Clear Upload'), id='field-clear-upload', value='true', error='', classes=['control-full']) }}
{% endif %}	{% endif %}
{% endif %}	{% endif %}

{% if is_upload_enabled %}</div>{% endif %}	{% if is_upload_enabled %}</div>{% endif %}


{% endblock %}	{% endblock %}