diff options
| author | czaks <marcin@6irc.net> | 2013-07-22 23:33:02 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-22 23:33:02 -0400 |
| commit | 88c1205e422b314cae2c0410ce21f9c8283f0f0e (patch) | |
| tree | 7a92c4bab532949fe4557ab67f5db6abff769718 /templates | |
| parent | 6bc309697edfa5ab1c2cf22d945361bb8a210baa (diff) | |
| parent | f0aee74523158e9c7504502bb54100681fffe0d5 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
js/hide-threads.js
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mod/ban_form.html | 4 | ||||
| -rw-r--r-- | templates/mod/dashboard.html | 30 |
2 files changed, 23 insertions, 11 deletions
diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html index edc1ab3b..6c7560ad 100644 --- a/templates/mod/ban_form.html +++ b/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; } diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html index 619663f5..5f6585fc 100644 --- a/templates/mod/dashboard.html +++ b/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> |