From 7d1acd4a0580449cf16da944535f0d268ee74275 Mon Sep 17 00:00:00 2001 From: ctrlcctrlv Date: Thu, 8 Aug 2013 18:43:24 +0000 Subject: Make boardlist bracket wrapping optional --- inc/config.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index ef2ba4ac..66fae0f4 100644 --- a/inc/config.php +++ b/inc/config.php @@ -710,6 +710,9 @@ // ) // ); + // Whether or not to put brackets around the whole board list + $config['boardlist_wrap_bracket'] = false; + // Automatically remove unnecessary whitespace when compiling HTML files from templates. $config['minify_html'] = true; -- cgit v1.3 From 4bce3d75842c76934c112c11ebdfbc8705e40c8f Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Sun, 11 Aug 2013 21:06:13 +1000 Subject: Clean: Make boardlist bracket wrapping optional --- inc/config.php | 6 +++--- inc/display.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index 66fae0f4..fae7d2a5 100644 --- a/inc/config.php +++ b/inc/config.php @@ -696,6 +696,9 @@ // array('status' => 'http://status.example.org/') // ); + // Whether or not to put brackets around the whole board list + $config['boardlist_wrap_bracket'] = false; + // Board categories. Only used in the "Categories" theme. // $config['categories'] = array( // 'Group Name' => array('a', 'b', 'c'), @@ -710,9 +713,6 @@ // ) // ); - // Whether or not to put brackets around the whole board list - $config['boardlist_wrap_bracket'] = false; - // Automatically remove unnecessary whitespace when compiling HTML files from templates. $config['minify_html'] = true; diff --git a/inc/display.php b/inc/display.php index 893b7ce5..99228fc3 100644 --- a/inc/display.php +++ b/inc/display.php @@ -46,7 +46,7 @@ function createBoardlist($mod=false) { if (!isset($config['boards'])) return array('top'=>'','bottom'=>''); $body = doBoardListPart($config['boards'], $mod?'?/':$config['root']); - if (!preg_match('/\] $/', $body) && $config['boardlist_wrap_bracket']) + if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body)) $body = '[' . $body . ']'; $body = trim($body); -- cgit v1.3 From acb4c47a9fe418284f2dab73d32bda75e34ed04a Mon Sep 17 00:00:00 2001 From: ctrlcctrlv Date: Thu, 8 Aug 2013 18:58:44 +0000 Subject: Allow for HTML in the board subtitle Conflicts: inc/config.php --- inc/config.php | 3 +++ templates/index.html | 6 +++++- templates/mod/dashboard.html | 8 +++++++- templates/thread.html | 8 ++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index fae7d2a5..d8a0ead2 100644 --- a/inc/config.php +++ b/inc/config.php @@ -615,6 +615,9 @@ // Number of reports you can create at once. $config['report_limit'] = 3; + // Allow unfiltered HTML in board subtitles. This is useful for placing icons and links. + $config['allow_subtitle_html'] = false; + /* * ==================== * Display settings 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 @@

{{ board.url }} - {{ board.title|e }}

{% if board.subtitle %} - {{ board.subtitle|e }} + {% if config.allow_subtitle_html %} + {{ board.subtitle }} + {% else %} + {{ board.subtitle|e }} + {% endif %} {% endif %} {% if mod %}

{% trans %}Return to dashboard{% endtrans %}

{% endif %}
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 %} - — {{ board.subtitle|e }} + — + {% if config.allow_subtitle_html %} + {{ board.subtitle }} + {% else %} + {{ board.subtitle|e }} + {% endif %} + {% endif %} {% if mod|hasPermission(config.mod.manageboards) %} [{% trans 'edit' %}] 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 @@

{{ board.url }} - {{ board.title|e }}

{% if board.subtitle %} - {{ board.subtitle|e }} + {% if config.allow_subtitle_html %} + {{ board.subtitle }} + {% else %} + {{ board.subtitle|e }} + {% endif %} {% endif %} {% if mod %}

{% trans %}Return to dashboard{% endtrans %}

{% endif %}
@@ -42,4 +46,4 @@ ready(); {% endraw %} - \ No newline at end of file + -- cgit v1.3 From 39f542704b4df6c302915b0b21e283906bf58ed1 Mon Sep 17 00:00:00 2001 From: ctrlcctrlv 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 'inc/config.php') 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 @@

{% trans %}Your IP address is{% endtrans %} {{ ban.ip }}.

+ +

{{ config.ban_page_message }}

{% endfilter %} -- cgit v1.3 From 4fb941dbfe56c19725de0c2d07b81249b34db3b5 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Sun, 11 Aug 2013 21:30:46 +1000 Subject: $config['boardlist_wrap_bracket'] default to true --- inc/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/config.php') diff --git a/inc/config.php b/inc/config.php index 62bc72bb..8ca769bb 100644 --- a/inc/config.php +++ b/inc/config.php @@ -700,7 +700,7 @@ // ); // Whether or not to put brackets around the whole board list - $config['boardlist_wrap_bracket'] = false; + $config['boardlist_wrap_bracket'] = true; // Board categories. Only used in the "Categories" theme. // $config['categories'] = array( -- cgit v1.3