From 0e490407e18679de2458647b891edaeb664a2f8f Mon Sep 17 00:00:00 2001
From: lanc33 <lancee@55ch.org>
Date: Wed, 29 May 2013 19:16:37 -0300
Subject: Fixes #59 by making quick-reply.js agnostic to the value of
 $config['button_reply'].

---
 templates/index.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 761227ed..112756d1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,6 +10,11 @@
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if not nojavascript %}
 		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+    {% if config.quick_reply %}
+    <script type="text/javascript">
+      var new_reply_string = "{{ config.button_reply }}";
+    </script>
+    {% endif %}
 		{% if not config.additional_javascript_compile %}
 		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
 		{% endif %}
-- 
cgit v1.3


From 8b952fe97fc0ead62eb944e8aa62b71852d9adf5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 15 Jun 2013 00:04:08 -0400
Subject: overboard: missed templates/index.html

---
 templates/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index eaed3666..059abc5e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -20,7 +20,11 @@
 	</header>
 	
 	{% include 'attention_bar.html' %}
-	{% include 'post_form.html' %}
+	{% if not no_post_form %}
+		{% include 'post_form.html' %}
+	{% else %}
+		{% include 'boardlist.html' %}
+	{% endif %}
 
 	{% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %}
 	<hr />
-- 
cgit v1.3


From 3bcf88e842b8616a52dec7744e19073248817812 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
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/index.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 @@
 <head>
 	<meta charset="utf-8">
 
-        {% if config.quick_reply %}
-          <script type="text/javascript">
+        <script type="text/javascript">
+          {% if config.quick_reply %}
             var new_reply_string = "{{ config.button_reply }}";
-          </script>           
-        {% endif %}
+          {% endif %}
+          {% if not no_post_form %}
+            var active_page = "index";
+	  {% else %}
+            var active_page = "ukko";
+          {% endif %}
+        </script>
 
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
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 @@
 <html>
 <head>
 	<meta charset="utf-8">
+
+        <script type="text/javascript">
+          var active_page = "thread";
+	</script>
+
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
 </head>
-- 
cgit v1.3


From 29b10c88db1ba16210e753e1fcf08d702455a674 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
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/index.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 @@
 	<meta charset="utf-8">
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {{ board.title|e }}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ 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 @@
 	<meta charset="utf-8">
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-- 
cgit v1.3