From 38bf3276e4ffd4b82c4a7bc9eb8e1cf692147bb2 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 09:39:23 +0200
Subject: update copyright years; remove a link to tinyboard (website is dead)

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

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index fc3ded76..41e4867d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -76,10 +76,10 @@
 	{{ config.ad.bottom }}
 
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
-- 
cgit v1.3


From 02c3c28a16127511a785e428547f8a4dc60abaf7 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 14:38:24 +0200
Subject: main.js: a bit more sane code

---
 js/thread-watcher.js                  |  4 ++--
 templates/index.html                  |  6 ++++--
 templates/main.js                     | 11 ++++-------
 templates/page.html                   |  2 +-
 templates/themes/catalog/catalog.html |  3 ++-
 templates/thread.html                 |  4 +++-
 6 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'templates/index.html')

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 960aa59f..c31a6e74 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -79,8 +79,8 @@ watchlist.add = function(sel) {
 		} else {
 			postCount = $(sel).parents('.op').siblings('.post').length+1;
 		}
-		//Grab the reply link.
-		var threadLink = $(sel).siblings('a:contains("['+_('Reply')+']")').attr('href');
+		//Grab the reply link.;
+		var threadLink = $(sel).siblings('a:not(.watchThread)').last().attr('href');
 		//Figure out the thread name. If anon, use the thread id.
 		if ($(sel).parent().find('.subject').length) {
 			threadName = $(sel).parent().find('.subject').text().substring(0,20);
diff --git a/templates/index.html b/templates/index.html
index 41e4867d..d4c56707 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,10 +4,12 @@
 	<meta charset="utf-8">
 
         <script type="text/javascript">
+	  var
           {% if not no_post_form %}
-            var active_page = "index";
+              active_page = "index"
+            , board_name = "{{ board.uri }}";
 	  {% else %}
-            var active_page = "ukko";
+              active_page = "ukko";
           {% endif %}
         </script>
 
diff --git a/templates/main.js b/templates/main.js
index 7e3b2dc1..c2a6f6c0 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -115,7 +115,10 @@ var styles = {
 	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
 	{% endraw %}{% endfor %}{% raw %}
 };
-var board_name = false;
+
+if (typeof board_name === 'undefined') {
+	var board_name = false;
+}
 
 function changeStyle(styleName, link) {
 	{% endraw %}
@@ -159,13 +162,7 @@ function changeStyle(styleName, link) {
 
 {% endraw %}
 {% if config.stylesheets_board %}
-	{# This is such an unacceptable mess. There needs to be an easier way. #}
-	{# Needs fix for slugify #}
-	var matches = document.URL.match(/\/(\w+)\/($|{{ config.dir.res|replace({'/': '\\/'}) }}{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }}|{{ config.file_index|replace({'.': '\\.'}) }}|{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }})/);
 	{% raw %}
-	if (matches) {
-		board_name = matches[1];
-	}
 	
 	if (!localStorage.board_stylesheets) {
 		localStorage.board_stylesheets = '{}';
diff --git a/templates/page.html b/templates/page.html
index 3522702f..816bb72b 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<script type="text/javascript">
-		active_page = "page";
+		var active_page = "page";
 	</script>
 	{% include 'header.html' %}
 	<title>{{ title }}</title>
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 1011fdaf..1f5e8b05 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -4,7 +4,8 @@
 <head>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 	<script type='text/javascript'>
-		active_page = "catalog";
+		var active_page = "catalog"
+		  , board_name = "{{ board }}";
 	</script>
 	{% include 'header.html' %}
 	<title>{{ settings.title }}</title>
diff --git a/templates/thread.html b/templates/thread.html
index b7bb5f6b..506b9cc2 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -4,7 +4,9 @@
 	<meta charset="utf-8">
 
         <script type="text/javascript">
-          var active_page = "thread";
+          var active_page = "thread"
+	    , board_name = "{{ board.uri }}"
+	    , thread_id = "{{ thread.id }}";
 	</script>
 
 	{% include 'header.html' %}
-- 
cgit v1.3


From 293543878a10e1ef93990acb373f8f22ca655f64 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 12:10:50 +0200
Subject: backport parts of 2d6d449bd2d72, in particular html classes

---
 stylesheets/style.css             | 2 +-
 templates/generic_page.html       | 2 +-
 templates/index.html              | 2 +-
 templates/page.html               | 2 +-
 templates/post_thread.html        | 2 +-
 templates/themes/basic/index.html | 2 +-
 templates/thread.html             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates/index.html')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 6b4b19d9..2c5663bd 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -666,7 +666,7 @@ pre {
   margin-left: -20px;
 }
 
-div.thread:hover {
+.theme-catalog div.thread:hover {
   background: #D6DAF0;
   border-color: #B7C5D9;
 }
diff --git a/templates/generic_page.html b/templates/generic_page.html
index 35b58df3..fbfc3c50 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -6,7 +6,7 @@
 	<title>{{ board.url }} - {{ board.name }}</title>
 	{% endblock %}
 </head>
-<body>	
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">	
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
diff --git a/templates/index.html b/templates/index.html
index d4c56707..1eea6e6b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.title|e }}</title>
 </head>
-<body>	
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">	
 	{{ boardlist.top }}
 	
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
diff --git a/templates/page.html b/templates/page.html
index 816bb72b..296b517e 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -8,7 +8,7 @@
 	{% include 'header.html' %}
 	<title>{{ title }}</title>
 </head>
-<body>
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
         {{ boardlist.top }}
 
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 61146491..72ca2998 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -1,7 +1,7 @@
 {% filter remove_whitespace %}
 {# tabs and new lines will be ignored #}
 
-<div id="thread_{{ post.id }}" data-board="{{ board.uri }}">
+<div class="thread" id="thread_{{ post.id }}" data-board="{{ board.uri }}">
 {% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 
 {% include 'post/fileinfo.html' %}
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index 8cdaf182..9d7a2c41 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -11,7 +11,7 @@
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
 </head>
-<body>
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }}</h1>
diff --git a/templates/thread.html b/templates/thread.html
index c909f843..425394bb 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -12,7 +12,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
 </head>
-<body>
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
-- 
cgit v1.3


From 33ef1d2123749db43bba372cbc0aa7ab3df4839a Mon Sep 17 00:00:00 2001
From: Bui <bui@bui.pm>
Date: Sat, 26 Sep 2015 00:17:05 +0900
Subject: add active page classes to body; czaks: go to bottom @ thread: fixes

---
 templates/index.html                  | 2 +-
 templates/page.html                   | 2 +-
 templates/themes/catalog/catalog.html | 2 +-
 templates/thread.html                 | 8 ++------
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index 1eea6e6b..d1871fc8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.title|e }}</title>
 </head>
-<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">	
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-{% if not no_post_form %}index{% else %}ukko{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
 	
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
diff --git a/templates/page.html b/templates/page.html
index 296b517e..027ed3b9 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -8,7 +8,7 @@
 	{% include 'header.html' %}
 	<title>{{ title }}</title>
 </head>
-<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-page" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
         {{ boardlist.top }}
 
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 226c00d3..0626b376 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -10,7 +10,7 @@
 	{% include 'header.html' %}
 	<title>{{ board }} - Catalog</title>
 </head>
-<body class="theme-catalog">
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} theme-catalog active-catalog" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }} (<a href="{{link}}">/{{ board }}/</a>)</h1>
diff --git a/templates/thread.html b/templates/thread.html
index 1cbb6d20..2d4ae262 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -23,7 +23,7 @@
 
 	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
-<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-thread" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	<a name="top"></a> 
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
@@ -44,8 +44,7 @@
 
 	{% include 'attention_bar.html' %}
 
-	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> <a class="unimportant" href="javascript:window.scrollTo(0,document.body.scrollHeight);
-">[{% trans %}Go to bottom {% endtrans %}]</a></div>
+	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> <a class="unimportant" href="#bottom">[{% trans %}Go to bottom {% endtrans %}]</a></div>
 
 	{{ config.ad.top }}
 
@@ -53,9 +52,6 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
-	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
-	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 		<input type="hidden" name="board" value="{{ board.uri }}" />
 		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-- 
cgit v1.3


From 3571670b98b2e6293e429f3e629510ab9f38e70a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:51:34 +0200
Subject: fix catalog link someone?

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/index.html')

diff --git a/templates/index.html b/templates/index.html
index d1871fc8..1be614e3 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -69,7 +69,7 @@
 		 [<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>]{% if loop.last %} {% endif %}
 		{% endfor %} {{ btn.next }}
 		{% if config.catalog_link %}
-			 | <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a>
+			 | <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">{% trans %}Catalog{% endtrans %}</a>
 		{% endif %}
 	</div>
 	
-- 
cgit v1.3