From 69b0d881cb1147bb11b325d6afc4a009da3165ec Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Thu, 20 Jun 2013 12:57:38 +0100
Subject: [PATCH] [#890] Renaming of basic template blocks

---
 ckan/public/base/less/layout.less             |  4 ++--
 ckan/public/base/less/toolbar.less            |  4 ++--
 ckan/templates/admin/base.html                |  2 +-
 ckan/templates/group/base_form_page.html      |  2 +-
 ckan/templates/group/index.html               |  2 +-
 ckan/templates/group/read.html                |  2 +-
 ckan/templates/group/read_base.html           |  4 ++--
 ckan/templates/organization/bulk_process.html |  5 ++++-
 ckan/templates/organization/edit_base.html    |  4 ++--
 ckan/templates/organization/index.html        |  2 +-
 ckan/templates/organization/members.html      |  5 ++++-
 ckan/templates/organization/read.html         |  2 +-
 ckan/templates/organization/read_base.html    |  4 ++--
 ckan/templates/package/edit.html              |  2 +-
 ckan/templates/package/read_base.html         |  4 ++--
 ckan/templates/package/resource_edit.html     |  2 +-
 ckan/templates/package/search.html            |  4 ++--
 ckan/templates/page.html                      | 14 +++++++-------
 ckan/templates/user/dashboard.html            |  2 +-
 ckan/templates/user/edit_base.html            |  2 +-
 ckan/templates/user/read_base.html            |  2 +-
 21 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less
index ec8b3e9ed8c..78905c89eee 100644
--- a/ckan/public/base/less/layout.less
+++ b/ckan/public/base/less/layout.less
@@ -46,8 +46,8 @@
 .primary {
   .primary {
     float: left;
-    width: 479px;
-    margin-left: 20px;
+    width: 467px;
+    margin-left: 0;
     margin-bottom: 20px;
     h1, h2, h3, h4 {
       &:first-child {
diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less
index 9ecf78f3410..2bc6ac2a0d5 100644
--- a/ckan/public/base/less/toolbar.less
+++ b/ckan/public/base/less/toolbar.less
@@ -5,7 +5,7 @@
   padding: 5px 0;
 }
 
-.add_action {
+.page_primary_action {
   margin-bottom: 20px;
 }
 
@@ -87,7 +87,7 @@
       background-color: @moduleBackgroundColor;
     }
   }
-  .edit_action {
+  .content_action {
     float: right;
     margin-top: -5px;
     margin-right: -7px;
diff --git a/ckan/templates/admin/base.html b/ckan/templates/admin/base.html
index a08ab2c93b6..aa7f9daf234 100644
--- a/ckan/templates/admin/base.html
+++ b/ckan/templates/admin/base.html
@@ -5,7 +5,7 @@
 {% block breadcrumb_content %}
 {% endblock %}
 
-{% block page_header_tabs %}
+{% block content_primary_nav %}
   {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }}
   {{ h.build_nav_icon('ckanadmin_config', _('Config')) }}
 {% endblock %}
diff --git a/ckan/templates/group/base_form_page.html b/ckan/templates/group/base_form_page.html
index 03285465f86..46c63eb8fa5 100644
--- a/ckan/templates/group/base_form_page.html
+++ b/ckan/templates/group/base_form_page.html
@@ -1,6 +1,6 @@
 {% extends "group/index.html" %}
 
-{% block add_action %}{% endblock %}
+{% block page_primary_action %}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{{ h.nav_link(_('Groups'), controller='group', action='index') }}</li>
diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html
index e8090316d22..30a294d8442 100644
--- a/ckan/templates/group/index.html
+++ b/ckan/templates/group/index.html
@@ -8,7 +8,7 @@
 
 {% block page_header %}{% endblock %}
 
-{% block add_action %}
+{% block page_primary_action %}
   {% if h.check_access('group_create') %}
     {% link_for _('Add Group'), controller='group', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
   {% endif %}
diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
index 86270503fad..7f5e33e1085 100644
--- a/ckan/templates/group/read.html
+++ b/ckan/templates/group/read.html
@@ -2,7 +2,7 @@
 
 {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
 
-{% block add_action %}
+{% block page_primary_action %}
   {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
 {% endblock %}
 
diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
index 4deedf9a09d..2db8d6f7318 100644
--- a/ckan/templates/group/read_base.html
+++ b/ckan/templates/group/read_base.html
@@ -7,13 +7,13 @@
   <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
 {% endblock %}
 
-{% block edit_action %}
+{% block content_action %}
   {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
     {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
-{% block page_header_tabs %}
+{% block content_primary_nav %}
   {{ 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) }}
diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html
index df45b0ebf35..b54e44599ec 100644
--- a/ckan/templates/organization/bulk_process.html
+++ b/ckan/templates/organization/bulk_process.html
@@ -2,11 +2,14 @@
 
 {% block subtitle %}{{ _('Edit datasets') }} - {{ super() }}{% endblock %}
 
+{% block page_primary_action %}
+  {% link_for _('Add dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+{% endblock %}
+
 {% block primary_content_inner %}
   <div class="clearfix">
     <h1 class="hide-heading">{{ _('Edit datasets') }}</h1>
     <div class="primary">
-      {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}
       <h3 class="page-heading">
         {% block page_heading %}
         {%- if c.page.item_count -%}
diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html
index e92664b9f74..6f29a82b1f8 100644
--- a/ckan/templates/organization/edit_base.html
+++ b/ckan/templates/organization/edit_base.html
@@ -12,14 +12,14 @@
   {% endblock %}
 {% endblock %}
 
-{% block edit_action %}
+{% block content_action %}
   {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
     {% link_for _('View organization'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %}
   {% endif %}
   {# <li>{% link_for _('History'), controller='organization', action='history', id=organization.name, class_='btn', icon='undo' %}</li> #}
 {% endblock %}
 
-{% block page_header_tabs %}
+{% block content_primary_nav %}
   {{ h.build_nav_icon('organization_edit', _('Edit'), id=c.group_dict.name) }}
   {{ h.build_nav_icon('organization_bulk_process', _('Datasets'), id=c.group_dict.name) }}
   {{ h.build_nav_icon('organization_members', _('Members'), id=c.group_dict.name) }}
diff --git a/ckan/templates/organization/index.html b/ckan/templates/organization/index.html
index 0c0aa933259..f144a553713 100644
--- a/ckan/templates/organization/index.html
+++ b/ckan/templates/organization/index.html
@@ -8,7 +8,7 @@
 
 {% block page_header %}{% endblock %}
 
-{% block add_action %}
+{% block page_primary_action %}
   {% if h.check_access('organization_create') %}
     {% link_for _('Add Organization'), controller='organization', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
   {% endif %}
diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html
index 28717e1e69a..875263feaa3 100644
--- a/ckan/templates/organization/members.html
+++ b/ckan/templates/organization/members.html
@@ -2,8 +2,11 @@
 
 {% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}
 
+{% block page_primary_action %}
+  {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+{% endblock %}
+
 {% block primary_content_inner %}
-  {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}
   <h3 class="page-heading">{{ _('{0} members'.format(c.members|length)) }}</h3>
   <table class="table table-header table-hover table-bordered">
     <col width="70" />
diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html
index d4ef362d77a..f7953fe7e78 100644
--- a/ckan/templates/organization/read.html
+++ b/ckan/templates/organization/read.html
@@ -1,6 +1,6 @@
 {% extends "organization/read_base.html" %}
 
-{% block add_action %}
+{% block page_primary_action %}
   {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
     {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
   {% endif %}
diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html
index db26c0cf814..a9ff1bf6302 100644
--- a/ckan/templates/organization/read_base.html
+++ b/ckan/templates/organization/read_base.html
@@ -7,13 +7,13 @@
   <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
 {% endblock %}
 
-{% block edit_action %}
+{% block content_action %}
   {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
     {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
-{% block page_header_tabs %}
+{% block content_primary_nav %}
   {{ 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) }}
diff --git a/ckan/templates/package/edit.html b/ckan/templates/package/edit.html
index 971ac9b094a..4f15985d033 100644
--- a/ckan/templates/package/edit.html
+++ b/ckan/templates/package/edit.html
@@ -13,7 +13,7 @@
   {% snippet 'package/snippets/resources.html', pkg=pkg, action='resource_edit' %}
 {% endblock %}
 
-{% block edit_action %}
+{% block content_action %}
   {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye-open' %}
 {% endblock %}
 
diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index 6208da4a53f..d9eb8938a41 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -14,13 +14,13 @@
   <meta property="og:description" content="{{ description|forceescape }}">
 {% endblock -%}
 
-{% block edit_action %}
+{% block content_action %}
   {% if h.check_access('package_update', {'id':pkg.id }) %}
     {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
-{% block page_header_tabs %}
+{% block content_primary_nav %}
   {{ 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) }}
diff --git a/ckan/templates/package/resource_edit.html b/ckan/templates/package/resource_edit.html
index 48482f8de49..52ac2ab4722 100644
--- a/ckan/templates/package/resource_edit.html
+++ b/ckan/templates/package/resource_edit.html
@@ -12,7 +12,7 @@
   <li class="active"><a href="">{{ _('Edit') }}</a></li>
 {% endblock %}
 
-{% block edit_action %}
+{% block content_action %}
   {% link_for _('View resource'), controller='package', action='resource_read', id=pkg_dict.name, resource_id=res.id, class_='btn', icon='eye-open' %}
 {% endblock %}
 
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index 7fb24bf2b15..41c59dc3863 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -10,9 +10,9 @@
 {% block primary_content %}
   <section class="module">
     <div class="module-content">
-      {% block add_action %}
+      {% block page_primary_action %}
         {% if h.check_access('package_create') %}
-          <div class="add_action">
+          <div class="page_primary_action">
             {% link_for _('Add Dataset'), controller='package', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
           </div>
         {% endif %}
diff --git a/ckan/templates/page.html b/ckan/templates/page.html
index 669d46da4a2..3b84e703e9a 100644
--- a/ckan/templates/page.html
+++ b/ckan/templates/page.html
@@ -72,20 +72,20 @@ <h1>My page content</h1>
                   <article class="module">
                     {% block page_header %}
                       <header class="module-content page-header">
-                        {% if self.edit_action() | trim %}
-                          <div class="edit_action">
-                            {% block edit_action %}{% endblock %}
+                        {% if self.content_action() | trim %}
+                          <div class="content_action">
+                            {% block content_action %}{% endblock %}
                           </div>
                         {% endif %}
                         <ul class="nav nav-tabs">
-                          {% block page_header_tabs %}{% endblock %}
+                          {% block content_primary_nav %}{% endblock %}
                         </ul>
                       </header>
                     {% endblock %}
                     <div class="module-content">
-                      {% if self.add_action() | trim %}
-                        <div class="add_action">
-                          {% block add_action %}{% endblock %}
+                      {% if self.page_primary_action() | trim %}
+                        <div class="page_primary_action">
+                          {% block page_primary_action %}{% endblock %}
                         </div>
                       {% endif %}
                       {% block primary_content_inner %}
diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html
index 3e8daa2bc4b..d9458910c47 100644
--- a/ckan/templates/user/dashboard.html
+++ b/ckan/templates/user/dashboard.html
@@ -1,6 +1,6 @@
 {% extends "user/edit_base.html" %}
 
-{% block add_action %}
+{% block page_primary_action %}
   {% if h.check_access('package_create') %}
     {% link_for _('Add Dataset'), controller='package', action='new', class_="btn btn-primary", icon="plus-sign-alt" %}
   {% endif %}
diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html
index 4826aada4da..f10048b5cd4 100644
--- a/ckan/templates/user/edit_base.html
+++ b/ckan/templates/user/edit_base.html
@@ -13,7 +13,7 @@
     {% block page_header %}
       <header class="module-content page-header">
         <ul class="nav nav-tabs">
-          {% block page_header_tabs %}
+          {% block content_primary_nav %}
             {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
             {{ h.build_nav_icon('user_edit', _('Settings'), id=user.name) }}
           {% endblock %}
diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html
index b0a97403d43..fc09cc773ec 100644
--- a/ckan/templates/user/read_base.html
+++ b/ckan/templates/user/read_base.html
@@ -23,7 +23,7 @@
     {% block page_header %}
       <header class="module-content page-header">
         <ul class="nav nav-tabs">
-          {% block page_header_tabs %}
+          {% block content_primary_nav %}
             {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }}
             {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }}
           {% endblock %}