From 87d6746a57a0c23f005a83f496555e00d9adfe0c Mon Sep 17 00:00:00 2001 From: John Martin Date: Tue, 5 Mar 2013 17:20:20 +0000 Subject: [PATCH 1/2] [#552] Adds page_header_tabs block for extensions to be able to add to tabs --- ckan/config/routing.py | 17 +++++++++------ ckan/templates/admin/base.html | 19 +++++++++++------ .../development/snippets/page_header.html | 8 ++++++- ckan/templates/group/read_base.html | 19 +++++++---------- ckan/templates/organization/read_base.html | 21 +++++++++---------- ckan/templates/package/read_base.html | 16 +++++++------- ckan/templates/snippets/page_header.html | 7 ------- ckan/templates/user/edit_base.html | 12 +++++++---- ckan/templates/user/read_base.html | 10 +++++---- 9 files changed, 71 insertions(+), 58 deletions(-) delete mode 100644 ckan/templates/snippets/page_header.html diff --git a/ckan/config/routing.py b/ckan/config/routing.py index df800128b80..b685c9f6ff1 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -284,12 +284,15 @@ def make_map(): 'follow', 'unfollow', 'admins', - 'about', 'activity', ])) ) - m.connect('group_activity', '/group/activity/{id}/{offset}', action='activity'), - m.connect('group_read', '/group/{id}', action='read') + m.connect('group_about', '/group/about/{id}', action='about', + ckan_icon='info-sign'), + m.connect('group_activity', '/group/activity/{id}/{offset}', + action='activity', ckan_icon='time'), + m.connect('group_read', '/group/{id}', action='read', + ckan_icon='sitemap') # organizations these basically end up being the same as groups with SubMapper(map, controller='organization') as m: @@ -305,11 +308,13 @@ def make_map(): 'member_new', 'member_delete', 'history', - 'bulk_process', - 'about' + 'bulk_process' ])) ) - m.connect('organization_read', '/organization/{id}', action='read') + m.connect('organization_about', '/organization/about/{id}', + action='about', ckan_icon='info-sign') + m.connect('organization_read', '/organization/{id}', action='read', + ckan_icon='sitemap') register_package_plugins(map) register_group_plugins(map) diff --git a/ckan/templates/admin/base.html b/ckan/templates/admin/base.html index 3821ef4388d..83427133f4d 100644 --- a/ckan/templates/admin/base.html +++ b/ckan/templates/admin/base.html @@ -7,12 +7,19 @@ {% block primary_content %}
- {% snippet 'snippets/page_header.html', items=[ - h.build_nav_icon('ckanadmin_index', _('Sysadmins')), - h.build_nav_icon('ckanadmin_config', _('Config')), - ] %} + {% block page_header %} +
+
    + {% block page_header_tabs %} + {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }} + {{ h.build_nav_icon('ckanadmin_config', _('Config')) }} + {% endblock %} +
+
+ {% endblock %}
- {% block primary_content_inner %}{% endblock %} + {% block primary_content_inner %} + {% endblock %}
-{% endblock %}} +{% endblock %} diff --git a/ckan/templates/development/snippets/page_header.html b/ckan/templates/development/snippets/page_header.html index 2be95a479d5..e015dcb03ec 100644 --- a/ckan/templates/development/snippets/page_header.html +++ b/ckan/templates/development/snippets/page_header.html @@ -4,5 +4,11 @@ h.literal('
  • ') + h.link_to('In-active Tab', '#') + h.literal('
    • '), h.literal('
  • ') + h.link_to('In-active Tab', '#') + h.literal('
    • '), ) %} - {% snippet 'snippets/page_header.html', items=items %} +
    + +
    {% endwith %} diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html index 05c08390ec8..949c43478f6 100644 --- a/ckan/templates/group/read_base.html +++ b/ckan/templates/group/read_base.html @@ -17,23 +17,18 @@ {% block primary_content %}
    - {% block package_header %} + {% block page_header %}
      - - {% link_for _('Datasets'), controller='group', action='read', id=c.group_dict.name, icon='sitemap' %} - - - {% link_for _('Activity Stream'), controller='group', action='activity', id=c.group_dict.name, icon='time' %} - - - {% link_for _('About'), controller='group', action='about', id=c.group_dict.name, icon='info-sign' %} - + {% block page_header_tabs %} + {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }} + {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }} + {% endblock %}
    {% endblock %} - {% block primary_content_inner %} - {% endblock %} + {% block primary_content_inner %}{% endblock %}
    {% endblock %} diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html index 6f02cecc821..c45d2df5c1f 100644 --- a/ckan/templates/organization/read_base.html +++ b/ckan/templates/organization/read_base.html @@ -17,18 +17,17 @@ {% block primary_content %}
    -
    -
      - - {% link_for _('Datasets'), controller='organization', action='read', id=c.group_dict.name, icon='sitemap' %} - - - {% link_for _('About'), controller='organization', action='about', id=c.group_dict.name, icon='info-sign' %} - -
    -
    - {% block primary_content_inner %} + {% block page_header %} +
    +
      + {% block page_header_tabs %} + {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }} + {% endblock %} +
    +
    {% endblock %} + {% block primary_content_inner %}{% endblock %}
    {% endblock %} diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index d4ee8468941..b518b86dceb 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -35,15 +35,17 @@ {% endblock %}
    - {% block page_header %} - {% snippet 'snippets/page_header.html', items=[ - h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name), - h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name), - h.build_nav_icon('related_list', _('Related'), id=pkg.name), - ] %} +
    +
      + {% block page_header_tabs %} + {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} + {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} + {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} + {% endblock %} +
    +
    {% endblock %} - {% block primary_content_inner %}{% endblock %}
    {% endblock %} diff --git a/ckan/templates/snippets/page_header.html b/ckan/templates/snippets/page_header.html deleted file mode 100644 index a75d1b0fec4..00000000000 --- a/ckan/templates/snippets/page_header.html +++ /dev/null @@ -1,7 +0,0 @@ -
    - -
    diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html index ffeaffaa9d9..4826aada4da 100644 --- a/ckan/templates/user/edit_base.html +++ b/ckan/templates/user/edit_base.html @@ -11,10 +11,14 @@ {% block primary_content %}
    {% block page_header %} - {% snippet 'snippets/page_header.html', items=[ - h.build_nav_icon('user_dashboard', _('News feed')), - h.build_nav_icon('user_edit', _('Settings'), id=user.name), - ] %} +
    +
      + {% block page_header_tabs %} + {{ h.build_nav_icon('user_dashboard', _('News feed')) }} + {{ h.build_nav_icon('user_edit', _('Settings'), id=user.name) }} + {% endblock %} +
    +
    {% endblock %}
    {% block primary_content_inner %}{% endblock %} diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html index 80a948f3a06..d082e4d3912 100644 --- a/ckan/templates/user/read_base.html +++ b/ckan/templates/user/read_base.html @@ -21,10 +21,12 @@ {% block primary_content %}
    {% block page_header %} - {% snippet 'snippets/page_header.html', items=[ - h.build_nav_icon('user_datasets', _('Datasets'), id=user.name), - h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name), - ] %} +
    +
      + {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }} + {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }} +
    +
    {% endblock %}
    {% block primary_content_inner %}{% endblock %} From 4413a8ed644746dbabf882982a7f2f549132df5c Mon Sep 17 00:00:00 2001 From: John Martin Date: Wed, 6 Mar 2013 11:54:39 +0000 Subject: [PATCH 2/2] [#552] Adds inner block to user page header tabs --- ckan/templates/user/read_base.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html index d082e4d3912..b0a97403d43 100644 --- a/ckan/templates/user/read_base.html +++ b/ckan/templates/user/read_base.html @@ -23,8 +23,10 @@ {% block page_header %}
      - {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }} - {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }} + {% block page_header_tabs %} + {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }} + {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }} + {% endblock %}
    {% endblock %}