Remove old extras, include more RDFa markup for distributions/data resources
[ckanext-datagovau.git] / ckanext / datagovau / templates / package / resource_read.html
blob:a/ckanext/datagovau/templates/package/resource_read.html -> blob:b/ckanext/datagovau/templates/package/resource_read.html
--- a/ckanext/datagovau/templates/package/resource_read.html
+++ b/ckanext/datagovau/templates/package/resource_read.html
@@ -14,11 +14,11 @@
 <meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
 <meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{res['revision_timestamp']}}" />
 <meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{res['created']}}" />
-{% if  h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %}
+<meta name="DCTERMS.Source.URI" content="{{pkg.url}}" />{% endif %}
 <meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
-<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" />
-<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" />
-<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" />
+<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage}}" />
+<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage}}" />
+<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction}}" />
 <meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" />
 <meta name="DCAT.byteSize" content="{{res.get('size')}}" />
 <meta name="DCAT.mediaType" content="{{res.get('mimetype')}}" />
@@ -26,7 +26,6 @@
 <meta name="DCTERMS.Title" content="{{res['name']}}" />
 <meta name="DCTERMS.Description" scheme="" content="{{res['description']}}" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
 <meta name="DCTERMS.Format" content="{{res.format}}" />
 <meta name="DCTERMS.File.Size" content="{{res.size}}" />