diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/banned.html | 16 | ||||
| -rw-r--r-- | templates/index.html | 2 | ||||
| -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 | ||||
| -rw-r--r-- | templates/thread.html | 2 |
6 files changed, 35 insertions, 5 deletions
diff --git a/templates/banned.html b/templates/banned.html index e912c1a9..e7b626f6 100644 --- a/templates/banned.html +++ b/templates/banned.html @@ -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) }} diff --git a/templates/index.html b/templates/index.html index 82d3104e..451ca8b1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -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 }}
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 %} diff --git a/templates/thread.html b/templates/thread.html index b8c54dec..1b217c2f 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -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 }}
|