{{ _('Current Sysadmins') }}
-You can change sysadmins on the - authorization page - .
+{% trans url=h.url_for(controller='admin', action='authz') %}You can change sysadmins on the authorization page.{% trans %}
-
{% for user in c.sysadmins %}
-
diff --git a/ckan/templates/error_document_template.html b/ckan/templates/error_document_template.html
index a1cff3a9784..ddfccfac8eb 100644
--- 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
index dde8c745cd0..c9b15a89d5d 100644
--- 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 %}{% endblock %} diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html index ddbb7273e4f..90734091141 100644 --- 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 index e248f40bbba..fa3b7c44ea8 100644 --- 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 %}
- {% link_for _('Groups'), controller='group', action='index' %}
diff --git a/ckan/templates/group/new.html b/ckan/templates/group/new.html index c926a5cacbc..d6c9d4ae319 100644 --- 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 index cd26d8b5bcb..30160499aab 100644 --- 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 %}- {% link_for _('Groups'), controller='group', action='index' %}
diff --git a/ckan/templates/home/about.html b/ckan/templates/home/about.html index 9a575378bce..b58d4ebf8af 100644 --- 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 %}- {% link_for _('About'), controller='home', action='about' %}
diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html index 12c2fb642bf..bb070c0bebb 100644 --- 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 index 18c8c8e0c2e..a490a2819a7 100644 --- 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 %}{% endblock %} diff --git a/ckan/templates/package/confirm_delete_resource.html b/ckan/templates/package/confirm_delete_resource.html index 5ddb34b2c39..8f4fb8b0681 100644 --- 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 %}{% endblock %} diff --git a/ckan/templates/package/followers.html b/ckan/templates/package/followers.html index 56d952aa81b..242a9c4ab31 100644 --- 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 %}diff --git a/ckan/templates/package/new.html b/ckan/templates/package/new.html index f7510b57801..a3e7bae8e1c 100644 --- 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 index f3bb12b3c66..b0aa54e9687 100644 --- 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 index 3c61f19f40a..faa93ee9ea7 100644 --- 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 index da89ef5ee49..98d204431eb 100644 --- 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 index 323ea331b38..c8e596119cd 100644 --- 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 index e4375edd750..b0cde7beb0d 100644 --- 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 %} - {% link_for _('Datasets'), controller='package', action='search', highlight_actions = 'new index' %}
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index 97736d580a3..2114ed25131 100644 --- 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 %}- {% link_for _('Datasets'), controller='package', action='search', highlight_actions = 'new index' %}
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html index 0f46556bfce..81404d8f9bf 100644 --- 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 %}- {{ h.nav_link(_('Search Datasets'), controller='package', action='search', highlight_actions = 'new index') }}
diff --git a/ckan/templates/related/confirm_delete.html b/ckan/templates/related/confirm_delete.html index 9a17fe04ef9..3589f914162 100644 --- 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 %}{% endblock %} diff --git a/ckan/templates/related/dashboard.html b/ckan/templates/related/dashboard.html index fdac1bcbccf..e856d0021db 100644 --- 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 %}- {{ _('Apps & Ideas') }}
diff --git a/ckan/templates/related/edit.html b/ckan/templates/related/edit.html index b4d53322ed6..26c1e49b701 100644 --- 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 index e96b55657f3..7fb3ce90633 100644 --- 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 index 26177d51073..bc31b8a54d1 100644 --- 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 %}- {{ h.nav_link(_('Home'), controller='user', action='me') }}
diff --git a/ckan/templates/user/list.html b/ckan/templates/user/list.html index b9c8dde360a..c39a503e2f2 100644 --- 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 %}- {{ h.nav_link(_('Users'), controller='user', action='index') }}
diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html index a00772ff453..613521200d7 100644 --- 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 %}- {{ h.nav_link(_('Login'), controller='user', action='login') }}
diff --git a/ckan/templates/user/logout.html b/ckan/templates/user/logout.html index 361d93820dd..fcfc572e8c6 100644 --- 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 %}diff --git a/ckan/templates/user/new.html b/ckan/templates/user/new.html index 0685bbf85de..5fdc3db9bc8 100644 --- 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 %} - {{ h.nav_link(_('Registration'), controller='user', action='register') }}
diff --git a/ckan/templates/user/perform_reset.html b/ckan/templates/user/perform_reset.html index 632a84b24c3..abb796a3d26 100644 --- 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 %}- {{ _('Password Reset') }}
diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html index 7ac7b3aa4d8..5df4ebaa6b6 100644 --- 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 %}- {% link_for _('Users'), controller='user', action='index' %}
diff --git a/ckan/templates/user/request_reset.html b/ckan/templates/user/request_reset.html index 0588c2c219e..0518a60c083 100644 --- 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 %}- {% link_for _('Password Reset'), controller='user', action='register' %}
@@ -12,7 +12,7 @@{{ _('Reset Your Password') }}
{% block form %}