kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	js/hide-threads.js
This commit is contained in:
czaks 2013-07-22 23:33:02 -04:00
commit 88c1205e42
4 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/config.php
View File

@ -887,7 +887,7 @@
// Number of news entries to display per page
$config['mod']['news_page'] = 40;
// Number of results to dispaly per page
// Number of results to display per page
$config['mod']['search_page'] = 200;
// How many entries to show per page in the moderator noticeboard
@ -895,6 +895,8 @@
// Number of entries to summarize and display on the dashboard
$config['mod']['noticeboard_dashboard'] = 5;
// Check public ban message by default
$config['mod']['check_ban_message'] = false;
// Default public ban message
$config['mod']['default_ban_message'] = 'USER WAS BANNED FOR THIS POST';
// What to append to the post for public bans ("%s" is the message)
@ -1136,6 +1138,18 @@
// Connection timeout, in seconds
$config['purge_timeout'] = 3;
// Additional mod.php?/ pages (for developers). Look in inc/mod/pages.php for help.
//$config['mod']['custom_pages']['/something/(\d+)'] = function($id) {
// global $config;
// if (!hasPermission($config['mod']['something']))
// error($config['error']['noaccess']);
// // ...
//};
// Add links to dashboard (will all be in "Other" category)
$config['mod']['dashboard_links'] = array();
// $config['mod']['dashboard_links']['Something'] = '?/something';
// Remote servers
// http://tinyboard.org/wiki/index.php?title=Multiple_Servers
//$config['remote']['static'] = array(

1
js/hide-threads.js
View File

@ -38,6 +38,7 @@ $(document).ready(function(){
$('div.post.op').each(function() {
var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
var thread_container = $(this).parent();
var board = thread_container.data("board");
if (!hidden_data[board]) {

4
templates/mod/ban_form.html
View File

@ -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;
}

28
templates/mod/dashboard.html
View File

@ -102,17 +102,29 @@
</fieldset>
{% if mod|hasPermission(config.mod.search) %}
<fieldset>
<legend>{% trans 'Search' %}</legend>
<fieldset>
<legend>{% trans 'Search' %}</legend>
<ul>
<li>
{% include 'mod/search_form.html' %}
</li>
</ul>
</fieldset>
<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>