related auth func
related auth func

file:a/README.rst -> file:b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -2,13 +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
-  * A custom Package edit form that defaults to cc-by licence
-  * A custom n3/rdf output format
+* 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 complemented by ckanext-agls for AGLS metadata, ckanext-googleanalytics for Google Analytics tracking of API usage and ckanext-dga-stats for the customised site statistics page.
 
 Installation
 ============

--- a/admin/default.vcl
+++ b/admin/default.vcl
@@ -8,45 +8,117 @@
     .host = "127.0.0.1";
     .port = "8080";
 }
+backend geoserver {
+    .host = "172.31.18.207";
+    .port = "8983";
+}
 
 sub vcl_fetch {
     set beresp.grace = 1h;
- 
-    if (beresp.http.content-type ~ "(text|application)") {
+    unset beresp.http.Server;
+    # These status codes should always pass through and never cache.
+  if ( beresp.status >= 500 ) {
+    set beresp.ttl = 0s;
+  }
+    if (beresp.http.content-type ~ "(text|javascript|json|xml|html)") {
         set beresp.do_gzip = true;
     }
+  # CKAN cache headers are used by Varnish cache, but should not be propagated to
+  # the Internet. Tell browsers and proxies not to cache. This means Varnish always
+  # gets the responsibility to server the right content at all times.
+  if (beresp.http.Cache-Control ~ "max-age") {
+    unset beresp.http.set-cookie;
+    set beresp.http.Cache-Control = "no-cache";
+  }
+
+  # Encourage assets to be cached by proxies and browsers
+  # JS and CSS may be gzipped depending on headers
+  # see https://developers.google.com/speed/docs/best-practices/caching
+  if (req.url ~ "\.(css|js)") {
+    set beresp.http.Vary = "Accept-Encoding";
+  }
+
+  # Encourage assets to be cached by proxies and browsers for 1 day
+  if (req.url ~ "\.(png|gif|jpg|swf|css|js)") {
+    unset beresp.http.set-cookie;
+    set beresp.http.Cache-Control = "public, max-age=86400";
+    set beresp.ttl = 1d;
+  }
+
+  # Encourage CKAN vendor assets (which are versioned) to be cached by
+  # by proxies and browsers for 1 year
+  if (req.url ~ "^/scripts/vendor/") {
+    unset beresp.http.set-cookie;
+    set beresp.http.Cache-Control = "public, max-age=31536000";
+    set beresp.ttl = 12m;
+  }
+}
+sub vcl_recv {
+    if (req.http.user-agent ~ "Ezooms" || req.http.user-agent ~ "Ahrefs") {
+	error 403;
+    } 
+if (req.url ~ "^/geoserver/") {
+        set req.backend = geoserver;
+    } else {
+        set req.backend = default;
+	#redirect secure traffic to https
+	if ( (req.http.Cookie ~ "auth_tkt" || req.http.Cookie ~ "ckan" || req.url ~ "user/(reset|login)") && req.http.X-Forwarded-Proto !~ "(?i)https") {
+		set req.http.x-Redir-Url = "https://data.gov.au" + req.url;
+		error 753 req.http.x-Redir-Url;
+	}
+	# remove locale links
+	if (req.url ~ "/((?!js)..|.._..|sr_Latn)/") {
+	        set req.http.x-Redir-Url = regsub(req.url, "/((?!js)..|.._..|sr_Latn)/", "/");
+		error 751 req.http.x-Redir-Url;
+	}
+	# rewrite broken resources
+	if (req.url ~ "leaflet") {
+	        set req.url = regsub(req.url, "fanstatic/ckanext-spatial/:version:2013-09-13T02:32:17.87/:bundle:js/vendor/leaflet/images", "js/vendor/leaflet/images");
+	}
+	# remove old hostnames
+	if (req.http.host ~ "data.australia.gov.au") {
+		set req.http.x-Redir-Url = "http://data.gov.au" + req.url;
+		error 751 req.http.x-Redir-Url;
+	}
+
+	if (req.url ~ "^/_tracking") {
+	// exclude web spiders from statistics
+	    	if (req.http.user-agent ~ "Googlebot" || req.http.user-agent ~ "baidu" || req.http.user-agent ~ "bing") {
+			error 200;
+	    	} else {
+			return (pass);
+   		}
+ 	}
  if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") {
-   unset beresp.http.set-cookie;
+   //Varnish to deliver content from cache even if the request othervise indicates that the request should be passed
+   return(lookup);
  }
 }
-sub vcl_recv {
-  if (req.url ~ "^/_tracking") {
-    return (pass);
-  }
- if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") {
-    return(lookup);
- }
-if (req.url ~ "/(..|.._..)/") {
-    set req.url = regsub(req.url, "/((?!js)..|.._..)/", "/");
-}
-  if (req.http.Cookie) {
-    set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1"); # removes all cookies named __utm? (utma, utmb...) - tracking thing
-
-    if (req.http.Cookie == "") {
-        remove req.http.Cookie;
-    }
-  }
+  // Remove has_js and Google Analytics cookies. Evan added sharethis cookies
+  set req.http.Cookie = regsuball(req.http.Cookie, "(^|;\s*)(__[a-z]+|has_js|cookie-agreed-en|_csoot|_csuid|_chartbeat2)=[^;]*", "");
+
+  // Remove a ";" prefix, if present.
+  set req.http.Cookie = regsub(req.http.Cookie, "^;\s*", "");
+  // Remove empty cookies.
+  if (req.http.Cookie ~ "^\s*$") {
+    unset req.http.Cookie;
+  }
+
+  remove req.http.X-Forwarded-For;
+  set req.http.X-Forwarded-For = req.http.X-Real-IP;
 } 
 sub vcl_hash {
      # http://serverfault.com/questions/112531/ignoring-get-parameters-in-varnish-vcl
-     set req.url = regsub(req.url, "(?:(.com|.au))/((?!js)..|.._..)/", "/");
+     set req.url = regsub(req.url, "(?:(.com|.au))/((?!js)..|.._..|sr_Latn)/", "/");
      hash_data(req.url);
      if (req.http.host) {
          hash_data(req.http.host);
      } else {
          hash_data(server.ip);
      }
-     return (hash);
+  if (req.http.Cookie) {
+    hash_data(req.http.Cookie);
+}
 }
 sub vcl_deliver {
     if (!resp.http.Vary) {
@@ -54,13 +126,29 @@
     } else if (resp.http.Vary !~ "(?i)Accept-Encoding") {
         set resp.http.Vary = resp.http.Vary + ",Accept-Encoding";
     }    
-    if (obj.hits > 0) {
-        set resp.http.X-Cache = "HIT";
-    } else {
-        set resp.http.X-Cache = "MISS";
-    }
+    remove resp.http.X-Varnish;
+    remove resp.http.Via;
+    remove resp.http.Age;
+    remove resp.http.X-Powered-By;
+if (req.url ~ "^/geoserver/") {
+  set resp.http.Access-Control-Allow-Origin = "*";
+  set resp.http.Access-Control-Allow-Methods = "GET, POST, PUT, DELETE";
+  set resp.http.Access-Control-Allow-Headers = "Origin, X-Requested-With, Content-Type, Accept";
+}
 }   
-
+sub vcl_error {
+    remove obj.http.Server;
+	if (obj.status == 751) {
+		set obj.http.Location = obj.response;
+		set obj.status = 301;
+		return (deliver);
+	}
+	if (obj.status == 753) {
+		set obj.http.Location = obj.response;
+		set obj.status = 301;
+		return (deliver);
+	}
+}
 # 
 # Below is a commented-out copy of the default VCL logic.  If you
 # redefine any of these subroutines, the built-in logic will be

file:b/admin/reset.sh (new)
--- /dev/null
+++ b/admin/reset.sh
@@ -1,1 +1,17 @@
+paster --plugin=ckan db clean --config=development.ini
+echo "drop extension postgis cascade;" | psql -d ckantest
+paster --plugin=ckan db clean --config=development.ini
 
+#to initiate for first time instead of load from dump
+#paster --plugin=ckan db init --config=development.in
+#paster --plugin=ckan user add maxious password=snmc email=maxious@gmail.com
+#paster --plugin=ckan sysadmin add maxious
+#paster --plugin=ckan db dump dump.db
+
+#paster --plugin=ckan db load --config=development.ini dump.db
+paster --plugin=ckan db load --config=development.ini dump.harvest.db
+echo "create extension postgis;" | psql -d ckantest
+#sleep 2
+paster --plugin=ckan search-index rebuild --config=development.ini
+#rm -r /tmp/pairtree_*
+

file:b/admin/start.sh (new)
--- /dev/null
+++ b/admin/start.sh
@@ -1,1 +1,6 @@
+export NEW_RELIC_CONFIG_FILE="newrelic.ini"
+export VIRTUAL_ENV="/var/lib/ckan/dga/pyenv"
+export PATH="/var/lib/ckan/dga/pyenv:/var/lib/ckan/dga/pyenv/bin:$PATH"
+cd /var/lib/ckan/dga/pyenv/src/ckan
+newrelic-admin run-program paster serve development.ini
 

--- a/ckanext/datagovau/plugin.py
+++ b/ckanext/datagovau/plugin.py
@@ -7,24 +7,23 @@
 import ckan.model as model
 from pylons import config
 
-#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})
+from sqlalchemy import orm
+import ckan.model
 
 # get user created datasets and those they have edited
 def get_user_datasets(user_dict):
     created_datasets_list = user_dict['datasets']
     active_datasets_list = [x['data']['package'] for x in 
 				lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')]
-    return created_datasets_list + active_datasets_list
+    raw_list = created_datasets_list + active_datasets_list
+    filtered_dict = {}
+    for dataset in raw_list:
+	if dataset['id'] not in filtered_dict.keys():
+		filtered_dict[dataset['id']] = dataset
+    return filtered_dict.values()
+
+def related_create(context, data_dict=None):
+    return {'success': False, 'msg': 'No one is allowed to create related items'}
 
 class DataGovAuPlugin(plugins.SingletonPlugin,
                                 tk.DefaultDatasetForm):
@@ -34,8 +33,11 @@
 
     '''
     plugins.implements(plugins.IConfigurer, inherit=False)
-    plugins.implements(plugins.IDatasetForm, inherit=False)
     plugins.implements(plugins.ITemplateHelpers, inherit=False)
+    plugins.implements(plugins.IAuthFunctions)
+
+    def get_auth_functions(self):
+        return {'rekated_create': related_create}
 
     def update_config(self, config):
         # Add this plugin's templates dir to CKAN's extra_template_paths, so
@@ -49,112 +51,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()
-
-

--- /dev/null
+++ b/ckanext/datagovau/templates/base.html
@@ -1,1 +1,7 @@
+{% ckan_extends %}
+    {% block meta %}
+      {{ super() }}
+<meta name="google-site-verification" content="B8scmW2_LMm4IW_ogXK9lojznO57GBpYlWrFjfGz3X8" />
+    {% endblock %}
 
+

--- /dev/null
+++ b/ckanext/datagovau/templates/dataviewer/base.html
@@ -1,1 +1,11 @@
+{% ckan_extends %}
+{% block scripts %}
+      {{ super() }}
+  <script>
+    preload_resource.url = preload_resource.url.replace("https:","").replace("http:","");
+    preload_resource.original_url = preload_resource.original_url.replace("https:","").replace("http:","");
+  </script>
+{% endblock %}
 
+
+

--- /dev/null
+++ b/ckanext/datagovau/templates/dataviewer/snippets/data_preview.html
@@ -1,1 +1,32 @@
+<div class="module-content ckanext-datapreview">
+  {% if embed %}
+    {# images can be embedded directly #}
+    <img src="{{ resource_url }}"></img>
+  {% else %}
+  <div class="data-viewer-error js-hide">
+    <p class="text-error">
+      <i class="icon-info-sign"></i>
+      {{ _('This resource can not be previewed at the moment.') }}
+      <a href="#" data-toggle="collapse" data-target="#data-view-error">
+        {{ _('Click here for more information.') }}
+      </a>
+    </p>
+    <p id="data-view-error" class="collapse"></p>
+    <p>
+      <a href="{{ raw_resource_url }}" class="btn btn-large resource-url-analytics" target="_blank">
+        <i class="icon-large icon-download"></i>
+        {{ _('Download resource') }}
+      </a>
+    </p>
+  </div>
+  <iframe src="{{ resource_url }}" frameborder="0" width="100%" data-module="data-viewer">
+    <p>{{ _('Your browser does not support iframes.') }}</p>
+  </iframe>
+  {% endif %}
+</div>
+<div class="embedhint" style="padding-left: 15px;">
+<h4>Embed this visualisation in your own website...</h4>
+Copy the HTML in the box below and you can display this visualisation on your own website.<br/>
+<textarea style="width:97%">&lt;iframe src="{{ resource_url }}" frameborder="0" width="100%" height="600px"&gt;&lt;/iframe&gt;</textarea>
+</div>
 

--- /dev/null
+++ b/ckanext/datagovau/templates/header.html
@@ -1,1 +1,18 @@
+{% ckan_extends %}
 
+{% block header_site_navigation %}
+    <nav class="section navigation">
+      <ul class="nav nav-pills">
+        {% block header_site_navigation_tabs %}
+        {{ h.build_nav_main(
+          ('search', _('Datasets')),
+          ('organizations_index', _('Organizations')),
+          ('about', _('About'))
+        ) }}
+        <li><a href="//data.gov.au/stats">Site Statistics</a></li>
+        <li><a href="https://datagovau.ideascale.com/">Feedback/Request Data</a></li>
+        {% endblock %}
+      </ul>
+    </nav>
+{% endblock %}
+

--- /dev/null
+++ b/ckanext/datagovau/templates/home/index.html
@@ -1,1 +1,47 @@
+{% ckan_extends %}
+{% block home_secondary_content %}
+<script type="text/javascript" src="//www.google.com/jsapi">
+</script>
+<script type="text/javascript">
+google.load("feeds", "1") //Load Google Ajax Feed API (version 1)
+</script>
 
+          <div id="feeddiv"></div>
+
+<script type="text/javascript">
+
+var feedcontainer=document.getElementById("feeddiv")
+var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed"
+var feedlimit=3
+var rssoutput="<div  class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'>&nbsp;Subscribe to the blog </a></div>"
+
+
+function rssfeedsetup(){
+var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method
+feedpointer.setNumEntries(feedlimit) //Google Feed API method
+feedpointer.load(displayfeed) //Google Feed API method
+}
+
+function displayfeed(result){
+if (!result.error){
+var thefeeds=result.feed.entries
+for (var i=0; i<thefeeds.length; i++) {
+rssoutput+="<div  class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>"
+rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>"
+}
+rssoutput+=""
+feedcontainer.innerHTML=rssoutput
+}
+else
+alert("Error fetching feeds!")
+}
+
+window.onload=function(){
+rssfeedsetup()
+}
+
+</script>
+
+{{ super() }}
+            {% endblock %}
+

--- /dev/null
+++ b/ckanext/datagovau/templates/home/snippets/promoted.html
@@ -1,1 +1,17 @@
+{% set intro = g.site_intro_text %}
 
+<div class="module-content box">
+  <header>
+    {% if intro %}
+      {{ h.render_markdown(intro) }}
+    {% else %}
+      <h1 class="page-heading">{{ _("Welcome to CKAN") }}</h1>
+      <p>
+        {% trans %}This is a nice introductory paragraph about CKAN or the site
+        in general. We don't have any copy to go here yet but soon we will
+        {% endtrans %}
+      </p>
+    {% endif %}
+  </header>
+</div>
+

--- /dev/null
+++ b/ckanext/datagovau/templates/home/snippets/stats.html
@@ -1,1 +1,78 @@
 
+{% set stats = h.get_site_statistics() %}
+
+<div class="box stats">
+  <div class="inner">
+    <h3>{{ _('{0} statistics').format(g.site_title) }}</h3>
+    <ul>
+      <li>
+        <a href="{{ h.url_for(controller='package', action='search') }}">
+          <b>{{ h.SI_number_span(stats.dataset_count) }}</b>
+          {{ _('dataset') if stats.dataset_count == 1 else _('datasets') }}
+        </a>
+      </li>
+      <li>
+        <a href="{{ h.url_for(controller='organization', action='index') }}">
+          <b>{{ h.SI_number_span(stats.organization_count) }}</b>
+          {{ _('organisation') if stats.organization_count == 1 else _('organisations') }}
+        </a>
+      </li>
+      <li>
+        <a href="{{ h.url_for(controller='group', action='index') }}">
+          <b>{{ h.SI_number_span(stats.group_count) }}</b>
+          {{ _('group') if stats.group_count == 1 else _('groups') }}
+        </a>
+      </li>
+      <!--<li>
+        <a href="{{ h.url_for(controller='related', action='dashboard') }}">
+          <b>{{ h.SI_number_span(stats.related_count) }}</b>
+          {{ _('related item') if stats.related_count == 1 else _('related items') }}
+        </a>
+      </li>-->
+    </ul>
+  </div>
+</div>
+
+          <div id="feeddiv">
+</div>
+
+<script type="text/javascript" src="//www.google.com/jsapi">
+</script>
+<script type="text/javascript">
+google.load("feeds", "1") //Load Google Ajax Feed API (version 1)
+</script>
+
+<script type="text/javascript">
+
+var feedcontainer=document.getElementById("feeddiv")
+var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed"
+var feedlimit=4
+var rssoutput="<div  class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'>&nbsp;Subscribe to the blog </a></div>"
+
+
+function rssfeedsetup(){
+var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method
+feedpointer.setNumEntries(feedlimit) //Google Feed API method
+feedpointer.load(displayfeed) //Google Feed API method
+}
+
+function displayfeed(result){
+if (!result.error){
+var thefeeds=result.feed.entries
+for (var i=0; i<thefeeds.length; i++) {
+rssoutput+="<div  class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>"
+rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>"
+}
+rssoutput+=""
+feedcontainer.innerHTML=rssoutput
+}
+else
+alert("Error fetching feeds!")
+}
+
+window.onload=function(){
+rssfeedsetup()
+}
+
+</script>
+

--- a/ckanext/datagovau/templates/package/read.html
+++ b/ckanext/datagovau/templates/package/read.html
@@ -1,130 +1,18 @@
 {% ckan_extends %}
 {% block primary_content_inner %}
 {{ super() }}
-
 <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>
 
+{% block secondary_content %}
+  {{ super() }}
 
-        {# 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>