perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

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

Browse source 
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
This commit is contained in:
czaks 2013-07-16 13:02:13 -04:00
commit 7bdb96a16b
15 changed files with 110 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
templates/banned.html
View file

@ -1,9 +1,17 @@
{% filter remove_whitespace %}
{# Automatically removes unnecessary whitespace #}
<div class="ban">
<h2>{% trans %}You are banned! ;_;{% endtrans %}</h2>
{% if ban.expires and time() >= ban.expires %}
<h2>{% trans %}You were banned! ;_;{% endtrans %}</h2>
{% else %}
<h2>{% trans %}You are banned! ;_;{% endtrans %}</h2>
{% endif %}
<p>
{% trans %}You have been banned from{% endtrans %}
{% if ban.expires and time() >= ban.expires %}
{% trans %}You were banned from{% endtrans %}
{% else %}
{% trans %}You have been banned from{% endtrans %}
{% endif %}
{% if ban.board %}
<strong>{{ config.board_abbreviation|sprintf(ban.board) }}</strong>
{% else %}
@ -23,7 +31,9 @@
<p>
{% trans %}Your ban was filed on{% endtrans %}
<strong>{{ ban.set|date(config.ban_date) }}</strong> {% trans %}and{% endtrans %} <span id="expires">
{% if ban.expires %}
{% if ban.expires and time() >= ban.expires %}
{% trans %} has since expired. Refresh the page to continue.{% endtrans %}
{% elseif ban.expires %}
{% trans %}expires{% endtrans %} <span id="countdown">{{ ban.expires|until }}</span> {% trans %}from now, which is on{% endtrans %}
<strong>
{{ ban.expires|date(config.ban_date) }}

2
templates/index.html
View file

@ -15,7 +15,7 @@
</script>
{% include 'header.html' %}
<title>{{ board.url }} - {{ board.name }}</title>
<title>{{ board.url }} - {{ board.title|e }}</title>
</head>
<body>
{{ boardlist.top }}

8
templates/mod/ban_list.html
View file

@ -10,6 +10,7 @@
<th>{% trans 'Set' %}</th>
<th>{% trans 'Duration' %}</th>
<th>{% trans 'Expires' %}</th>
<th>{% trans 'Seen' %}</th>
<th>{% trans 'Staff' %}</th>
</tr>
{% for ban in bans %}
@ -58,6 +59,13 @@
{% endif %}
{% endif %}
</td>
<td>
{% if ban.seen %}
{% trans 'Yes' %}
{% else %}
{% trans 'No' %}
{% endif %}
</td>
<td>
{% if ban.username %}
{% if mod|hasPermission(config.mod.view_banstaff) %}

2
templates/mod/dashboard.html
View file

@ -101,6 +101,7 @@
</ul>
</fieldset>
{#
<fieldset>
<legend>{% trans 'Search' %}</legend>
@ -115,6 +116,7 @@
</li>
</ul>
</fieldset>
#}
{% if config.debug %}
<fieldset>

10
templates/mod/view_ip.html
View file

@ -136,6 +136,16 @@
{% endif %}
</td>
</tr>
<tr>
<th>{% trans 'Seen' %}</th>
<td>
{% if ban.seen %}
{% trans 'Yes' %}
{% else %}
{% trans 'No' %}
{% endif %}
</td>
</tr>
<tr>
<th>{% trans 'Staff' %}</th>
<td>

2
templates/thread.html
View file

@ -8,7 +8,7 @@
</script>
{% include 'header.html' %}
<title>{{ board.url }} - {{ board.name }}</title>
<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
</head>
<body>
{{ boardlist.top }}