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


From 39f542704b4df6c302915b0b21e283906bf58ed1 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Fri, 9 Aug 2013 19:52:19 +0000
Subject: Option to have a message on the ban page

Conflicts:
	inc/config.php
---
 inc/config.php        | 4 ++++
 templates/banned.html | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index d8a0ead2..62bc72bb 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -719,6 +719,10 @@
 	// Automatically remove unnecessary whitespace when compiling HTML files from templates.
 	$config['minify_html'] = true;
 
+	// Optional HTML to append to "You are banned" pages. For example, you could include instructions and/or
+	// a link to an email address or IRC chat room to appeal the ban.
+	$config['ban_page_extra'] = '';
+
 /*
  * ====================
  *  Javascript
diff --git a/templates/banned.html b/templates/banned.html
index e7b626f6..b052cd41 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -76,6 +76,8 @@
 		</span>
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
+
+	<p>{{ config.ban_page_message }}</p>
 </div>
 {% endfilter %}
 
-- 
cgit v1.3


From 9ee598ee81cc89c3857b9a1d78a4f994afa8d8a8 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Fri, 9 Aug 2013 19:55:25 +0000
Subject: Option to have a message on the ban page

---
 templates/banned.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/banned.html b/templates/banned.html
index b052cd41..401c36e5 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -77,7 +77,9 @@
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
 
-	<p>{{ config.ban_page_message }}</p>
+	{% if config.ban_page_message %}
+		<p>{{ config.ban_page_message }}</p>
+	{% endif %}
 </div>
 {% endfilter %}
 
-- 
cgit v1.3


From aecfc37510f298571f346c0e1008c089d25a7fd2 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 11 Aug 2013 21:30:02 +1000
Subject: Rename ban_page_message to ban_page_extra

---
 templates/banned.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/banned.html b/templates/banned.html
index 401c36e5..a4498cf5 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -77,8 +77,8 @@
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
 
-	{% if config.ban_page_message %}
-		<p>{{ config.ban_page_message }}</p>
+	{% if config.ban_page_extra %}
+		<p>{{ config.ban_page_extra }}</p>
 	{% endif %}
 </div>
 {% endfilter %}
-- 
cgit v1.3