From acb4c47a9fe418284f2dab73d32bda75e34ed04a Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Thu, 8 Aug 2013 18:58:44 +0000
Subject: Allow for HTML in the board subtitle

Conflicts:
	inc/config.php
---
 templates/index.html         | 6 +++++-
 templates/mod/dashboard.html | 8 +++++++-
 templates/thread.html        | 8 ++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index e32ac253..d5e6cd18 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,7 +13,11 @@
 		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
 			{% if board.subtitle %}
-				{{ board.subtitle|e }}
+				{% if config.allow_subtitle_html %}
+					{{ board.subtitle }}
+				{% else %}
+					{{ board.subtitle|e }}
+				{% endif %}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index e9fb7c9c..e2f7507d 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -8,7 +8,13 @@
 					 - 
 				{{ board.title|e }}
 				{% if board.subtitle %}
-					 <small>&mdash; {{ board.subtitle|e }}</small>
+					<small>&mdash; 
+						{% if config.allow_subtitle_html %}
+							{{ board.subtitle }}
+						{% else %}
+							{{ board.subtitle|e }}
+						{% endif %}
+					</small>
 				{% endif %}
 				{% if mod|hasPermission(config.mod.manageboards) %}
 					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
diff --git a/templates/thread.html b/templates/thread.html
index 97f8a3db..e8c43ef7 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -13,7 +13,11 @@
 		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
 			{% if board.subtitle %}
-				{{ board.subtitle|e }}
+				{% if config.allow_subtitle_html %}
+					{{ board.subtitle }}
+				{% else %}
+					{{ board.subtitle|e }}
+				{% endif %}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
@@ -42,4 +46,4 @@
 		ready();
 	{% endraw %}</script>
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.3