diff --git a/ckanext/ga_report/plugin.py b/ckanext/ga_report/plugin.py index 3486036..d50e323 100644 --- a/ckanext/ga_report/plugin.py +++ b/ckanext/ga_report/plugin.py @@ -45,49 +45,49 @@ def get_helpers(self): def after_map(self, map): # GaReport map.connect( - '/site-usage', + '/data/site-usage', controller='ckanext.ga_report.controller:GaReport', action='index' ) map.connect( - '/site-usage_{month}.csv', + '/data/site-usage_{month}.csv', controller='ckanext.ga_report.controller:GaReport', action='csv' ) map.connect( - '/site-usage/downloads', + '/data/site-usage/downloads', controller='ckanext.ga_report.controller:GaReport', action='downloads' ) map.connect( - '/site-usage/downloads_{month}.csv', + '/data/site-usage/downloads_{month}.csv', controller='ckanext.ga_report.controller:GaReport', action='csv_downloads' ) # GaDatasetReport map.connect( - '/site-usage/publisher', + '/data/site-usage/publisher', controller='ckanext.ga_report.controller:GaDatasetReport', action='publishers' ) map.connect( - '/site-usage/publishers_{month}.csv', + '/data/site-usage/publishers_{month}.csv', controller='ckanext.ga_report.controller:GaDatasetReport', action='publisher_csv' ) map.connect( - '/site-usage/dataset/datasets_{id}_{month}.csv', + '/data/site-usage/dataset/datasets_{id}_{month}.csv', controller='ckanext.ga_report.controller:GaDatasetReport', action='dataset_csv' ) map.connect( - '/site-usage/dataset', + '/data/site-usage/dataset', controller='ckanext.ga_report.controller:GaDatasetReport', action='read' ) map.connect( - '/site-usage/dataset/{id}', + '/data/site-usage/dataset/{id}', controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher' ) diff --git a/ckanext/ga_report/templates/ga_report/publisher/index.html b/ckanext/ga_report/templates/ga_report/publisher/index.html index fbdb5e2..25aec78 100644 --- a/ckanext/ga_report/templates/ga_report/publisher/index.html +++ b/ckanext/ga_report/templates/ga_report/publisher/index.html @@ -14,8 +14,8 @@ {% endblock %} {% block breadcrumbs %} -
  • Site Analytics
  • -
  • Publishers
  • +
  • Site Analytics
  • +
  • Publishers
  • {% endblock %} {% block content %} {% set download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all') %} diff --git a/ckanext/ga_report/templates/ga_report/publisher/read.html b/ckanext/ga_report/templates/ga_report/publisher/read.html index 98771a6..a02e9df 100644 --- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -13,10 +13,10 @@ {% endblock %} {% block breadcrumbs %} -
  • Site Analytics
  • +
  • Site Analytics
  • {% if c.publisher %}
  • Publishers
  • -
  • {{c.publisher.title}}
  • +
  • {{c.publisher.title}}
  • {% else %}
  • Usage By Dataset
  • {% endif %} diff --git a/ckanext/ga_report/templates/ga_report/site/index.html b/ckanext/ga_report/templates/ga_report/site/index.html index 4119a13..ac091d5 100644 --- a/ckanext/ga_report/templates/ga_report/site/index.html +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -3,8 +3,8 @@ {% block page_title %}Site usage{% endblock %} {% block breadcrumbs %} -
  • Site Analytics
  • -
  • Site-wide
  • +
  • Site Analytics
  • +
  • Site-wide
  • {% endblock %} {% block content %}
    @@ -19,8 +19,8 @@

    Site Usage

    Jump To...