[#2375] Update all templates to use {% block subtitle %}

ckan · Aug 6, 2012 · 5087152 · 5087152
1 parent 3ef5739
commit 5087152
Show file tree

Hide file tree

Showing 34 changed files with 36 additions and 38 deletions.
diff --git a/ckan/templates/admin/authz.html b/ckan/templates/admin/authz.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Administration - Authorization') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Administration - Authorization') }}{% endblock %}
 
 {% block breadcrumb_content %}
 {% endblock %}

diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html
@@ -2,7 +2,7 @@
 
 {% extends "page.html" %}
 
-{% block title %}{{ _('Administration') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Administration') }}{% endblock %}
 
 {% block primary %}
   <article class="module">

diff --git a/ckan/templates/admin/index.html b/ckan/templates/admin/index.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Administration') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Administration') }}{% endblock %}
 
 {% block breadcrumb_content %}
 {% endblock %}
@@ -9,9 +9,7 @@
   <article class="module">
     <div class="module-content">
       <h1 class="page-heading">{{ _('Current Sysadmins') }}</h1>
-      <p>You can change sysadmins on the
-        <a href="{% url_for controller='admin', action='authz' %}">authorization page</a>
-      .</p>
+      <p>{% trans url=h.url_for(controller='admin', action='authz') %}You can change sysadmins on the <a href="{{ url }}">authorization page</a>.{% trans %}</p>
       <ul>
         {% for user in c.sysadmins %}
           <li py:for="user in c.sysadmins">

diff --git a/ckan/templates/error_document_template.html b/ckan/templates/error_document_template.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ gettext('Error %(error_code)s', error_code=c.code[0]) }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ gettext('Error %(error_code)s', error_code=c.code[0]) }}{% endblock %}
 
 {% block primary_content %}
 	{{ c.content}}

diff --git a/ckan/templates/group/confirm_delete.html b/ckan/templates/group/confirm_delete.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _("Confirm Delete") }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
 
 {% block maintag %}<div class="row" role="main">{% endblock %}
 

diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html
@@ -1,6 +1,6 @@
 {% extends "group/base_form_page.html" %}
 
-{% block title %}{{ _('Edit a Group') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Edit a Group') }}{% endblock %}
 
 {% block breadcrumb_link %}{% link_for _('Edit Group'), controller='group', action='edit', id=c.group.name %}{% endblock %}
 

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

diff --git a/ckan/templates/group/new.html b/ckan/templates/group/new.html
@@ -1,6 +1,6 @@
 {% extends "group/base_form_page.html" %}
 
-{% block title %}{{ _('Create a Group') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Create a Group') }}{% endblock %}
 
 {% block breadcrumb_link %}{{ h.nav_link(_('Create Group'), controller='group', action='edit', id=c.group.name) }}{% endblock %}
 

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

diff --git a/ckan/templates/home/about.html b/ckan/templates/home/about.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('About') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('About') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{% link_for _('About'), controller='home', action='about' %}</li>

diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _("Welcome") }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _("Welcome") }}{% endblock %}
 
 {% block maintag %}{% endblock %}
 

diff --git a/ckan/templates/package/confirm_delete.html b/ckan/templates/package/confirm_delete.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _("Confirm Delete") }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
 
 {% block maintag %}<div class="row" role="main">{% endblock %}
 

diff --git a/ckan/templates/package/confirm_delete_resource.html b/ckan/templates/package/confirm_delete_resource.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _("Confirm Delete") }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
 
 {% block maintag %}<div class="row" role="main">{% endblock %}
 

diff --git a/ckan/templates/package/followers.html b/ckan/templates/package/followers.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Followers') }} - {{ c.pkg_dict.title or c.pkg_dict.name }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Followers') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %}
 
 {% block primary_content %}
   <article class="module">

diff --git a/ckan/templates/package/new.html b/ckan/templates/package/new.html
@@ -1,3 +1,3 @@
 {% extends "package/base_form_page.html" %}
 
-{% block title %}{{ _('Create dataset') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Create dataset') }}{% endblock %}
diff --git a/ckan/templates/package/new_package_metadata.html b/ckan/templates/package/new_package_metadata.html
@@ -1,5 +1,5 @@
 {% extends "package/base_form_page.html" %}
 
-{% block title %}{{ _('Add metadata to the dataset') }} - {{ super }}{% endblock %}
+{% block subtitle %}{{ _('Add metadata to the dataset') }}{% endblock %}
 
 {% block form %}{{ h.snippet('package/snippets/package_metadata_form.html', data=data, errors=errors, include_metadata=false, pkg_name=pkg_name) }}{% endblock %}
diff --git a/ckan/templates/package/new_resource.html b/ckan/templates/package/new_resource.html
@@ -6,7 +6,7 @@
   {% set logged_in = false %}
 {% endif %}
 
-{% block title %}{{ _('Add data to the dataset') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Add data to the dataset') }}{% endblock %}
 
 {% block form %}{% snippet 'package/snippets/resource_form.html', data=data, errors=errors, error_summary=error_summary, include_metadata=false, pkg_name=pkg_name, stage=stage, allow_upload=logged_in %}{% endblock %}
 

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -2,7 +2,7 @@
 
 {% set pkg = c.pkg_dict %}
 
-{% block title %}{{ pkg.title or pkg.name }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %}
 
 {% block breadcrumb_content %}
   {% set dataset = pkg.title or pkg.name %}

diff --git a/ckan/templates/package/resource_api_data.html b/ckan/templates/package/resource_api_data.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('API Info') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('API Info') }}{% endblock %}
 
 {% block breadcrumb %}{% endblock %}
 

diff --git a/ckan/templates/package/resource_edit.html b/ckan/templates/package/resource_edit.html
@@ -3,7 +3,7 @@
 
 {% extends "package/new_resource.html" %}
 
-{% block title %}{{ h.dataset_display_name(pkg_dict) }} - {{ h.resource_display_name(res) }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ h.dataset_display_name(pkg_dict) }} - {{ h.resource_display_name(res) }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{% link_for _('Datasets'), controller='package', action='search', highlight_actions = 'new index' %}</li>

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
@@ -3,7 +3,7 @@
 {% set pkg = c.pkg_dict %}
 {% set res = c.resource %}
 
-{% block title %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{% link_for _('Datasets'), controller='package', action='search', highlight_actions = 'new index' %}</li>

diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _("Search for a Dataset") }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _("Search for a Dataset") }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ h.nav_link(_('Search Datasets'), controller='package', action='search', highlight_actions = 'new index') }}</li>

diff --git a/ckan/templates/related/confirm_delete.html b/ckan/templates/related/confirm_delete.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _("Confirm Delete") }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
 
 {% block maintag %}<div class="row" role="main">{% endblock %}
 

diff --git a/ckan/templates/related/dashboard.html b/ckan/templates/related/dashboard.html
@@ -3,7 +3,7 @@
 {% set page = c.page %}
 {% set item_count = c.page.item_count %}
 
-{% block title %}{{ _('Apps & Ideas') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Apps & Ideas') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ _('Apps & Ideas') }}</li>

diff --git a/ckan/templates/related/edit.html b/ckan/templates/related/edit.html
@@ -1,6 +1,6 @@
 {% extends "related/base_form_page.html" %}
 
-{% block title %}Edit related item - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Edit related item') }}{% endblock %}
 
 {# TODO: pass the same context in here so we can create links #}
 {% block breadcrumb_item %}{{ h.nav_link(_('Edit Related'), controller='related', action='edit', id=c.id, related_id="") }}{% endblock %}

diff --git a/ckan/templates/related/new.html b/ckan/templates/related/new.html
@@ -1,6 +1,6 @@
 {% extends "related/base_form_page.html" %}
 
-{% block title %}Create a related item - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Create a related item') }}{% endblock %}
 
 {% block breadcrumb_item %}{{ h.nav_link(_('Create Related'), controller='related', action='new', id=c.id) }}{% endblock %}
 

diff --git a/ckan/templates/user/followers.html b/ckan/templates/user/followers.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Followers') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Followers') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{{ h.nav_link(_('Home'), controller='user', action='me') }}</li>

diff --git a/ckan/templates/user/list.html b/ckan/templates/user/list.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('All Users') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('All Users') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ h.nav_link(_('Users'), controller='user', action='index') }}</li>

diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Login') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Login') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ h.nav_link(_('Login'), controller='user', action='login') }}</li>

diff --git a/ckan/templates/user/logout.html b/ckan/templates/user/logout.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Logged Out') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Logged Out') }}{% endblock %}
 
 {% block primary_content %}
   <section class="module">

diff --git a/ckan/templates/user/new.html b/ckan/templates/user/new.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Register') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Register') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ h.nav_link(_('Registration'), controller='user', action='register') }}</li>

diff --git a/ckan/templates/user/perform_reset.html b/ckan/templates/user/perform_reset.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Reset Your Password') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Reset Your Password') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ _('Password Reset') }}</li>

diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
@@ -2,7 +2,7 @@
 
 {% set user = c.user_dict %}
 
-{% block title %}{{ user.display_name }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ user.display_name }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{% link_for _('Users'), controller='user', action='index' %}</li>

diff --git a/ckan/templates/user/request_reset.html b/ckan/templates/user/request_reset.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% block title %}{{ _('Reset Your Password') }} - {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Reset Your Password') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{% link_for _('Password Reset'), controller='user', action='register' %}</li>
@@ -12,7 +12,7 @@
       <h1 class="page-heading">{{ _('Reset Your Password') }}</h1>
       {% block form %}
         <form action="" method="post" class="form-inline control-medium">
-          <label for="field-username">Username</label>
+          <label for="field-username">{{ _('Username') }}</label>
           <input id="field-username" name="user" value="" />
           <button class="btn btn-large btn-primary" type="submit" name="reset">{{ _("Request Reset") }}</button>
         </form>