From 6f301505e33c42a37fbc7159f3144f41922c7dc6 Mon Sep 17 00:00:00 2001
From: Pashe <pashe@users.noreply.github.com>
Date: Sun, 19 Oct 2014 21:30:59 -0500
Subject: thread-watcher.js: change display format

---
 js/thread-watcher.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/thread-watcher.js')

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 22656e48..52b8142e 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -28,10 +28,10 @@ watchlist.render = function(reset) {
 	JSON.parse(localStorage.watchlist).forEach(function(e, i) {
 		//look at line 69, that's what (e) is here.
 		threads.push('<div class="watchlist-inner" id="watchlist-'+i+'">' +
-		'<span>Board: '+e[0]+'</span>&nbsp' +
-		'<span>Thread: '+'<a href="'+e[3]+'">'+e[1]+'</a></span>&nbsp' +
-		'<span>Replies: '+e[2]+'</span>&nbsp' +
-		'<a class="watchlist-remove">[Unwatch]</a>'+
+		'<span>/'+e[0]+'/ - ' +
+		'<a href="'+e[3]+'">'+e[1].replace("thread_", "Thread #")+'</a>' +
+		' ('+e[2]+') </span>' +
+		'<a class="watchlist-remove">X</a>'+
 	'</div>');
 	});
 	if ($('#watchlist').length) {
-- 
cgit v1.3


From 01446aad124291f88d5fab8f400321307dffebe7 Mon Sep 17 00:00:00 2001
From: Pashe <pashe@users.noreply.github.com>
Date: Mon, 20 Oct 2014 16:44:19 -0500
Subject: thread-watcher.js: fix background and border

---
 js/thread-watcher.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'js/thread-watcher.js')

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 52b8142e..625e95e0 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -40,6 +40,7 @@ watchlist.render = function(reset) {
 		$('#watchlist').append(threads.join(''));
 	} else {
 		//If the watchlist has not yet been rendered, create it.
+		var menuStyle = getComputedStyle($('.boardlist')[0]);
 		$('form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
@@ -47,10 +48,7 @@ watchlist.render = function(reset) {
 						'<span><a id="clearGhosts">[Clear Ghosts]</a></span>'+
 					'</div>'+
 					threads.join('')+
-				'</div>').css({
-			background: $('.reply').css('background'),
-			borderColor : $('.reply').css('border-color')
-		}));
+				'</div>').css("background-color", menuStyle.backgroundColor).css("border", menuStyle.borderBottomWidth+" "+menuStyle.borderBottomStyle+" "+menuStyle.borderBottomColor));
 	}
 	return this;
 };
-- 
cgit v1.3


From fd2e9df30cfd14b6c03d109c02e48ec966101aa1 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 8 Nov 2014 16:58:02 -0800
Subject: This script was breaking boards.html

---
 js/thread-watcher.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/thread-watcher.js')

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 625e95e0..b66dc657 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -142,6 +142,10 @@ watchlist.exists = function(sel) {
 };
 
 $(document).ready(function(){
+	if (!(active_page == 'thread' || active_page == 'index')) {
+		return;
+	}
+
 	//Append the watchlist toggle button.
 	$('.boardlist').append('<span>[ <a id="watchlist-toggle">watchlist</a> ]</span>');
 	//Append a watch thread button after every OP.
-- 
cgit v1.3


From 5267098cb822b489a1634cb2e5b7620b49a4f4ae Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 21 Nov 2014 23:34:03 -0800
Subject: Make bottom watchlist-toggle work

---
 js/thread-watcher.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'js/thread-watcher.js')

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index b66dc657..7f20e028 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -147,15 +147,16 @@ $(document).ready(function(){
 	}
 
 	//Append the watchlist toggle button.
-	$('.boardlist').append('<span>[ <a id="watchlist-toggle">watchlist</a> ]</span>');
+	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">watchlist</a> ]</span>');
 	//Append a watch thread button after every OP.
-	$('.op>.intro').append('<a class="watchThread">[Watch Thread]</a>');
+	$('.op>.intro').append('<a class="watchThread" href="#">[Watch Thread]</a>');
 
 	//Draw the watchlist, hidden.
 	watchlist.render();
 
 	//Show or hide the watchlist.
-	$('#watchlist-toggle').on('click', function(e) {
+	$('.watchlist-toggle').on('click', function(e) {
+		e.preventDefault();
 		//if ctrl+click, reset the watchlist.
 		if (e.ctrlKey) {
 			watchlist.render(true);
@@ -169,7 +170,8 @@ $(document).ready(function(){
 
 	//Trigger the watchlist add function.
 	//The selector is passed as an argument in case the page is not a thread.
-	$('.watchThread').on('click', function() {
+	$('.watchThread').on('click', function(e) {
+		e.preventDefault();
 		watchlist.add(this).render();
 	});
 
-- 
cgit v1.3


From cac428b30ccc2815264b15797e6397d6942b7adc Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Fri, 20 Mar 2015 16:09:21 +0800
Subject: Add some missing i18n tags

---
 js/comment-toolbar.js          | 26 +++++++++++++-------------
 js/fix-report-delete-submit.js |  8 ++++----
 js/inline.js                   |  4 ++--
 js/post-filter.js              | 40 ++++++++++++++++++++--------------------
 js/thread-watcher.js           | 12 ++++++------
 5 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'js/thread-watcher.js')

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 65bdc529..51aa9808 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -13,7 +13,7 @@ if (active_page == 'thread' || active_page == 'index') {
 		var self = {};
 		self.rules = {
 			spoiler: {
-				text: 'Spoiler',
+				text: _('Spoiler'),
 				key: 's',
 				multiline: false, 
 				exclusiveline: false, 
@@ -21,7 +21,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix:'**'
 			},
 			italics: {
-				text: 'Italics',
+				text: _('Italics'),
 				key: 'i',
 				multiline: false, 
 				exclusiveline: false, 
@@ -29,7 +29,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix: "''"
 			},
 			bold: {
-				text: 'Bold',
+				text: _('Bold'),
 				key: 'b',
 				multiline: false, 
 				exclusiveline: false, 
@@ -37,7 +37,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix: "'''"
 			},
 			underline: {
-				text: 'Underline',
+				text: _('Underline'),
 				key: 'u',
 				multiline: false, 
 				exclusiveline: false, 
@@ -45,7 +45,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix:'__'
 			},
 			code: {
-				text: 'Code',
+				text: _('Code'),
 				key: 'f',
 				multiline: true, 
 				exclusiveline: false, 
@@ -53,7 +53,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix: '[/code]'
 			},
 			strike: {
-				text: 'Strike',
+				text: _('Strike'),
 				key: 'd',
 				multiline:false, 
 				exclusiveline:false, 
@@ -61,7 +61,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix:'~~'
 			},
 			heading: {
-				text: 'Heading',
+				text: _('Heading'),
 				key: 'r',
 				multiline:false, 
 				exclusiveline:true, 
@@ -271,7 +271,7 @@ if (active_page == 'thread' || active_page == 'index') {
 			
 			// add the tab for customizing the format settings
 			if (window.Options && !Options.get_tab('formatting')) {
-				Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
+				Options.add_tab('formatting', 'angle-right', _('Customize Formatting'));
 				Options.extend_tab('formatting', '\
 				<style>\
 					.format_option{\
@@ -295,10 +295,10 @@ if (active_page == 'thread' || active_page == 'index') {
 				
 				// Data control row
 				Options.extend_tab('formatting', '\
-				<button onclick="formatText.add_rule();">Add Rule</button>\
-				<button onclick="formatText.save_rules();">Save Rules</button>\
-				<button onclick="formatText.reset_rules(false);">Revert</button>\
-				<button onclick="formatText.reset_rules(true);">Reset to Default</button>\
+				<button onclick="formatText.add_rule();">'+_('Add Rule')+'</button>\
+				<button onclick="formatText.save_rules();">'+_('Save Rules')+'</button>\
+				<button onclick="formatText.reset_rules(false);">'+_('Revert')+'</button>\
+				<button onclick="formatText.reset_rules(true);">'+_('Reset to Default')+'</button>\
 				');
 				
 				// Descriptor row
@@ -380,4 +380,4 @@ if (active_page == 'thread' || active_page == 'index') {
 		
 		return self;
     })(jQuery);
-}
\ No newline at end of file
+}
diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 0b1ff840..c6122db7 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -12,8 +12,8 @@ if (active_page == 'thread' || active_page == 'index') {
 $(document).ready(function(){
 
 if ($('.delete #password').length) {
-	Menu.add_item("delete_post_menu", "Delete post");
-	Menu.add_item("delete_file_menu", "Delete file");
+	Menu.add_item("delete_post_menu", _("Delete post"));
+	Menu.add_item("delete_file_menu", _("Delete file"));
 	Menu.onclick(function(e, $buf) {
 		var ele = e.target.parentElement.parentElement;
 		var $ele = $(ele);
@@ -34,8 +34,8 @@ if ($('.delete #password').length) {
 	});
 }
 
-Menu.add_item("report_menu", "Report");
-Menu.add_item("global_report_menu", "Global report");
+Menu.add_item("report_menu", _("Report"));
+Menu.add_item("global_report_menu", _("Global report"));
 Menu.onclick(function(e, $buf) {
 	var ele = e.target.parentElement.parentElement;
 	var $ele = $(ele);
diff --git a/js/inline.js b/js/inline.js
index 53865d90..686a540a 100644
--- a/js/inline.js
+++ b/js/inline.js
@@ -123,8 +123,8 @@ $(document).ready(function() {
     $clone.insertAfter(link.node)
   }
 
-  App.options.add('useInlining', 'Enable inlining')
-  App.options.add('hidePost', 'Hide inlined backlinked posts')
+  App.options.add('useInlining', _('Enable inlining'))
+  App.options.add('hidePost', _('Hide inlined backlinked posts'))
 
   $('head').append(
     '<style>' +
diff --git a/js/post-filter.js b/js/post-filter.js
index 8eb3ab7d..aaab4d0e 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -202,20 +202,20 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 		function initPostMenu(pageData) {
 
 			var submenu;
-			Menu.add_item('filter-menu-hide', 'Hide post');
-			Menu.add_item('filter-menu-unhide', 'Unhide post');
+			Menu.add_item('filter-menu-hide', _('Hide post'));
+			Menu.add_item('filter-menu-unhide', _('Unhide post'));
 
-			submenu = Menu.add_submenu('filter-menu-add', 'Add filter');
-				submenu.add_item('filter-add-post-plus', 'Post +', 'Hide post and all replies');
-				submenu.add_item('filter-add-id', 'ID');
-				submenu.add_item('filter-add-id-plus', 'ID +', 'Hide ID and all replies');
-				submenu.add_item('filter-add-name', 'Name');
-				submenu.add_item('filter-add-trip', 'Tripcode');
+			submenu = Menu.add_submenu('filter-menu-add', _('Add filter'));
+				submenu.add_item('filter-add-post-plus', _('Post +'), _('Hide post and all replies'));
+				submenu.add_item('filter-add-id', _('ID'));
+				submenu.add_item('filter-add-id-plus', _('ID +'), _('Hide ID and all replies'));
+				submenu.add_item('filter-add-name', _('Name'));
+				submenu.add_item('filter-add-trip', _('Tripcode'));
 
-			submenu = Menu.add_submenu('filter-menu-remove', 'Remove filter');
-				submenu.add_item('filter-remove-id', 'ID');
-				submenu.add_item('filter-remove-name', 'Name');
-				submenu.add_item('filter-remove-trip', 'Tripcode');
+			submenu = Menu.add_submenu('filter-menu-remove', _('Remove filter'));
+				submenu.add_item('filter-remove-id', _('ID'));
+				submenu.add_item('filter-remove-name', _('Name'));
+				submenu.add_item('filter-remove-trip', _('Tripcode'));
 
 			Menu.onclick(function (e, $buffer) {
 				var ele = e.target.parentElement.parentElement;
@@ -644,22 +644,22 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 
 		function initOptionsPanel() {
 			if (window.Options && !Options.get_tab('filter')) {
-				Options.add_tab('filter', 'list', 'Filters');
+				Options.add_tab('filter', 'list', _('Filters'));
 				Options.extend_tab('filter',
 					'<div id="filter-control">' +
 						'<select>' +
-							'<option value="name">Name</option>' +
-							'<option value="trip">Tripcode</option>' +
-							'<option value="sub">Subject</option>' +
-							'<option value="com">Comment</option>' +
+							'<option value="name">'+_('Name')+'</option>' +
+							'<option value="trip">'+_('Tripcode')+'</option>' +
+							'<option value="sub">'+_('Subject')+'</option>' +
+							'<option value="com">'+_('Comment')+'</option>' +
 						'</select>' +
 						'<input type="text">' +
 						'<input type="checkbox">' +
 						'regex ' +
-						'<button id="set-filter">Add</button>' +
-						'<button id="clear">Clear all filters</button>' +
+						'<button id="set-filter">'+_('Add')+'</button>' +
+						'<button id="clear">'+_('Clear all filters')+'</button>' +
 						'<div id="confirm" class="hidden">' +
-							'This will clear all filtering rules including hidden posts. <a id="confirm-y" href="#">yes</a> | <a id="confirm-n" href="#">no</a>' +
+							_('This will clear all filtering rules including hidden posts.')+' <a id="confirm-y" href="#">'+_('yes')+'</a> | <a id="confirm-n" href="#">'+_('no')+'</a>' +
 						'</div>' +
 					'</div>' +
 					'<div id="filter-container"><table id="filter-list"></table></div>'
diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 7f20e028..960aa59f 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -29,7 +29,7 @@ watchlist.render = function(reset) {
 		//look at line 69, that's what (e) is here.
 		threads.push('<div class="watchlist-inner" id="watchlist-'+i+'">' +
 		'<span>/'+e[0]+'/ - ' +
-		'<a href="'+e[3]+'">'+e[1].replace("thread_", "Thread #")+'</a>' +
+		'<a href="'+e[3]+'">'+e[1].replace("thread_", _("Thread #"))+'</a>' +
 		' ('+e[2]+') </span>' +
 		'<a class="watchlist-remove">X</a>'+
 	'</div>');
@@ -44,8 +44,8 @@ watchlist.render = function(reset) {
 		$('form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
-						'<span><a id="clearList">[Clear List]</a></span>&nbsp'+
-						'<span><a id="clearGhosts">[Clear Ghosts]</a></span>'+
+						'<span><a id="clearList">['+_('Clear List')+']</a></span>&nbsp'+
+						'<span><a id="clearGhosts">['+_('Clear Ghosts')+']</a></span>'+
 					'</div>'+
 					threads.join('')+
 				'</div>').css("background-color", menuStyle.backgroundColor).css("border", menuStyle.borderBottomWidth+" "+menuStyle.borderBottomStyle+" "+menuStyle.borderBottomColor));
@@ -80,7 +80,7 @@ watchlist.add = function(sel) {
 			postCount = $(sel).parents('.op').siblings('.post').length+1;
 		}
 		//Grab the reply link.
-		var threadLink = $(sel).siblings('a:contains("[Reply]")').attr('href');
+		var threadLink = $(sel).siblings('a:contains("['+_('Reply')+']")').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);
@@ -147,9 +147,9 @@ $(document).ready(function(){
 	}
 
 	//Append the watchlist toggle button.
-	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">watchlist</a> ]</span>');
+	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
 	//Append a watch thread button after every OP.
-	$('.op>.intro').append('<a class="watchThread" href="#">[Watch Thread]</a>');
+	$('.op>.intro').append('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
 
 	//Draw the watchlist, hidden.
 	watchlist.render();
-- 
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 'js/thread-watcher.js')

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 4479fc7681d55afeeed90f9ddc4d892741bd6e53 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 9 May 2016 11:18:27 +0200
Subject: thread-watcher and favorites in catalog and ukko

---
 js/favorites.js      | 2 +-
 js/thread-watcher.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'js/thread-watcher.js')

diff --git a/js/favorites.js b/js/favorites.js
index daf7b732..027dc243 100644
--- a/js/favorites.js
+++ b/js/favorites.js
@@ -50,7 +50,7 @@ function add_favorites() {
 	$('.boardlist').append(boards);
 };
 
-if (active_page == 'thread' || active_page == 'index') {
+if (active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko') {
 	$(document).ready(function(){
 		var favorites = JSON.parse(localStorage.favorites);
 		var is_board_favorite = ~$.inArray(board_name, favorites);
diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index c31a6e74..0796193b 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -41,7 +41,7 @@ watchlist.render = function(reset) {
 	} else {
 		//If the watchlist has not yet been rendered, create it.
 		var menuStyle = getComputedStyle($('.boardlist')[0]);
-		$('form[name="post"]').before(
+		$((active_page == 'ukko') ? 'hr:first' : (active_page == 'catalog') ? 'body>span:first' : 'form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
 						'<span><a id="clearList">['+_('Clear List')+']</a></span>&nbsp'+
@@ -60,6 +60,8 @@ watchlist.render = function(reset) {
 watchlist.add = function(sel) {
 	var threadName, threadInfo;
 
+	var board_name = $(sel).parents('.thread').data('board');
+
 	if (active_page === 'thread') {
 		if ($('.subject').length){
 			//If a subject is given, use the first 20 characters as the thread name.
@@ -70,7 +72,7 @@ watchlist.add = function(sel) {
 		//board name, thread name as defined above, current amount of posts, thread url
 		threadInfo = [board_name, threadName, $('.post').length, location.href];
 
-	} else if (active_page === 'index') {
+	} else if (active_page === 'index' || active_page === 'ukko') {
 
 		var postCount;
 		//Figure out the post count.
@@ -142,7 +144,7 @@ watchlist.exists = function(sel) {
 };
 
 $(document).ready(function(){
-	if (!(active_page == 'thread' || active_page == 'index')) {
+	if (!(active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko')) {
 		return;
 	}
 
-- 
cgit v1.3