Merge branch '552-page-header-tabs'

Conflicts: ckan/config/routing.py ckan/templates/organization/read_base.html activity stream rfelated conflicts
ckan · Mar 6, 2013 · 38272d7 · 38272d7
2 parents 876438a + 4413a8e
commit 38272d7
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 60 deletions.
diff --git 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,13 +308,16 @@ def make_map():
           'member_new',
           'member_delete',
           'history',
-          'bulk_process',
-          'about'
+          'bulk_process'
           ]))
           )
         m.connect('organization_activity', '/organization/activity/{id}',
                   action='activity', ckan_icon='time')
         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
@@ -7,12 +7,19 @@
 
 {% block primary_content %}
   <article class="module">
-    {% snippet 'snippets/page_header.html', items=[
-        h.build_nav_icon('ckanadmin_index', _('Sysadmins')),
-        h.build_nav_icon('ckanadmin_config', _('Config')),
-      ] %}
+    {% block page_header %}
+    	<header class="module-content page-header">
+        <ul class="nav nav-tabs">
+          {% block page_header_tabs %}
+            {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }}
+            {{ h.build_nav_icon('ckanadmin_config', _('Config')) }}
+          {% endblock %}
+        </ul>
+      </header>
+    {% endblock %}
     <div class="module-content">
-      {% block primary_content_inner %}{% endblock %}
+      {% block primary_content_inner %}
+      {% endblock %}
     </div>
   </article>
-{% endblock %}}
+{% endblock %}
diff --git a/ckan/templates/development/snippets/page_header.html b/ckan/templates/development/snippets/page_header.html
@@ -4,5 +4,11 @@
 h.literal('<li>') + h.link_to('In-active Tab', '#') + h.literal('</li>'),
 h.literal('<li>') + h.link_to('In-active Tab', '#') + h.literal('</li>'),
 ) %}
-	{% snippet 'snippets/page_header.html', items=items %}
+  <header class="module-content page-header">
+    <ul class="nav nav-tabs">
+      {% for item in items %}
+        {{ item }}
+      {% endfor %}
+    </ul>
+  </header>
 {% endwith %}
diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
@@ -17,23 +17,18 @@
 
 {% block primary_content %}
   <section class="module">
-    {% block package_header %}
+    {% block page_header %}
       <header class="module-content page-header">
         <ul class="nav nav-tabs">
-          <li{% if c.action == 'read' %} class="active"{% endif %}>
-            {% link_for _('Datasets'), controller='group', action='read', id=c.group_dict.name, icon='sitemap' %}
-          </li>
-          <li{% if c.action == 'activity' %} class="active"{% endif %}>
-            {% link_for _('Activity Stream'), controller='group', action='activity', id=c.group_dict.name, icon='time' %}
-          </li>
-          <li{% if c.action == 'about' %} class="active"{% endif %}>
-            {% link_for _('About'), controller='group', action='about', id=c.group_dict.name, icon='info-sign' %}
-          </li>
+          {% 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 %}
         </ul>
       </header>
     {% endblock %}
-    {% block primary_content_inner %}
-    {% endblock %}
+    {% block primary_content_inner %}{% endblock %}
   </section>
 {% endblock %}
 

diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html
@@ -18,21 +18,18 @@
 
 {% block primary_content %}
   <section class="module">
-    <header class="module-content page-header">
-      <ul class="nav nav-tabs">
-        <li{% if c.action == 'read' %} class="active"{% endif %}>
-          {% link_for _('Datasets'), controller='organization', action='read', id=c.group_dict.name, icon='sitemap' %}
-        </li>
-        <li{% if c.action == 'activity' %} class="active"{% endif %}>
-          {% link_for _('Activity Stream'), controller='organization', action='activity', id=c.group_dict.name, icon='time' %}
-        </li>
-        <li{% if c.action == 'about' %} class="active"{% endif %}>
-          {% link_for _('About'), controller='organization', action='about', id=c.group_dict.name, icon='info-sign' %}
-        </li>
-      </ul>
-    </header>
-    {% block primary_content_inner %}
+    {% block page_header %}
+      <header class="module-content page-header">
+        <ul class="nav nav-tabs">
+          {% block page_header_tabs %}
+            {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }}
+            {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name) }}
+            {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }}
+          {% endblock %}
+        </ul>
+      </header>
     {% endblock %}
+    {% block primary_content_inner %}{% endblock %}
   </section>
 {% endblock %}
 

diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
@@ -35,15 +35,17 @@
   {% endblock %}
 
   <article class="module prose">
-
     {% 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),
-        ] %}
+      <header class="module-content page-header">
+        <ul class="nav nav-tabs">
+          {% 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 %}
+        </ul>
+      </header>
     {% endblock %}
-
     {% block primary_content_inner %}{% endblock %}
   </article>
 {% endblock %}

diff --git a/ckan/templates/snippets/page_header.html b/ckan/templates/snippets/page_header.html
diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html
@@ -11,10 +11,14 @@
 {% block primary_content %}
   <article class="module">
     {% 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),
-        ] %}
+      <header class="module-content page-header">
+        <ul class="nav nav-tabs">
+          {% block page_header_tabs %}
+            {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
+            {{ h.build_nav_icon('user_edit', _('Settings'), id=user.name) }}
+          {% endblock %}
+        </ul>
+      </header>
     {% endblock %}
     <div class="module-content">
       {% block primary_content_inner %}{% endblock %}

diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html
@@ -21,10 +21,14 @@
 {% block primary_content %}
   <article class="module profile">
     {% 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),
-        ] %}
+      <header class="module-content page-header">
+        <ul class="nav nav-tabs">
+          {% 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 %}
+        </ul>
+      </header>
     {% endblock %}
     <section class="module-content">
       {% block primary_content_inner %}{% endblock %}