Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-datagovau
--- a/admin/autoupdate.py
+++ b/admin/autoupdate.py
@@ -1,3 +1,16 @@
+#!/usr/bin/python
+# coding=utf-8
+'''
+auto update batch job for ckan
+<alex.sadleir@linkdigital.com.au>
+1.0 26/05/2014 initial implementation
+
+TODO
+- archive files in filestore
+- update frequency reduced based on dataset metadata
+- emails on HTTP errors
+'''
+
import requests
import ckanapi
import csv
@@ -57,6 +70,8 @@
datastore_db_settings['dbname'] = db_settings['datastore_dbname']
datastore_db_settings_json = json.dumps(datastore_db_settings)
+#until https://github.com/ckan/ckan/pull/1732 is merged, use database directly
+
try:
conn = psycopg2.connect(dbname=db_settings['dbname'], user=db_settings['user'], password=db_settings['password'], host=db_settings['host'])
except:
--- a/ckanext/datagovau/templates/header.html
+++ b/ckanext/datagovau/templates/header.html
@@ -18,7 +18,7 @@
<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>
+ <i class="icon-dashboard"> Dashboard</i>
<span>{{ new_activities }}</span>
</a>
</li>
@@ -35,6 +35,7 @@
<i class="icon-signout"> Log out</i>
</a>
</li>
+{% endblock %}
{% endblock %}
{% block header_site_navigation %}