From: Alex Sadleir Date: Mon, 09 Sep 2013 12:36:10 +0000 Subject: Update HTML package output to interim metadata standard X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=dacdcdce2850dc15baa1644b98eae39d1aa42f98 --- Update HTML package output to interim metadata standard --- --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,22 +1,31 @@ + + + - + + + + + + - + - - - - + + + + - + + - @@ -354,11 +339,19 @@ - + + + + + @@ -501,17 +494,17 @@ - - + + - + - + @@ -584,96 +577,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + - + --- a/ckanext/datagovau/templates/package/read.html +++ b/ckanext/datagovau/templates/package/read.html @@ -1,44 +1,160 @@ {% ckan_extends %} {% block package_additional_info %} -{{ super() }} +
+

{{ _('Additional Info') }}

+ + + + + + + + -{# Add our custom field to the dataset read page. #} -{% if pkg.get('agency_program') %} -
-

Agency Program: {{ pkg.agency_program }}

+ + {# Add our custom field to the dataset read page. #} + {% if pkg.get('metadata_created') %} +
+ + + + {% endif %} + {% if pkg.get('metadata_updated') %} + + + + + {% endif %} + {% if pkg.get('agency_program') %} + + + + + {% endif %} + {% if pkg.get('Agency Program') %} + + + + + {% endif %} + {% if pkg.get('DCTERMS.Source.URI') %} + + + + + {% endif %} + + {% if pkg.get('contact_point') %} + + + + + {% endif %} + {% if pkg.get('spatial_coverage') %} + + + + + + {% endif %} + {% if pkg.get('Geospatial Coverage') %} + + + + + + {% endif %} + {% if pkg.get('granularity') %} + + + + + + {% endif %} + {% if pkg.get('Granularity') %} + + + + + + {% endif %} + {% if pkg.get('jurisdiction') %} + + + + + + {% endif %} + {% if pkg.get('AGLSTERMS.Jurisdiction') %} + + + + + + {% endif %} + {% if pkg.get('temporal_coverage') %} + + + + + + {% endif %} + {% if pkg.get('Temporal Coverage') %} + + + + + + {% endif %} + {% if pkg.get('data_state') %} + + + + + + {% endif %} + {% if pkg.get('update_freq') %} + + + + + + {% endif %} + {% if pkg.get('Update Frequency') %} + + + + + {% endif %} + + {% if pkg.maintainer_email %} + + + + + {% elif pkg.maintainer %} + + + + + {% endif %} + + +
{{ _('Field') }}{{ _('Value') }}
Date Published{{ pkg.metadata_created.split("T")[0] }}
Date Updated{{ pkg.metadata_updated.split("T")[0] }}
Agency Program {{ pkg.agency_program }}
Agency Program {{ pkg.get('Agency Program') }}
{{ _('Source') }}{{ h.link_to(pkg.get('DCTERMS.Source.URI'), + pkg.get('DCTERMS.Source.URI'), rel='dct:source', target='_blank') }} +
Contact Point {{ h.mail_to(email_address=pkg.contact_point, + name=pkg.contact_point) }}
Geospatial Coverage {{ pkg.spatial_coverage }}
Geospatial Coverage {{ pkg.get('Geospatial Coverage') }}
Data Granularity {{ pkg.granularity }}
Data Granularity {{ pkg.get('Granularity') }}
Government Jurisdiction {{ pkg.jurisdiction }}
Government Jurisdiction {{ pkg.get('AGLSTERMS.Jurisdiction') }}
Temporal Coverage {{ pkg.temporal_coverage }}
Temporal Coverage {{ pkg.get('Temporal Coverage') }}
Data State {{ pkg.data_state }}
Update Frequency {{ pkg.update_freq }}
Update Frequency {{ pkg.get('Update Frequency') }}
{{ _('Maintainer') }}{{ + h.mail_to(email_address=pkg.maintainer_email, name=pkg.maintainer) }} +
{{ _('Maintainer') }}{{ pkg.maintainer }}
-{% endif %} -{% if pkg.get('contact_point') %} -
-

Contact Point: {{ pkg.contact_point }}

-
-{% endif %} -{% if pkg.get('spatial_coverage') %} -
-

Geospatial Coverage: {{ pkg.spatial_coverage }}

-{% endif %} -{% if pkg.get('granularity') %} -
-

Data Granularity: {{ pkg.granularity }}

-{% endif %} -{% if pkg.get('jurisdiction') %} -
-

Government Jurisdiction: {{ pkg.jurisdiction }}

-{% endif %} -{% if pkg.get('temporal_coverage') %} -
-

Temporal Coverage: {{ pkg.temporal_coverage }}

-{% endif %} -{% if pkg.get('data_state') %} -
-

Data State: {{ pkg.data_state }}

-{% endif %} -{% if pkg.get('update_freq') %} -
-

Update Frequency: {{ pkg.update_freq }}

-{% endif %} {% endblock %} --- a/ckanext/datagovau/templates/package/read.rdf +++ b/ckanext/datagovau/templates/package/read.rdf @@ -16,7 +16,8 @@ ${c.pkg_dict['name']} ${c.pkg_dict['title']} - + Dataset ${c.pkg_dict['notes']} @@ -28,13 +29,11 @@ ${ tag_dict["name"] } - ${ tag_dict["title"] } + ${ group_dict["title"] } - ${h.get_action("user_show",{"id":c.author})["display_name"]} - ${h.get_action("user_show",{"id":c.author})["email"]} - - + ${c.pkg_dict['name']} @@ -47,8 +46,8 @@ ${rsc_dict.get('revision_timestamp')} ${rsc_dict.get('revision_timestamp')} - ${rsc_dict.get('size')} - ${rsc_dict.get('mimetype')} + ${rsc_dict.get('size')} + ${rsc_dict.get('mimetype')} ${rsc_dict.get('size')} bytes @@ -60,25 +59,83 @@ - + ${ c.pkg_dict['organization']['title'] } - + - ${ c.pkg_dict['author'] } - + ${ c.pkg_dict['organization']['title'] } - + - ${ c.pkg_dict['maintainer'] } - + ${h.get_action("user_show",{"id":username})["display_name"]} + + + ${c.pkg_dict.get('DCTERMS.Source.URI') } + + + ${c.pkg_dict.contact_point } + ${ c.pkg_dict.spatial_coverage } + ${ c.pkg_dict.get('Geospatial Coverage') } + ${ c.pkg_dict.jurisdiction } + ${ c.pkg_dict.get('AGLSTERMS.Jurisdiction') } + ${ c.pkg_dict.temporal_coverage } + ${ c.pkg_dict.get('Temporal Coverage') } + + + Data State + ${ c.pkg_dict.get('data_state') } + + + + + + Update Frequency + ${ c.pkg_dict.get('update_freq') } + + + + + Update Frequency + ${ c.pkg_dict.get('Update Frequency') } + + + + + + Agency Program + ${ c.pkg_dict.get('Agency Program') } + + + + + Agency Program + ${ c.pkg_dict.get('agency_program') } + + + + + + Data Granularity + ${ c.pkg_dict.get('Granularity') } + + + + + Data Granularity + ${ c.pkg_dict.get('granularity') } + + + --- a/ckanext/datagovau/templates/package/read_base.html +++ b/ckanext/datagovau/templates/package/read_base.html @@ -1,15 +1,28 @@ {% ckan_extends %} - -{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %} {% block links -%} {{ super() }} - {% endblock -%} {% block head_extras -%} {{ super() }} - {% endblock -%} +{% block package_info %} +
+
+

{{ pkg.title or pkg.name }}

+
+
+
{{ _('Followers') }}
+
{{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}
+
+
+ +
+
+{% endblock %} + --- a/ckanext/datagovau/templates/package/snippets/package_basic_fields.html +++ b/ckanext/datagovau/templates/package/snippets/package_basic_fields.html @@ -28,9 +28,8 @@ placeholder=_('The timespan the dataset relates to: Current, 2008, 2008-2012, Jan 2012'), value=data.temporal_coverage, error=errors.temporal_coverage, classes=['control-medium']) }} -{{ form.input('data_state', label=_('Data State'), id='field-data_state', -placeholder=_('Active or Inactive'), -value=data.data_state, error=errors.data_state, classes=['control-medium']) }} +{{ form.select('data_state', label=_('Data State'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], +selected='Active', error=errors.data_state) }} {{ form.input('update_freq', label=_('Update Frequency'), id='field-update_freq', placeholder=_('How often the dataset is updated. Eg: Daily, Weekly, Never'), --- a/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html +++ b/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html @@ -16,3 +16,27 @@ {% endblock %} +{% block package_metadata_author %} +{% endblock %} + +{% block package_metadata_fields_maintainer %} +{% endblock %} + +{% block dataset_fields %} +{% if data.groups %} +
+ +
+ {% for group in data.groups %} + + {% endfor %} +
+
+{% endif %} +{% set group_name = 'groups__%s__id' % data.groups|length %} +{% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %} +{{ form.input(group_name, label=_('Add Group/Theme'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }} +{% endblock %}