From 1d4cde5d1a8f3d29ff49483068ea1fe4d206648b Mon Sep 17 00:00:00 2001 From: tobes Date: Thu, 15 Nov 2012 12:18:29 +0000 Subject: [PATCH] [#3016] Changes to package/read_base.py for new tabs --- ckan/config/routing.py | 7 ++++--- ckan/templates/package/read_base.html | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 32886c7f54c..8f3fda63e27 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -194,7 +194,7 @@ def make_map(): action='edit') m.connect('related_delete', '/dataset/{id}/related/delete/{related_id}', action='delete') - m.connect('related_list', '/dataset/{id}/related', action='list') + m.connect('related_list', '/dataset/{id}/related', action='list', ckan_icon='picture') m.connect('related_read', '/apps/{id}', action='read') m.connect('related_dashboard', '/apps', action='dashboard') @@ -226,15 +226,16 @@ def make_map(): 'history', 'read_ajax', 'history_ajax', - 'followers', 'follow', 'unfollow', 'delete', 'api_data', ])) ) + m.connect('dataset_followers', '/dataset/followers/{id}', action='followers', ckan_icon='group') + m.connect('/dataset/{id}.{format}', action='read') - m.connect('/dataset/{id}', action='read') + m.connect('dataset_read', '/dataset/{id}', action='read', ckan_icon='sitemap') m.connect('/dataset/{id}/resource/{resource_id}', action='resource_read') m.connect('/dataset/{id}/resource_delete/{resource_id}', diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index 2b1ffb19010..96bc56b808b 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -41,9 +41,9 @@ {% block page_header %} {% snippet 'snippets/page_header.html', items=[ - ( _('Dataset'), h.url_for(controller='package', action='read', id=pkg.name), 'sitemap', c.action == 'read' ), - ( _('Followers'), h.url_for(controller='package', action='followers', id=pkg.name), 'group', c.action == 'followers' ), - ( _('Related'), h.url_for(controller='related', action='list', id=pkg.name), 'picture', c.action == 'related' ), + h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name), + h.build_nav_icon('dataset_followers', _('Followers'), id=pkg.name), + h.build_nav_icon('related_list', _('Related'), id=pkg.name), ] %} {% endblock %}