From 1b9ade00e6bdc9c00bbb02d9db6baed168fc82f0 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Tue, 26 Mar 2013 16:16:01 +0000
Subject: [PATCH] [#688] Adds page_heading and inner blocks to user templates

---
 ckan/templates/user/activity_stream.html |  4 +++-
 ckan/templates/user/dashboard.html       |  8 ++++++++
 ckan/templates/user/followers.html       |  6 +++++-
 ckan/templates/user/list.html            | 10 +++++++++-
 ckan/templates/user/new.html             |  4 +++-
 ckan/templates/user/read.html            |  7 +++++--
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ckan/templates/user/activity_stream.html b/ckan/templates/user/activity_stream.html
index 11fc35ccd41..2d85e26c96a 100644
--- a/ckan/templates/user/activity_stream.html
+++ b/ckan/templates/user/activity_stream.html
@@ -3,6 +3,8 @@
 {% block subtitle %}{{ _('Activity Stream') }}{% endblock %}
 
 {% block primary_content_inner %}
-  <h2 class="hide-heading">{{ _('Activity Stream') }}</h2>
+  <h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>
+  {% block activity_stream %}
   {{ c.user_activity_stream | safe }}
+  {% endblock %}
 {% endblock %}
diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html
index a1d784b3e3c..5ee3e1edffd 100644
--- a/ckan/templates/user/dashboard.html
+++ b/ckan/templates/user/dashboard.html
@@ -10,20 +10,27 @@
   <div data-module="dashboard">
     {% snippet 'user/snippets/followee_dropdown.html', context=c.dashboard_activity_stream_context, followees=c.followee_list %}
     <h2 class="page-heading">
+      {% block page_heading %}
       {{ _('News feed') }}
+      {% endblock %}
       <small>{{ _('Activity from items that you follow') }}</small>
     </h2>
+    {% block activity_stream %}
     {{ c.dashboard_activity_stream }}
+    {% endblock %}
   </div>
 {% endblock %}
 
 {% block secondary_content %}
+  {% block dashboard_activity_stream_context %}
   {% if not c.dashboard_activity_stream_context.dict == None %}
     <div class="context-info dashboard-context">
       <span class="arrow"></span>
       {% snippet 'snippets/context.html', type=c.dashboard_activity_stream_context.filter_type, dict=c.dashboard_activity_stream_context.dict %}
     </div>
   {% endif %}
+  {% endblock %}
+  {% block dashboard_datasets %}
   <div class="module module-narrow module-shallow">
     <h2 class="module-heading">
       <i class="icon-sitemap"></i>
@@ -44,4 +51,5 @@ <h2 class="module-heading">
       </div>
     {% endif %}
   </div>
+  {% endblock %}
 {% endblock %}
diff --git a/ckan/templates/user/followers.html b/ckan/templates/user/followers.html
index 10629ef506c..43264762c39 100644
--- a/ckan/templates/user/followers.html
+++ b/ckan/templates/user/followers.html
@@ -3,6 +3,10 @@
 {% block subtitle %}{{ _('Followers') }}{% endblock %}
 
 {% block primary_content_inner %}
-  <h2 class="hide-heading">{{ _('Followers').format(name=c.user_dict.display_name) }}</h2>
+  <h2 class="hide-heading">
+  	{% block page_heading %}{{ _('Followers') }}{% endblock %}
+  </h2>
+  {% block followers_list %}
   {% snippet "user/snippets/followers.html", followers=c.followers %}
+  {% endblock %}
 {% endblock %}
diff --git a/ckan/templates/user/list.html b/ckan/templates/user/list.html
index 97f19e950d0..a1fd9d7195c 100644
--- a/ckan/templates/user/list.html
+++ b/ckan/templates/user/list.html
@@ -9,14 +9,22 @@
 {% block primary_content %}
   <article class="module">
     <div class="module-content">
-      <h1 class="page-heading">{{ _('Users') }}</h1>
+      <h1 class="page-heading">
+        {% block page_heading %}{{ _('Users') }}{% endblock %}
+      </h1>
+      {% block users_list %}
       <ul class="user-list">
+        {% block users_list_inner %}
         {% for user in c.page.items %}
           <li>{{ h.linked_user(user['name'], maxlength=20) }}</li>
         {% endfor %}
+        {% endblock %}
       </ul>
+      {% endblock %}
     </div>
+    {% block page_pagination %}
     {{ c.page.pager(q=c.q, order_by=c.order_by) }}
+    {% endblock %}
   </article>
 {% endblock %}
 
diff --git a/ckan/templates/user/new.html b/ckan/templates/user/new.html
index 5fdc3db9bc8..f735a38dd33 100644
--- a/ckan/templates/user/new.html
+++ b/ckan/templates/user/new.html
@@ -9,7 +9,9 @@
 {% block primary_content %}
   <article class="module">
     <div class="module-content">
-      <h1 class="page-heading">{{ _('Register for an Account') }}</h1>
+      <h1 class="page-heading">
+        {% block page_heading %}{{ _('Register for an Account') }}{% endblock %}
+      </h1>
       {{ c.form | safe }}
     </div>
   </article>
diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
index c2afb1bca6c..13f58fc3054 100644
--- a/ckan/templates/user/read.html
+++ b/ckan/templates/user/read.html
@@ -3,7 +3,10 @@
 {% block subtitle %}{{ user.display_name }}{% endblock %}
 
 {% block primary_content_inner %}
-  <h2 class="hide-heading">{{ _('Datasets') }}</h2>
+  <h2 class="hide-heading">
+    {% block page_heading %}{{ _('Datasets') }}{% endblock %}
+  </h2>
+  {% block package_list %}
   {% if user.datasets %}
     {% snippet 'snippets/package_list.html', packages=user.datasets %}
   {% else %}
@@ -20,6 +23,6 @@ <h2 class="hide-heading">{{ _('Datasets') }}</h2>
         {{ _('User hasn\'t created any datasets.') }}
       </p>
     {% endif %}
-
   {% endif %}
+  {% endblock %}
 {% endblock %}