Move API google analytics and AGLS metadata to seperate extensions
Move API google analytics and AGLS metadata to seperate extensions

file:a/README.rst -> file:b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -2,15 +2,12 @@
 
 It comprises:
 
-* A CKAN Extension "plugin" at ``ckanext/datagovau/plugin.py`` which, when
-  loaded, overrides various settings in the core ``ini``-file to provide:
-  * A path to local customisations of the core templates to include AGLS/Dublin Core minimum metadata
-  * A custom Package edit form that defaults to cc-by licence
-  * A custom n3/rdf output format
-  * Replaces links with http/https protocol independent versions
-  * Provides HTML to users to embed data previews on their own website
+* A custom Package edit form that defaults to cc-by licence
+* Replaces links with http/https protocol independent versions
+* Provides HTML to users to embed data previews on their own website
+* A cut down licenses.json file
 
-* A cut down licenses.json file
+This extension is complimented by ckanext-agls for AGLS metadata and ckanext-googleanalytics for Google Analytics tracking of API usage
 
 Installation
 ============

--- a/ckanext/datagovau/controller.py
+++ /dev/null
@@ -1,84 +1,1 @@
-import urllib
-import json
-from pprint import pprint
-import logging
-import ckan.logic as logic
-import hashlib
-import threading
-from ckan.common import _, c, request, response
-from pylons import config
-from webob.multidict import UnicodeMultiDict
-from paste.util.multidict import MultiDict
 
-log = logging.getLogger(__name__)
-
-from ckan.controllers.api import ApiController
-
-class DGAApiController(ApiController):
-
-	def _post_analytics(self,user,request_obj_type,request_function,request_id):
-		if (config.get('googleanalytics.id') != None):
-			data = urllib.urlencode({
-				"v":1, 
-				"tid":config.get('googleanalytics.id'), 
-				"cid":hashlib.md5(user).hexdigest(), 
-				"t":"event", 
-				"dh":c.environ['HTTP_HOST'], 
-				"dp":c.environ['PATH_INFO'], 
-				"dr":c.environ.get('HTTP_REFERER',''), 
-				"ec":"CKAN API Request", 
-				"ea":request_obj_type+request_function, 
-				"el":request_id, 
-				})
-			log.debug("Sending API Analytics Data: "+data)
-			# send analytics asynchronously
-	 		threading.Thread(target=urllib.urlopen,args=("http://www.google-analytics.com/collect", data)).start()
-		
-
-	def action(self, logic_function, ver=None):
-		try:
-	            function = logic.get_action(logic_function)
-                except Exception,e:
-		    log.debug(e)
-                    pass
-		try:
-	            side_effect_free = getattr(function, 'side_effect_free', False)
-	            request_data = self._get_request_data(try_url_params=side_effect_free)
-		    if isinstance(request_data, dict):
-			id = request_data.get('id','')
-                        if 'q' in request_data.keys():
-                                id = request_data['q']
-                        if 'query' in request_data.keys():
-                                id = request_data['query']
-			self._post_analytics(c.user,logic_function,'', id)
-	        except Exception,e:
-		    print log.debug(e)
-	      	    pass
-	
-		return ApiController.action(self,logic_function, ver)
-		
-	def list(self, ver=None, register=None, subregister=None, id=None):
-		self._post_analytics(c.user,register+("_"+str(subregister) if subregister else ""),"list",id)
-		return ApiController.list(self,ver, register, subregister, id)
-	def show(self, ver=None, register=None, subregister=None, id=None, id2=None):
-		self._post_analytics(c.user,register+("_"+str(subregister) if subregister else ""),"show",id)
-		return ApiController.show(self,ver, register, subregister, id,id2)
-	def update(self, ver=None, register=None, subregister=None, id=None, id2=None):
-		self._post_analytics(c.user,register+("_"+str(subregister) if subregister else ""),"update",id)
-		return ApiController.update(self,ver, register, subregister, id,id2)
-	def delete(self, ver=None, register=None, subregister=None, id=None, id2=None):
-		self._post_analytics(c.user,register+("_"+str(subregister) if subregister else ""),"delete",id)
-		return ApiController.delete(self,ver, register, subregister, id,id2)
-	def search(self, ver=None, register=None):
-		id = None
-		try:
-        	        params = MultiDict(self._get_search_params(request.params))
-			if 'q' in params.keys():
-				id = params['q']
-			if 'query' in params.keys():
-				id = params['query']
-            	except ValueError, e:
-			print str(e)
-			pass
-		self._post_analytics(c.user,register,"search",id)
-

--- a/ckanext/datagovau/plugin.py
+++ b/ckanext/datagovau/plugin.py
@@ -6,22 +6,9 @@
 import ckan.plugins.toolkit as tk
 import ckan.model as model
 from pylons import config
-from routes.mapper import SubMapper, Mapper as _Mapper
 
 from sqlalchemy import orm
 import ckan.model
-
-#parse the activity feed for last active non-system user
-def get_last_active_user(id):
-    system_user = lib.helpers.get_action('user_show',{'id': config.get('ckan.site_id', 'ckan_site_user')})
-    user_list = [x for x in lib.helpers.get_action('package_activity_list',{'id':id}) if x['user_id'] != system_user['id']]
-    user = None
-    if len(user_list) > 0:
-    	user = user_list[0].get('user_id', None)
-    if user is None:
-	return system_user
-    else:
-	return lib.helpers.get_action('user_show',{'id':user})
 
 # get user created datasets and those they have edited
 def get_user_datasets(user_dict):
@@ -43,57 +30,7 @@
 
     '''
     plugins.implements(plugins.IConfigurer, inherit=False)
-    plugins.implements(plugins.IDatasetForm, inherit=False)
     plugins.implements(plugins.ITemplateHelpers, inherit=False)
-    plugins.implements(plugins.IRoutes, inherit=True)
-
-    def before_map(self, map):
-
-	# Helpers to reduce code clutter
-	GET = dict(method=['GET'])
-	PUT = dict(method=['PUT'])
-	POST = dict(method=['POST'])
-	DELETE = dict(method=['DELETE'])
-	GET_POST = dict(method=['GET', 'POST'])
-	# intercept API calls that we want to capture analytics on
-	register_list = [
-        	'package',
-        	'dataset',
-        	'resource',
-	        'tag',
-	        'group',
-	        'related',
-	        'revision',
-	        'licenses',
-	        'rating',
-	        'user',
-	        'activity'
-	    ]
-	register_list_str = '|'.join(register_list)
-	# /api ver 3 or none
-	with SubMapper(map, controller='ckanext.datagovau.controller:DGAApiController', path_prefix='/api{ver:/3|}',
-	                ver='/3') as m:
-		m.connect('/action/{logic_function}', action='action',
-	                  conditions=GET_POST)
-
-	# /api ver 1, 2, 3 or none
-	with SubMapper(map, controller='ckanext.datagovau.controller:DGAApiController', path_prefix='/api{ver:/1|/2|/3|}',
-	                   ver='/1') as m:
-		m.connect('/search/{register}', action='search')
-	
-	# /api/rest ver 1, 2 or none
-	with SubMapper(map, controller='ckanext.datagovau.controller:DGAApiController', path_prefix='/api{ver:/1|/2|}',
-	                   ver='/1', requirements=dict(register=register_list_str)
-	                   ) as m:
-
-		m.connect('/rest/{register}', action='list', conditions=GET)
-		m.connect('/rest/{register}', action='create', conditions=POST)
-	        m.connect('/rest/{register}/{id}', action='show', conditions=GET)
-	        m.connect('/rest/{register}/{id}', action='update', conditions=PUT)
-	        m.connect('/rest/{register}/{id}', action='update', conditions=POST)
-	        m.connect('/rest/{register}/{id}', action='delete', conditions=DELETE)
-
-        return map
 
     def update_config(self, config):
         # Add this plugin's templates dir to CKAN's extra_template_paths, so
@@ -107,112 +44,6 @@
         # config['licenses_group_url'] = 'http://%(ckan.site_url)/licenses.json'
 
     def get_helpers(self):
-        return {'get_last_active_user': get_last_active_user, 'get_user_datasets': get_user_datasets}
-
-    def is_fallback(self):
-        # Return True to register this plugin as the default handler for
-        # package types not handled by any other IDatasetForm plugin.
-        return True
-
-    def package_types(self):
-        # This plugin doesn't handle any special package types, it just
-        # registers itself as the default (above).
-        return []
+        return {'get_user_datasets': get_user_datasets}
 
 
-    def create_package_schema(self):
-        schema = super(DataGovAuPlugin, self).create_package_schema()
-        schema = self._modify_package_schema(schema)
-        return schema
-
-    def update_package_schema(self):
-        schema = super(DataGovAuPlugin, self).update_package_schema()
-        schema = self._modify_package_schema(schema)
-        return schema
-
-    def show_package_schema(self):
-        schema = super(DataGovAuPlugin, self).show_package_schema()
-
-        # Don't show vocab tags mixed in with normal 'free' tags
-        # (e.g. on dataset pages, or on the search page)
-        schema['tags']['__extras'].append(tk.get_converter('free_tags_only'))
-
-        # Add our custom_text field to the dataset schema.
-        # ignore_missing == optional
-        # ignore_empty == mandatory but not for viewing
-        # !!! always convert_from_extras first
-        schema.update({
-            'agency_program': [tk.get_converter('convert_from_extras'),
-                               tk.get_validator('ignore_missing')],
-            'contact_point': [tk.get_converter('convert_from_extras'),
-                              tk.get_validator('ignore_empty')],
-            'spatial_coverage': [tk.get_converter('convert_from_extras'),
-                                 tk.get_validator('ignore_empty')],
-            'granularity': [tk.get_converter('convert_from_extras'),
-                            tk.get_validator('ignore_empty')],
-            'jurisdiction': [tk.get_converter('convert_from_extras'),
-                             tk.get_validator('ignore_empty')],
-            'temporal_coverage': [tk.get_converter('convert_from_extras'),
-                                  tk.get_validator('ignore_empty')],
-            'data_state': [tk.get_converter('convert_from_extras'),
-                           tk.get_validator('ignore_empty')],
-            'update_freq': [tk.get_converter('convert_from_extras'),
-                            tk.get_validator('ignore_empty')]
-        })
-        return schema
-
-    def _modify_package_schema(self, schema):
-        # Add our custom_test metadata field to the schema, this one will use
-        # convert_to_extras instead of convert_to_tags.
-        # ignore_missing == optional
-        # not_empty == mandatory, enforced here while modifying
-
-        schema.update({
-            'agency_program': [tk.get_validator('ignore_missing'),
-                               tk.get_converter('convert_to_extras')],
-            'contact_point': [tk.get_converter('convert_to_extras'),
-                              tk.get_validator('not_empty')],
-            'spatial_coverage': [tk.get_converter('convert_to_extras'),
-                                 tk.get_validator('not_empty')],
-            'granularity': [tk.get_converter('convert_to_extras'),
-                            tk.get_validator('not_empty')],
-            'jurisdiction': [tk.get_converter('convert_to_extras'),
-                             tk.get_validator('not_empty')],
-            'temporal_coverage': [tk.get_converter('convert_to_extras'),
-                                  tk.get_validator('not_empty')],
-            'data_state': [tk.get_converter('convert_to_extras'),
-                           tk.get_validator('not_empty')],
-            'update_freq': [tk.get_converter('convert_to_extras'),
-                            tk.get_validator('not_empty')]
-        })
-        return schema
-
-    # These methods just record how many times they're called, for testing
-    # purposes.
-    # TODO: It might be better to test that custom templates returned by
-    # these methods are actually used, not just that the methods get
-    # called.
-
-    def setup_template_variables(self, context, data_dict):
-        return super(DataGovAuPlugin, self).setup_template_variables(
-            context, data_dict)
-
-    def new_template(self):
-        return super(DataGovAuPlugin, self).new_template()
-
-    def read_template(self):
-        return super(DataGovAuPlugin, self).read_template()
-
-    def edit_template(self):
-        return super(DataGovAuPlugin, self).edit_template()
-
-    def search_template(self):
-        return super(DataGovAuPlugin, self).search_template()
-
-    def history_template(self):
-        return super(DataGovAuPlugin, self).history_template()
-
-    def package_form(self):
-        return super(DataGovAuPlugin, self).package_form()
-
-

--- a/ckanext/datagovau/templates/package/read.html
+++ b/ckanext/datagovau/templates/package/read.html
@@ -4,127 +4,6 @@
 <div class="module-content">
     {{ h.disqus_comments() }}
 </div>
-{% endblock %}
-{% block package_additional_info %}
-<section class="additional-info" prefix="dc: http://purl.org/dc/elements/1.1/ dcat: http://www.w3.org/ns/dcat#
-         dcam: http://purl.org/dc/dcam/
-         aglsterms: http://www.agls.gov.au/agls/terms/
-         agentterms: http://www.agls.gov.au/agls/agentterms/
-         availterms: http://www.agls.gov.au/agls/availterms/
-         adminterms: http://www.agls.gov.au/agls/adminterms/
-         dct: http://purl.org/dc/terms/">
-    <h3>{{ _('Additional Info') }}</h3>
-    <table class="table table-striped table-bordered table-condensed">
-        <thead>
-        <tr>
-            <th scope="col">{{ _('Field') }}</th>
-            <th scope="col">{{ _('Value') }}</th>
-        </tr>
-        </thead>
-        <tbody>
-
-
-        {# Add our custom field to the dataset read page. #}
-        {% if pkg.get('metadata_created') %}
-        <tr>
-            <th scope="row" class="dataset-label">Date Published</th>
-            <td class="dataset-details" property="dct:issued">{{ pkg.metadata_created.split("T")[0] }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('metadata_updated') %}
-        <tr>
-            <th scope="row" class="dataset-label">Date Updated</th>
-            <td class="dataset-details" property="dct:updated">{{ pkg.metadata_updated.split("T")[0] }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('agency_program') %}
-        <tr>
-            <th scope="row" class="dataset-label">Agency Program</th>
-            <td class="dataset-details"> {{ pkg.agency_program }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('url') %}
-        <tr>
-            <th scope="row" class="dataset-label">{{ _('Source') }}</th>
-            <td class="dataset-details" property="dct:source">{{ h.link_to(pkg.get('url'),
-                pkg.get('url'), rel='dct:source', target='_blank') }}
-            </td>
-        </tr>
-        {% endif %}
-
-        {% if pkg.get('contact_point') %}
-        <tr>
-            <th scope="row" class="dataset-label">Contact Point</th>
-            <td class="dataset-details" property="dcat:contactPoint"> {{ h.mail_to(email_address=pkg.contact_point,
-                name=pkg.contact_point) }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('spatial_coverage') %}
-
-        <tr>
-            <th scope="row" class="dataset-label">Geospatial Coverage</th>
-            <td class="dataset-details" property="dct:spatial"> {{ pkg.spatial_coverage }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('granularity') %}
-
-        <tr>
-            <th scope="row" class="dataset-label">Data Granularity</th>
-            <td class="dataset-details"> {{ pkg.granularity }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('jurisdiction') %}
-        <tr>
-            <th scope="row" class="dataset-label">Government Jurisdiction</th>
-            <td class="dataset-details" property="aglsterms:AglsJuri"> {{ pkg.jurisdiction }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('temporal_coverage') %}
-        <tr>
-            <th scope="row" class="dataset-label">Temporal Coverage</th>
-            <td class="dataset-details" property="dct:temporal"> {{ pkg.temporal_coverage }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('data_state') %}
-        <tr>
-            <th scope="row" class="dataset-label">Data State</th>
-            <td class="dataset-details"> {{ pkg.data_state }}</td>
-        </tr>
-        {% endif %}
-        {% if pkg.get('update_freq') %}
-
-        <tr>
-            <th scope="row" class="dataset-label">Update Frequency</th>
-            <td class="dataset-details"> {{ pkg.update_freq }}</td>
-        </tr>
-        {% endif %}
-
-{% set email =h.get_last_active_user(c.pkg_dict['id']).get('email','') %}
-        <tr>
-            <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
-            <td class="dataset-details" property="dc:contributor">{{
-		  h.mail_to(email_address=(email or ' '), name=h.get_last_active_user(c.pkg_dict['id']).get("display_name",'')) }}
-            </td>
-        </tr>
-        <tr>
-            <th scope="row" class="dataset-label">Publisher/Agency</th>
-            <td class="dataset-details" property="dc:publisher">{{ c.pkg_dict['organization']['title']}}
-            </td>
-        </tr>
-        <tr>
-            <th scope="row" class="dataset-label">Type</th>
-            <td class="dataset-details" property="dc:type">Dataset</td>
-        </tr>
-        <tr>
-            <th scope="row" class="dataset-label">Language</th>
-            <td class="dataset-details" property="dc:language">English</td>
-        </tr>
-
-        </tbody>
-    </table>
-</section>
-
-
 {% endblock %}
 
 {% block secondary_content %}

--- a/ckanext/datagovau/templates/package/read.n3
+++ /dev/null
@@ -1,45 +1,1 @@
-@prefix : <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix dct: <http://purl.org/dc/terms/> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 
-<${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}>
-a dcat:Dataset;
-     dct:description "${c.pkg_dict['notes']}";
-     dct:identifier "${c.pkg_dict['name']}";
-     dct:relation  [
-         rdf:value "";
-         :label "change_note" ],
-             [
-         rdf:value "";
-         :label "definition_note" ],
-             [
-         rdf:value "";
-         :label "editorial_note" ],
-             [
-         rdf:value "";
-         :label "example_note" ],
-             [
-         rdf:value "";
-         :label "history_note" ],
-             [
-         rdf:value "";
-         :label "scope_note" ],
-             [
-         rdf:value "";
-         :label "skos_note" ],
-             [
-         rdf:value "";
-         :label "temporal_granularity" ],
-             [
-         rdf:value "";
-         :label "type_of_dataset" ],
-             [
-         rdf:value "";
-         :label "update_frequency" ];
-     dct:title "${c.pkg_dict['title']}";
-     :label "${c.pkg_dict['name']}";
-     = <urn:uuid:${c.pkg_dict['id']}>;
-     foaf:homepage <http://127.0.0.1:5000/dataset/testt> .

--- a/ckanext/datagovau/templates/package/read.rdf
+++ /dev/null
@@ -1,133 +1,1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF
-        xmlns:py="http://genshi.edgewall.org/"
-        xmlns:foaf="http://xmlns.com/foaf/0.1/"
-        xmlns:owl="http://www.w3.org/2002/07/owl#"
-        xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:dcat="http://www.w3.org/ns/dcat#"
-        xmlns:dcam="http://purl.org/dc/dcam/"
-        xmlns:aglsterms="http://www.agls.gov.au/agls/terms/"
-        xmlns:agentterms="http://www.agls.gov.au/agls/agentterms/"
-        xmlns:availterms="http://www.agls.gov.au/agls/availterms/"
-        xmlns:adminterms="http://www.agls.gov.au/agls/adminterms/"
-        xmlns:dct="http://purl.org/dc/terms/"
-        >
-    <dcat:Dataset rdf:about="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}">
-        <dct:identifier>${c.pkg_dict['name']}</dct:identifier>
-        <dct:title>${c.pkg_dict['title']}</dct:title>
-        <dct:landingPage
-                rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True) }"/>
-        <owl:sameAs rdf:resource="urn:uuid:${c.pkg_dict['id']}"/>
-        <dct:type>Dataset</dct:type>
-        <dct:description>${c.pkg_dict['notes']}</dct:description>
-        <dct:issued>${c.pkg_dict['metadata_created']}</dct:issued>
-        <dct:modified>${c.pkg_dict['metadata_modified']}</dct:modified>
 
-<py:choose>
-  <py:when test="c.pkg_dict.get('license_url',None)">
-        <dct:license rdf:resource="${c.pkg_dict['license_url']}"/>
-        <dct:rights rdf:resource="${c.pkg_dict['license_url']}"/>
-  </py:when>
-  <py:otherwise>
-        <dct:license>${c.pkg_dict['license_id']}</dct:license>
-        <dct:rights>"${c.pkg_dict['license_id']}"</dct:rights>
-  </py:otherwise>
-</py:choose>
-        <py:for each="tag_dict in c.pkg_dict.get('tags',[])">
-            <dcat:keyword>${ tag_dict["name"] }</dcat:keyword>
-        </py:for>
-
-
-        <py:for each="rsc_dict in c.pkg_dict['resources']">
-            <dcat:distribution>
-                <dcat:Distribution>
-                    <dct:title>${rsc_dict.get('name')}</dct:title>
-                    <owl:sameAs rdf:resource="urn:uuid:${rsc_dict.get('id')}"/>
-                    <dct:description>${rsc_dict.get('description')}</dct:description>
-                    <dcat:accessURL rdf:resource="${ rsc_dict.get('url') }"/>
-                    <dct:created>${rsc_dict.get('created')}</dct:created>
-                    <dct:modified>${rsc_dict.get('revision_timestamp')}</dct:modified>
-                    <dcat:byteSize py:if="rsc_dict.get('size')">${rsc_dict.get('size')}</dcat:byteSize>
-                    <dcat:mediaType py:if="rsc_dict.get('mimetype')">${rsc_dict.get('mimetype')}</dcat:mediaType>
-                    <dct:extent py:if="rsc_dict.get('size')">${rsc_dict.get('size')} bytes</dct:extent>
-                    <dct:format py:if="rsc_dict.get('format')">
-                        <dct:IMT>
-                            <rdf:value>${rsc_dict.get('format')}</rdf:value>
-                            <rdfs:label>${rsc_dict.get('format')}</rdfs:label>
-                        </dct:IMT>
-                    </dct:format>
-                    <dct:title py:if="rsc_dict.get('name')">${rsc_dict.get('name')}</dct:title>
-                </dcat:Distribution>
-            </dcat:distribution>
-        </py:for>
-
-
-<!-- data.gov.au specific stuff below this line -->
-        <dct:publisher py:if="c.pkg_dict.get('organization', None)">
-            <rdf:Description>
-                <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name>
-            </rdf:Description>
-        </dct:publisher>
-        <dct:creator py:if="c.pkg_dict.get('organization', None)">
-            <rdf:Description>
-                <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name>
-            </rdf:Description>
-        </dct:creator>
-        <dct:contributor>
-            <rdf:Description>
-                <foaf:name>${h.get_last_active_user(c.pkg_dict['id'])["display_name"]}</foaf:name>
-                <foaf:mbox py:if="h.get_last_active_user(c.pkg_dict['id']).get('email', None)"
-                           rdf:resource="mailto:${h.get_last_active_user(c.pkg_dict['id'])['email']}"/>
-            </rdf:Description>
-        </dct:contributor>
-
-        <py:for each="extra_dict in c.pkg_dict.get('extras',[])">
-            <dct:relation>
-                <rdf:Description>
-                    <rdfs:label>${extra_dict.get('key','')}</rdfs:label>
-                    <rdf:value>${extra_dict.get('value','')}</rdf:value>
-                </rdf:Description>
-            </dct:relation>
-        </py:for>
-        <dct:language>en</dct:language>
-        <foaf:homepage
-                rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"/>
-        <dcat:contactPoint py:if="c.pkg_dict.get('contact_point')">${c.pkg_dict.contact_point }</dcat:contactPoint>
-<py:choose>
-  <py:when test="c.pkg_dict.get('spatial',None)">
-        <dct:spatial py:if="c.pkg_dict.get('spatial')">${ c.pkg_dict.spatial }</dct:spatial>
-  </py:when>
-  <py:otherwise>
-        <dct:spatial py:if="c.pkg_dict.get('spatial_coverage')">${ c.pkg_dict.spatial_coverage }</dct:spatial>
-  </py:otherwise>
-</py:choose>
-        <aglsterms:AglsJuri py:if="c.pkg_dict.get('jurisdiction')">${ c.pkg_dict.jurisdiction }</aglsterms:AglsJuri>
-        <dct:temporal py:if="c.pkg_dict.get('temporal_coverage')">${ c.pkg_dict.get('temporal_coverage') }</dct:temporal>
-        <dct:relation py:if="c.pkg_dict.get('data_state')">
-            <rdf:Description>
-                <rdfs:label>Data State</rdfs:label>
-                <rdf:value>${ c.pkg_dict.get('data_state') }</rdf:value>
-            </rdf:Description>
-        </dct:relation>
-        <dct:relation py:if="c.pkg_dict.get('update_freq')">
-            <rdf:Description>
-                <rdfs:label>Update Frequency</rdfs:label>
-                <rdf:value>${ c.pkg_dict.get('update_freq') }</rdf:value>
-            </rdf:Description>
-        </dct:relation>
-        <dct:relation py:if="c.pkg_dict.get('agency_program')">
-            <rdf:Description>
-                <rdfs:label>Agency Program</rdfs:label>
-                <rdf:value>${ c.pkg_dict.get('agency_program') }</rdf:value>
-            </rdf:Description>
-        </dct:relation>
-        <dct:relation py:if="c.pkg_dict.get('granularity')">
-            <rdf:Description>
-                <rdfs:label>Data Granularity</rdfs:label>
-                <rdf:value>${ c.pkg_dict.get('granularity') }</rdf:value>
-            </rdf:Description>
-        </dct:relation>
-    </dcat:Dataset>
-</rdf:RDF>
-

--- a/ckanext/datagovau/templates/package/read_base.html
+++ /dev/null
@@ -1,47 +1,1 @@
-{% ckan_extends %}
 
-{% block links -%}
-{{ super() }}
-<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
-<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" />
-
-{% endblock -%}
-
-{% block head_extras -%}
-{{ super() }}
-<meta name="DCTERMS.Language" scheme="RFC3066" content="en" />
-<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" />
-<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
-<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_modified']}}" />
-<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_created']}}" />
-<meta name="DCTERMS.Source.URI" content="{{pkg.url}}" />
-<meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
-<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="DCTERMS.Identifier" content="{{h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}}" />
-<meta name="DCTERMS.Title" content="{{pkg['title']}}" />
-<meta name="DCTERMS.Description" scheme="" content="{{pkg['notes']}}" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-{% endblock -%}
-
-{% block package_info %}
-<div class="module context-info">
-    <div class="module-content">
-        <h1 class="heading" property="dc:title">{{ pkg.title or pkg.name }}</h1>
-        <div class="nums">
-            <dl>
-                <dt>{{ _('Followers') }}</dt>
-                <dd>{{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}</dd>
-            </dl>
-        </div>
-        <div class="follow_button">
-            {{ h.follow_button('dataset', pkg.name) }}
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-

--- a/ckanext/datagovau/templates/package/resource_read.html
+++ /dev/null
@@ -1,35 +1,1 @@
-{% ckan_extends %}
 
-{% block links -%}