[#1030] Tidy up of group template page titles

ckan · Oct 3, 2013 · 1dca8f8 · 1dca8f8
1 parent ef068dc
commit 1dca8f8
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 9 deletions.
diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html
@@ -1,6 +1,6 @@
 {% extends "group/read_base.html" %}
 
-{% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('About') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
   <h1>{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}</h1>

diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html
@@ -1,6 +1,6 @@
 {% extends "group/read_base.html" %}
 
-{% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
+{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
   <h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>

diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html
@@ -8,7 +8,5 @@
   {% endblock %}
 {% endblock %}
 
-{% block subtitle %}{{ _('Edit Group') }}{% endblock %}
-
 {% block page_heading_class %}hide-heading{% endblock %}
 {% block page_heading %}{{ _('Edit Group') }}{% endblock %}
diff --git a/ckan/templates/group/edit_base.html b/ckan/templates/group/edit_base.html
@@ -1,5 +1,7 @@
 {% extends "page.html" %}
 
+{% block subtitle %}{{ _('Manage') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}
+
 {% set group = c.group_dict %}
 
 {% block breadcrumb_content %}

diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block subtitle %}{{ _('Groups of Datasets') }}{% endblock %}
+{% block subtitle %}{{ _('Groups') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{% link_for _('Groups'), controller='group', action='index' %}</li>

diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html
@@ -1,6 +1,6 @@
 {% extends "group/edit_base.html" %}
 
-{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}
 
 {% block primary_content_inner %}
   {% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}

diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
@@ -1,7 +1,5 @@
 {% extends "group/read_base.html" %}
 
-{% block subtitle %}{{ c.group_dict.display_name }}{% 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 %}

diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{% link_for _('Groups'), controller='group', action='index' %}</li>