From ad55a634bf3f9301489f5371942c73940361a24c Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 16 Apr 2012 16:40:24 +1000
Subject: various improvements

---
 stylesheets/style.css | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'stylesheets')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index d77f05b5..edebf0c1 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -68,15 +68,18 @@ form table input {
 }
 input[type="text"], input[type="password"], textarea {
 	border: 1px solid #a9a9a9;
-	text-indent: 0px;
+	text-indent: 0;
 	text-shadow: none;
 	text-transform: none;
 	word-spacing: normal;
 }
 form table tr td {
 	text-align: left;
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
+}
+form table.mod tr td {
+	padding: 2px;
 }
 form table tr th {
 	text-align: left;
@@ -102,7 +105,7 @@ form table tr td div label {
 }
 p.fileinfo {
 	display: block;
-	margin: 0px;
+	margin: 0;
 	padding-right: 7em;
 }
 div.banner {
@@ -326,7 +329,7 @@ div.pages form input {
 hr {
 	border: none;
 	border-top: 1px solid #B7C5D9;
-	height: 0px;
+	height: 0;
 	clear: left;
 }
 div.boardlist {
@@ -349,7 +352,7 @@ table.modlog {
 }
 table.modlog tr td {
 	text-align: left;
-	margin: 0px;
+	margin: 0;
 	padding: 4px 15px 0 0;
 }
 table.modlog tr th {
-- 
cgit v1.3


From 54862246cda6e0e3acaa5fefa0da532a3778cb3b Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 22 Apr 2012 16:52:24 +1000
Subject: Stylesheet change.

---
 stylesheets/style.css                 | 2 +-
 templates/themes/basic/index.html     | 6 ++++--
 templates/themes/categories/news.html | 5 ++++-
 templates/themes/frameset/news.html   | 6 ++++--
 templates/themes/recent/recent.html   | 6 ++++--
 5 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'stylesheets')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index edebf0c1..0c71ff7c 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -44,7 +44,7 @@ h2 {
 header {
 	margin: 1em 0;
 }
-header h1 {
+h1 {
 	font-family: tahoma;
 	letter-spacing: -2px;
 	font-size: 20pt;
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index 8426e736..89022420 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -8,8 +8,10 @@
 </head>
 <body>
 	{{ boardlist.top }}
-	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="ban">
 		{% if news|count == 0 %}
diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 56ddfabb..9c7d8340 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -8,7 +8,10 @@
 </head>
 <body>
 	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="ban">
 		{% if news|count == 0 %}
diff --git a/templates/themes/frameset/news.html b/templates/themes/frameset/news.html
index 56ddfabb..2af5e10d 100644
--- a/templates/themes/frameset/news.html
+++ b/templates/themes/frameset/news.html
@@ -7,8 +7,10 @@
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
 </head>
 <body>
-	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="ban">
 		{% if news|count == 0 %}
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index a6daa9e7..a42024c0 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -9,8 +9,10 @@
 </head>
 <body>
 	{{ boardlist.top }}
-	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="box-wrap">
 		<div class="box left">
-- 
cgit v1.3


From aeff0a69b100d2cfa5896d043aa1891b993a7a5f Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 4 May 2012 00:21:16 +1000
Subject: minor CSS fixes

---
 inc/config.php             |  8 ++++----
 stylesheets/style.css      | 28 +++++++++++++++++++++++-----
 templates/post_thread.html |  8 ++------
 3 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'stylesheets')

diff --git a/inc/config.php b/inc/config.php
index 06e100ea..eb70f932 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -786,22 +786,22 @@
 	$config['mod']['link_move'] = '[Move]';
 	
 	// Moderator capcodes
-	$config['capcode'] = ' <a class="capcode">## %s</a>';
+	$config['capcode'] = ' <span class="capcode">## %s</span>';
 	
 	// Custom capcodes, by example:
 	// "## Custom" becomes lightgreen, italic and bold
-	//$config['custom_capcode']['Custom'] ='<a class="capcode" style="color:lightgreen;font-style:italic;font-weight:bold"> ## %s</a>';
+	//$config['custom_capcode']['Custom'] ='<span class="capcode" style="color:lightgreen;font-style:italic;font-weight:bold"> ## %s</span>';
 	
 	// "## Mod" makes everything purple, including the name and tripcode
 	//$config['custom_capcode']['Mod'] = array(
-	//	'<a class="capcode" style="color:purple"> ## %s</a>',
+	//	'<span class="capcode" style="color:purple"> ## %s</span>',
 	//	'color:purple', // Change name style; optional
 	//	'color:purple' // Change tripcode style; optional
 	//);
 	
 	// "## Admin" makes everything red and bold, including the name and tripcode
 	//$config['custom_capcode']['Admin'] = array(
-	//	'<a class="capcode" style="color:red;font-weight:bold"> ## %s</a>',
+	//	'<span class="capcode" style="color:red;font-weight:bold"> ## %s</span>',
 	//	'color:red;font-weight:bold', // Change name style; optional
 	//	'color:red;font-weight:bold' // Change tripcode style; optional
 	//);
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 0c71ff7c..a46ca3fb 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -10,19 +10,21 @@ body {
 table * {
 	margin: 0;
 }
-a:link, a:visited {
+a, a:visited {
 	text-decoration: underline;
 	color: #34345C;
 }
-a:link:hover, a:visited:hover {
+a:hover {
 	color: #ff0000;
 }
 a.post_no {
-	color: black;
 	text-decoration: none;
 	margin: 0;
 	padding: 0;
 }
+a.post_no:not(:hover) {
+	color: black;
+}
 p.intro a.post_no, p.intro a.email {
 	margin: 0;
 }
@@ -167,7 +169,7 @@ p.intro span.name {
 	color: #117743;
 	font-weight: bold;
 }
-p.intro a.capcode, p.intro a.nametag {
+p.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
 	color: #F00000;
 	margin-left: 0;
 }
@@ -314,7 +316,7 @@ div.pages a.selected {
 	color: black;
 	font-weight: bolder;
 }
-div.pages a:link {
+div.pages a {
 	text-decoration: none;
 }
 div.pages form {
@@ -386,3 +388,19 @@ div.blotter {
 	font-weight: bold;
 	text-align: center;
 }
+
+/* Uboachan stuff */
+div.styles-sidebar {
+	text-align: center;
+	padding-bottom: 0px;
+}
+div.styles-sidebar a {
+	margin: 0 5px;
+}
+div.styles-sidebar a.selected {
+	text-decoration: none;
+}
+.category {
+	background: #98E;
+	color: black;
+}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 095c53f9..ac5c786b 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -1,9 +1,7 @@
 {% filter remove_whitespace %}
 {# tabs and new lines will be ignored #}
 
-{% if index %}
-	<div id="thread_{{ post.id }}">
-{% endif %}
+<div id="thread_{{ post.id }}">
 
 {% if post.embed %}
 	{{ post.embed }}
@@ -136,6 +134,4 @@
 	{% include 'post_reply.html' %}
 {% endfor %}
 <br class="clear"/>{% if hr %}<hr/>{% endif %}
-{% if index %}
-	</div>
-{% endif %}
+</div>
-- 
cgit v1.3


From af61bcaf77204f7bd84ef482c489faa17b13a0b1 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 22 Apr 2012 17:50:53 +1000
Subject: Slightly less crappy stylesheet chooser

---
 inc/config.php                                  |   2 +-
 inc/lib/Twig/Extensions/Extension/Tinyboard.php |   1 +
 stylesheets/default.css                         |   0
 templates/main.js                               | 110 ++++++++++++++++--------
 templates/page.html                             |   4 +-
 5 files changed, 76 insertions(+), 41 deletions(-)
 delete mode 100644 stylesheets/default.css

(limited to 'stylesheets')

diff --git a/inc/config.php b/inc/config.php
index c202d8c9..baa1d022 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -525,7 +525,7 @@
 	// $config['banner_height'] = 100;
 	
 	// Custom stylesheets available. The prefix for each stylesheet URI is defined below.
-	$config['stylesheets']['Yotsuba B'] = 'default.css';
+	$config['stylesheets']['Yotsuba B'] = ''; // default
 	$config['stylesheets']['Yotsuba'] = 'yotsuba.css';
 	// $config['stylesheets']['Futaba'] = 'futaba.css';
 	
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index c4810dad..0a128e7b 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -25,6 +25,7 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 			'until' => new Twig_Filter_Function('until'),
 			'split' => new Twig_Filter_Function('twig_split_filter'),
 			'push' => new Twig_Filter_Function('twig_push_filter'),
+			'addslashes' => new Twig_Filter_Function('addslashes')
 		);
 	}
 	
diff --git a/stylesheets/default.css b/stylesheets/default.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/templates/main.js b/templates/main.js
index de62bd8b..b0a96393 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -1,12 +1,71 @@
 {% raw %}
 
-var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0 }}{% raw %}';
-var styles = [
-	{% endraw %}{% for stylesheet in stylesheets %}{% raw %}['{% endraw %}{{ stylesheet.name }}{% raw %}', '{% endraw %}{{ stylesheet.uri }}{% raw %}']{% endraw %}{% if not loop.last %}{% raw %},
-	{% endraw %}{% endif %}{% endfor %}{% raw %}
-];
 var saved = {};
 
+
+var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
+var styles = {
+	{% endraw %}
+	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
+	{% endraw %}{% endfor %}{% raw %}
+};
+
+function changeStyle(styleName, link) {
+	localStorage.stylesheet = styleName;
+	
+	if (!document.getElementById('stylesheet')) {
+		var s = document.createElement('link');
+		s.rel = 'stylesheet';
+		s.type = 'text/css';
+		s.id = 'stylesheet';
+		var x = document.getElementsByTagName('head')[0];
+		x.appendChild(s);
+	}
+	
+	document.getElementById('stylesheet').href = styles[styleName];
+	selectedstyle = styleName;
+	
+	if (document.getElementsByClassName('styles').length != 0) {
+		var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
+		for (i = 0; i < styleLinks.length; i++) {
+			styleLinks[i].className = '';
+		}
+	}
+	
+	if (link) {
+		link.className = 'selected';
+	}
+}
+
+if (localStorage.stylesheet) {
+	for (styleName in styles) {
+		if (styleName == localStorage.stylesheet) {
+			changeStyle(styleName);
+			break;
+		}
+	}
+}
+
+function init_stylechooser() {
+	var newElement = document.createElement('div');
+	newElement.className = 'styles';
+	
+	for (styleName in styles) {
+		var style = document.createElement('a');
+		style.innerHTML = '[' + styleName + ']';
+		style.onclick = function() {
+			changeStyle(this.innerHTML.substring(1, this.innerHTML.length - 1), this);
+		};
+		if (styleName == selectedstyle) {
+			style.className = 'selected';
+		}
+		style.href = 'javascript:void(0);';
+		newElement.appendChild(style);
+	}	
+	
+	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling);
+}
+
 function get_cookie(cookie_name) {
 	var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
 	if (results)
@@ -16,7 +75,7 @@ function get_cookie(cookie_name) {
 }
 
 function highlightReply(id) {
-	if(typeof window.event != "undefined" && event.which == 2) {
+	if (typeof window.event != "undefined" && event.which == 2) {
 		// don't highlight on middle click
 		return true;
 	}
@@ -57,6 +116,7 @@ function dopost(form) {
 	
 	return form.elements['body'].value != "" || form.elements['file'].value != "";
 }
+
 function citeReply(id) {
 	var body = document.getElementById('body');
 	
@@ -76,21 +136,6 @@ function citeReply(id) {
 	}
 }
 
-function changeStyle(x) {
-	localStorage.stylesheet = styles[x][1];
-	document.getElementById('stylesheet').href = styles[x][1];
-	selectedstyle = styles[x][0];
-}
-
-if(localStorage.stylesheet) {
-	for(var x = 0; x < styles.length ; x++) {
-		if(styles[x][1] == localStorage.stylesheet) {
-			changeStyle(x);
-			break;
-		}
-	}
-}
-
 function rememberStuff() {
 	if (document.forms.post) {
 		if (document.forms.post.password) {
@@ -112,7 +157,7 @@ function rememberStuff() {
 			if (get_cookie('{% endraw %}{{ config.cookies.js }}{% raw %}')) {
 				// Remove successful posts
 				var successful = JSON.parse(get_cookie('{% endraw %}{{ config.cookies.js }}{% raw %}'));
-				for(var url in successful) {
+				for (var url in successful) {
 					saved[url] = null;
 				}
 				sessionStorage.body = JSON.stringify(saved);
@@ -132,25 +177,13 @@ function rememberStuff() {
 }
 
 function init() {
-	var newElement = document.createElement('div');
-	newElement.className = 'styles';
+	init_stylechooser();
 	
-	for(x = 0; x < styles.length; x++) {
-		var style = document.createElement('a');
-		style.innerHTML = '[' + styles[x][0] + ']';
-		style.href = 'javascript:changeStyle(' + x + ');';
-		if(selectedstyle == styles[x][0])
-			style.className = 'selected';
-		newElement.appendChild(style);
-	}	
-	
-	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling)
-	
-	if(document.forms.postcontrols) {
+	if (document.forms.postcontrols) {
 		document.forms.postcontrols.password.value = localStorage.password;
 	}
 	
-	if(window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
+	if (window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
 		highlightReply(window.location.hash.substring(1));
 }
 
@@ -164,7 +197,7 @@ function onready(fnc) {
 }
 
 function ready() {
-	for(var i = 0; i < onready_callbacks.length; i++) {
+	for (var i = 0; i < onready_callbacks.length; i++) {
 		onready_callbacks[i]();
 	}
 }
@@ -174,3 +207,4 @@ onready(init);
 {% endraw %}{% if config.google_analytics %}{% raw %}
 
 var _gaq = _gaq || [];_gaq.push(['_setAccount', '{% endraw %}{{ config.google_analytics }}{% raw %}']);{% endraw %}{% if config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', '{% endraw %}{{ config.google_analytics_domain }}{% raw %}']){% endraw %}{% endif %}{% if not config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', 'none']){% endraw %}{% endif %}{% raw %};_gaq.push(['_trackPageview']);(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endraw %}{% endif %}
+
diff --git a/templates/page.html b/templates/page.html
index a5dc3dc0..0f59e6b1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -10,7 +10,7 @@
 	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
 </head>
 <body>
-	{% 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 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 %}
 	<header>
 		<h1>{{ title }}</h1>
 		<div class="subtitle">
@@ -21,7 +21,7 @@
 		</div>
 	</header>
 	{{ body }}
-	<hr />
+	<hr>
 	<footer>
 		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
 	</footer>
-- 
cgit v1.3


From 8ceb19a60a8f9a100a680dce1652d69951c1f4d1 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 11 May 2012 00:17:49 +1000
Subject: small CSS bug

---
 stylesheets/style.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'stylesheets')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index a46ca3fb..16da419c 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -14,7 +14,7 @@ a, a:visited {
 	text-decoration: underline;
 	color: #34345C;
 }
-a:hover {
+a:hover, p.intro a.post_no:hover {
 	color: #ff0000;
 }
 a.post_no {
@@ -22,8 +22,8 @@ a.post_no {
 	margin: 0;
 	padding: 0;
 }
-a.post_no:not(:hover) {
-	color: black;
+p.intro a.post_no {
+	color: inherit;
 }
 p.intro a.post_no, p.intro a.email {
 	margin: 0;
-- 
cgit v1.3


From d3739c48c2c2deec83e6abf74ed8e03470581750 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 20 May 2012 20:20:50 +1000
Subject: Config editort

---
 inc/mod/pages.php                | 85 ++++++++++++++++++++++++++++++++++++++++
 inc/template.php                 |  2 +-
 mod.php                          |  2 +
 stylesheets/style.css            | 22 +++++------
 templates/mod/config-editor.html | 56 ++++++++++++++++++++++++++
 templates/mod/view_ip.html       |  8 ++--
 6 files changed, 158 insertions(+), 17 deletions(-)
 create mode 100644 templates/mod/config-editor.html

(limited to 'stylesheets')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 6b644867..a4e2eae1 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1539,6 +1539,91 @@ function mod_report_dismiss($id, $all = false) {
 	header('Location: ?/reports', true, $config['redirect_http']);
 }
 
+
+function mod_config() {
+	global $config, $mod;
+	
+	if (!hasPermission($config['mod']['edit_config']))
+		error($config['error']['noaccess']);
+	
+	require_once 'inc/mod/config-editor.php';
+	
+	$conf = config_vars();
+	
+	foreach ($conf as &$var) {
+		if (is_array($var['name'])) {
+			$c = &$config;
+			foreach ($var['name'] as $n)
+				$c = &$c[$n];
+		} else {
+			$c = $config[$var['name']];
+		}
+		
+		$var['value'] = $c;
+	}
+	unset($var);
+	
+	if (isset($_POST['save'])) {
+		$config_append = '';
+		
+		foreach ($conf as $var) {
+			$field_name = 'cf_' . (is_array($var['name']) ? implode('/', $var['name']) : $var['name']);
+			
+			if ($var['type'] == 'boolean')
+				$value = isset($_POST[$field_name]);
+			elseif (isset($_POST[$field_name]))
+				$value = $_POST[$field_name];
+			else
+				continue; // ???
+			
+			if (!settype($value, $var['type']))
+				continue; // invalid
+			
+			if ($value != $var['value']) {
+				// This value has been changed.
+				
+				$config_append .= '$config';
+				
+				if (is_array($var['name'])) {
+					foreach ($var['name'] as $name)
+						$config_append .= '[' . var_export($name, true) . ']';
+				} else {
+					$config_append .= '[' . var_export($var['name'], true) . ']';
+				}
+				
+				$config_append .= ' = ' . var_export($value, true) . ";\n";
+			}
+		}
+		
+		if(!empty($config_append)) {
+			$config_append = "\n// Changes made via web editor by \"" . $mod['username'] . "\" @ " . date('r') . ":\n" . $config_append . "\n";
+		
+			if(!@file_put_contents('inc/instance-config.php', $config_append, FILE_APPEND)) {
+				$config_append = htmlentities($config_append);
+				
+				if($config['minify_html'])
+					$config_append = str_replace("\n", '&#010;', $config_append);
+				$page = array();
+				$page['title'] = 'Cannot write to file!';
+				$page['config'] = $config;
+				$page['body'] = '
+					<p style="text-align:center">Tinyboard could not write to <strong>inc/instance-config.php</strong> with the ammended configuration, probably due to a permissions error.</p>
+					<p style="text-align:center">You may proceed with these changes manually by copying and pasting the following code to the end of <strong>inc/instance-config.php</strong>:</p>
+					<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" readonly>' . $config_append . '</textarea>
+				';
+				echo Element('page.html', $page);
+				exit;
+			}
+		}
+		
+		header('Location: ?/', true, $config['redirect_http']);
+		
+		exit;
+	}
+	
+	mod_page('Config editor', 'mod/config-editor.html', array('conf' => $conf));
+}
+
 function mod_debug_antispam() {
 	global $pdo, $config;
 	
diff --git a/inc/template.php b/inc/template.php
index 5355e18c..351bde62 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -27,7 +27,7 @@ function load_twig() {
 	$twig = new Twig_Environment($loader, array(
 		'autoescape' => false,
 		'cache' => "{$config['dir']['template']}/cache",
-		'debug' => ($config['debug'] ? true : false),
+		'debug' => $config['debug']
 	));
 	$twig->addExtension(new Twig_Extensions_Extension_Tinyboard());
 	$twig->addExtension(new Twig_Extensions_Extension_I18n());
diff --git a/mod.php b/mod.php
index 23cacc11..5fa040ee 100644
--- a/mod.php
+++ b/mod.php
@@ -65,6 +65,8 @@ $pages = array(
 	'/(\w+)/bump(un)?lock/(\d+)'		=> 'bumplock',		// "bumplock" thread
 	'/(\w+)/move/(\d+)'			=> 'move',		// move thread
 	
+	'/config'				=> 'config',		// config editor
+	
 	// these pages aren't listed in the dashboard without $config['debug']
 	'/debug/antispam'			=> 'debug_antispam',
 	
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 16da419c..1913f60a 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -388,19 +388,15 @@ div.blotter {
 	font-weight: bold;
 	text-align: center;
 }
-
-/* Uboachan stuff */
-div.styles-sidebar {
-	text-align: center;
-	padding-bottom: 0px;
-}
-div.styles-sidebar a {
-	margin: 0 5px;
+table.mod.config-editor {
+	font-size: 9pt;
+	width: 100%;
 }
-div.styles-sidebar a.selected {
-	text-decoration: none;
+table.mod.config-editor td {
+	text-align: left;
+	padding: 5px;
+	border-bottom: 1px solid #98e;
 }
-.category {
-	background: #98E;
-	color: black;
+table.mod.config-editor input[type="text"] {
+	width: 98%;
 }
diff --git a/templates/mod/config-editor.html b/templates/mod/config-editor.html
new file mode 100644
index 00000000..ec7213bb
--- /dev/null
+++ b/templates/mod/config-editor.html
@@ -0,0 +1,56 @@
+<form method="post" action="">
+	<table class="mod config-editor">
+		<tr>
+			<th class="minimal">Name</th>
+			<th>Value</th>
+			<th class="minimal">Type</th>
+			<th>Description</th>
+		</tr>
+		{% for var in conf if var.type != 'array' %}
+			{% if var.name|count == 1 %}
+				{% set name = 'cf_' ~ var.name %}
+			{% else %}
+				{% set name = 'cf_' ~ var.name|join('/') %}
+			{% endif %}
+			
+			<tr>
+				<th class="minimal">
+					{% if var.name|count == 1 %}
+						{{ var.name }}
+					{% else %}
+						{{ var.name|join(' &rarr; ') }}
+					{% endif %}
+				</th>
+				
+				<td>
+					{% if var.type == 'string' %}
+						<input name="{{ name }}" type="text" value="{{ var.value|e }}">
+					{% elseif var.type == 'integer' %}
+						<input name="{{ name }}" type="number" value="{{ var.value|e }}">
+					{% elseif var.type == 'boolean' %}
+						<input name="{{ name }}" type="checkbox" {% if var.value %}checked{% endif %}>
+					{% else %}
+						?
+					{% endif %}
+					
+					{% if var.type == 'integer' or var.type == 'boolean' %}
+					 <small>Default: <code>{{ var.default }}</code></small>
+					{% endif %}
+				</td>
+				
+				<td class="minimal">
+					{{ var.type|e }}
+				</td>
+				
+				<td>
+					{{ var.comment|join('<br>') }}
+				</td>
+			</tr>
+		{% endfor %}
+	</table>
+	
+	<ul style="padding:0;text-align:center;list-style:none">
+		<li><input name="save" type="submit" value="{% trans 'Save changes' %}"></li>
+	</ul>
+</form>
+
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index e69301fd..c49880ae 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -1,9 +1,11 @@
 {% for board_posts in posts %}
 	<fieldset>
 		<legend>
-			<a href="?/{{ config.board_path|sprintf(board_posts.board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}</a>
-			 - 
-			 {{ board_posts.board.title|e }}
+			<a href="?/{{ config.board_path|sprintf(board_posts.board.uri) }}{{ config.file_index }}">
+				{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}
+				 - 
+				 {{ board_posts.board.title|e }}
+			</a>
 		</legend>
 		{{ board_posts.posts|join('<hr>') }}
 	</fieldset>
-- 
cgit v1.3


From 77efe28e9edd717aad844fff52e46e5b0b3b5951 Mon Sep 17 00:00:00 2001
From: thegentoo <thegent.4chon@gmail.com>
Date: Wed, 11 Jul 2012 16:10:53 -0300
Subject: Added 1px spacing to spoiler tags (fixes issue with some characters
 clipping out of the spoiler).

---
 stylesheets/style.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'stylesheets')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 1913f60a..2111a942 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -271,6 +271,7 @@ span.heading {
 span.spoiler {
 	background: black;
 	color: black;
+	padding: 0px 1px;
 }
 div.post.reply p.body span.spoiler a {
 	color: black;
-- 
cgit v1.3


From 06c293217d167e80cef8252eea0d6dd04a1f552f Mon Sep 17 00:00:00 2001
From: thegentoo <thegent.4chon@gmail.com>
Date: Wed, 11 Jul 2012 16:14:33 -0300
Subject: Removed display:block; from span.heading

---
 stylesheets/style.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'stylesheets')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 2111a942..80042bd6 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -266,7 +266,6 @@ span.heading {
 	color: #AF0A0F;
 	font-size: 11pt;
 	font-weight: bold;
-	display: block;
 }
 span.spoiler {
 	background: black;
-- 
cgit v1.3