From 56c258f8ea192e5dedeba69a359c3e033e248e32 Mon Sep 17 00:00:00 2001
From: Aron Carroll <self@aroncarroll.com>
Date: Thu, 2 Aug 2012 17:28:26 +0100
Subject: [PATCH] [#2375] Add new {% block subtitle %} to base.html

Saves us using the delimiter all over the place in the templates.
---
 ckan/templates/base.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index a94b1585509..4a3ef09f8ec 100644
--- 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