[#2375] Add new {% block subtitle %} to base.html

Saves us using the delimiter all over the place in the templates.
ckan · Aug 2, 2012 · 56c258f · tobes · Aug 2, 2012 · aron
1 parent 06257ac
commit 56c258f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ckan/templates/base.html b/ckan/templates/base.html
@@ -41,7 +41,13 @@
       {% block title %}My Subtitle - {{ super() }}{% endblock %}
 
     #}
-    <title>{% block title %}{{ g.site_title }}{% endblock %}</title>
+    <title>
+      {%- block title -%}
+        {%- block subtitle %}{% endblock -%}
+        {%- if self.subtitle()|trim %} {{ config.template_title_delimiter or '-' }} {% endif -%}
+        {{ g.site_title }}
+      {%- endblock -%}
+    </title>
 
     {#
     The html5shim allows you to modify/override the html5 shim. This is useful