Merge branch 'master' of github.com:vichan-devel/Tinyboard

Conflicts:
	js/post-hider.js

1 files changed, 28 insertions, 6 deletions

diff --git a/templates/mod/config-editor.html b/templates/mod/config-editor.html
index ec7213bb..a43f8cf7 100644
--- a/templates/mod/config-editor.html
+++ b/templates/mod/config-editor.html
@@ -1,10 +1,25 @@
+<p>
+	Any changes you make here will simply be appended to <code>{{ file }}</code>. If you wish to make the most of Tinyboard's customizability, you can instead edit the file directly. This page is intended for making quick changes and for those who don't have a basic understanding of PHP code.
+</p>
+{% if boards|count %}
+	<ul>
+		{% if board %}
+			<li><a href="?/config">Edit site-wide config</a></li>
+		{% endif %}
+		{% for _board in boards if _board.uri != board %}
+			<li>
+				<a href="?/config/{{ _board.uri }}">Edit config for {{ config.board_abbreviation|sprintf(_board.uri) }}</a>
+			</li>
+		{% endfor %}
+	</ul>
+{% endif %}
 <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>
+			<th class="minimal">{% trans 'Name' %}</th>
+			<th>{% trans 'Value' %}</th>
+			<th class="minimal">{% trans 'Type' %}</th>
+			<th>{% trans 'Description' %}</th>
 		</tr>
 		{% for var in conf if var.type != 'array' %}
 			{% if var.name|count == 1 %}
@@ -25,6 +40,13 @@
 				<td>
 					{% if var.type == 'string' %}
 						<input name="{{ name }}" type="text" value="{{ var.value|e }}">
+					{% elseif var.permissions %}
+						<select name="{{ name }}">
+							<option value="{{ constant('JANITOR') }}"{% if var.value == constant('JANITOR')%} selected{% endif %}>JANITOR</option>
+							<option value="{{ constant('MOD') }}"{% if var.value == constant('MOD')%} selected{% endif %}>MOD</option>
+							<option value="{{ constant('ADMIN') }}"{% if var.value == constant('ADMIN')%} selected{% endif %}>ADMIN</option>
+							<option value="{{ constant('DISABLED') }}"{% if var.value == constant('DISABLED')%} selected{% endif %}>DISABLED</option>
+						</select>
 					{% elseif var.type == 'integer' %}
 						<input name="{{ name }}" type="number" value="{{ var.value|e }}">
 					{% elseif var.type == 'boolean' %}
@@ -42,8 +64,8 @@
 					{{ var.type|e }}
 				</td>
 				
-				<td>
-					{{ var.comment|join('<br>') }}
+				<td style="word-wrap:break-word;width:50%">
+					{{ var.comment|join(' ') }}
 				</td>
 			</tr>
 		{% endfor %}