From ba424698e0f9e79da93b6c54573a67e12fa363e5 Mon Sep 17 00:00:00 2001 From: czaks Date: Sat, 15 Jun 2013 00:22:13 -0400 Subject: header abstraction: abstracted also in thread.html --- templates/thread.html | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'templates/thread.html') diff --git a/templates/thread.html b/templates/thread.html index 0997f668..4e2a95a1 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -2,34 +2,8 @@ - - {% if config.url_favicon %}{% endif %} + {% include 'header.html' %} {{ board.url }} - {{ board.name }} - - {% if config.meta_keywords %}{% endif %} - {% if config.default_stylesheet.1 != '' %}{% endif %} - - {% if not nojavascript %} - - {% if not config.additional_javascript_compile %} - {% for javascript in config.additional_javascript %}{% endfor %} - {% endif %} - {% endif %} - {% if config.recaptcha %}{% endif %} {{ boardlist.top }} -- cgit v1.3 From 3bcf88e842b8616a52dec7744e19073248817812 Mon Sep 17 00:00:00 2001 From: czaks Date: Mon, 24 Jun 2013 08:23:09 -0400 Subject: JS Api: added an active_page variable to make it easier to denote the context from javascript --- templates/index.html | 13 +++++++++---- templates/thread.html | 5 +++++ 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'templates/thread.html') diff --git a/templates/index.html b/templates/index.html index 9dec93e0..82d3104e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,11 +3,16 @@ - {% if config.quick_reply %} - - {% endif %} + {% endif %} + {% if not no_post_form %} + var active_page = "index"; + {% else %} + var active_page = "ukko"; + {% endif %} + {% include 'header.html' %} {{ board.url }} - {{ board.name }} diff --git a/templates/thread.html b/templates/thread.html index 4e2a95a1..b8c54dec 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -2,6 +2,11 @@ + + + {% include 'header.html' %} {{ board.url }} - {{ board.name }} -- cgit v1.3 From 29b10c88db1ba16210e753e1fcf08d702455a674 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Tue, 16 Jul 2013 02:48:20 -0400 Subject: Outputting thread subject in header/title (issue #122) --- inc/config.php | 3 +++ inc/functions.php | 5 +++-- templates/index.html | 2 +- templates/thread.html | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'templates/thread.html') diff --git a/inc/config.php b/inc/config.php index 83b98c2b..ed4a31f1 100644 --- a/inc/config.php +++ b/inc/config.php @@ -527,6 +527,9 @@ // Number of characters in the poster ID (maximum is 40) $config['poster_id_length'] = 5; + // Show thread subject in page title? + $config['thread_subject_in_title'] = false; + // Page footer $config['footer'][] = 'All trademarks, copyrights, comments, and images on this page are owned by and are the responsibility of their respective parties.'; diff --git a/inc/functions.php b/inc/functions.php index 67019e0a..4b0e56d8 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1537,8 +1537,9 @@ function buildThread($id, $return=false, $mod=false) { error($config['error']['nonexistant']); $body = Element('thread.html', array( - 'board'=>$board, - 'body'=>$thread->build(), + 'board' => $board, + 'thread' => $thread, + 'body' => $thread->build(), 'config' => $config, 'id' => $id, 'mod' => $mod, diff --git a/templates/index.html b/templates/index.html index 112756d1..9b25e1be 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,7 +4,7 @@ {% if config.url_favicon %}{% endif %} - {{ board.url }} - {{ board.name }} + {{ board.url }} - {{ board.title|e }} {% if config.meta_keywords %}{% endif %} {% if config.default_stylesheet.1 != '' %}{% endif %} diff --git a/templates/thread.html b/templates/thread.html index 5442166f..aea8abb5 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -4,7 +4,7 @@ {% if config.url_favicon %}{% endif %} - {{ board.url }} - {{ board.name }} + {{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %} {% if config.meta_keywords %}{% endif %} {% if config.default_stylesheet.1 != '' %}{% endif %} -- cgit v1.3