diff options
| author | czaks <marcin@6irc.net> | 2013-07-16 13:02:13 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-16 13:02:13 -0400 |
| commit | 7bdb96a16b51eb8086fead11783bb095ea42cd90 (patch) | |
| tree | b236bbd6082d927e25ecf4b07ea45bb5e1206a60 /templates/mod | |
| parent | 8a598982a4f6ae48ad6e2a4d634314215871c4c1 (diff) | |
| parent | aadb57f2a2db9210468f25d7dcd45d561ef6ad54 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
install.php
templates/index.html
templates/thread.html
Diffstat (limited to 'templates/mod')
| -rw-r--r-- | templates/mod/ban_list.html | 8 | ||||
| -rw-r--r-- | templates/mod/dashboard.html | 2 | ||||
| -rw-r--r-- | templates/mod/view_ip.html | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html index 2edb9cdf..f8826ade 100644 --- a/templates/mod/ban_list.html +++ b/templates/mod/ban_list.html @@ -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 %} @@ -59,6 +60,13 @@ {% endif %} </td> <td> + {% if ban.seen %} + {% trans 'Yes' %} + {% else %} + {% trans 'No' %} + {% endif %} + </td> + <td> {% if ban.username %} {% if mod|hasPermission(config.mod.view_banstaff) %} <a href="?/new_PM/{{ ban.username|e }}">{{ ban.username|e }}</a> diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html index 2f0b03ad..e54b3cd3 100644 --- a/templates/mod/dashboard.html +++ b/templates/mod/dashboard.html @@ -101,6 +101,7 @@ </ul> </fieldset> +{# <fieldset> <legend>{% trans 'Search' %}</legend> @@ -115,6 +116,7 @@ </li> </ul> </fieldset> +#} {% if config.debug %} <fieldset> diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html index 562a0140..e2dad7af 100644 --- a/templates/mod/view_ip.html +++ b/templates/mod/view_ip.html @@ -137,6 +137,16 @@ </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> {% if ban.username %} |