[#1030] Update to organization page titles

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

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/ckan/templates/organization/about.html b/ckan/templates/organization/about.html
@@ -1,6 +1,6 @@
 {% extends "organization/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/organization/activity_stream.html b/ckan/templates/organization/activity_stream.html
@@ -1,6 +1,6 @@
 {% extends "organization/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/organization/edit.html b/ckan/templates/organization/edit.html
@@ -1,6 +1,6 @@
 {% extends "organization/base_form_page.html" %}
 
-{% block subtitle %}{{ _('Edit Organization') }}{% endblock %}
+{% block subtitle %}{{ _('Edit') }} - {{ super() }}{% endblock %}
 
 {% block page_heading_class %}hide-heading{% endblock %}
 {% block page_heading %}{{ _('Edit Organization') }}{% endblock %}
diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html
@@ -2,7 +2,7 @@
 
 {% set organization = c.group_dict %}
 
-{% block subtitle %}{{ organization.display_name }}{% endblock %}
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>

diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html
@@ -4,7 +4,7 @@
 
 {% set user = c.user_dict %}
 
-{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
   {% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %}
@@ -28,11 +28,11 @@ <h1 class="page-heading">
         {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
         <a href="{% url_for controller='organization', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-i18n="{{ locale }}">{{ _('Delete') }}</a>
         <button class="btn btn-primary" type="submit" name="submit" >
-          {{ _('Save') }}
+          {{ _('Update Member') }}
         </button>
       {% else %}
         <button class="btn btn-primary" type="submit" name="submit" >
-          {{ _('Add') }}
+          {{ _('Add Member') }}
         </button>
       {% endif %}        
     </div>

diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html
@@ -1,6 +1,6 @@
 {% extends "organization/edit_base.html" %}
 
-{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('Members') }} - {{ super() }}{% 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' %}

diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/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 }} - {{ _('Organizations') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>