Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	js/hide-threads.js

templates/mod/ban_form.html

@@ -41,11 +41,11 @@
 					<label for="reason">{% trans 'Message' %}</label>
 				</th>
 				<td>
-					<input type="checkbox" id="public_message" name="public_message"> 
+					<input type="checkbox" id="public_message" name="public_message"{% if config.mod.check_ban_message %} checked{% endif %}> 
 					<input type="text" name="message" id="message" size="35" maxlength="200" value="{{ config.mod.default_ban_message|e }}"> 
 					<span class="unimportant">({% trans 'public; attached to post' %})</span>
 					<script type="text/javascript">
-						document.getElementById('message').disabled = true;
+						document.getElementById('message').disabled = !document.getElementById('public_message').checked;
 						document.getElementById('public_message').onchange = function() {
 							document.getElementById('message').disabled = !this.checked;
 						}

templates/mod/dashboard.html

@@ -102,17 +102,29 @@
 </fieldset>
 
 {% if mod|hasPermission(config.mod.search) %}
-<fieldset>
-	<legend>{% trans 'Search' %}</legend>
-	
-	<ul>
-		<li>
-			{% include 'mod/search_form.html' %}
-		</li>
-	</ul>
-</fieldset>
+	<fieldset>
+		<legend>{% trans 'Search' %}</legend>
+		
+		<ul>
+			<li>
+				{% include 'mod/search_form.html' %}
+			</li>
+		</ul>
+	</fieldset>
 {%  endif %}
 
+{% if config.mod.dashboard_links|count %}
+	<fieldset>
+		<legend>{% trans 'Other' %}</legend>
+	
+		<ul>
+			{% for label,link in config.mod.dashboard_links %}
+				<li><a href="{{ link }}">{{ label }}</a></li>
+			{% endfor %}
+		</ul>
+	</fieldset>
+{% endif %}
+
 {% if config.debug %}
 	<fieldset>
 		<legend>{% trans 'Debug' %}</legend>