diff options
| author | czaks <marcin@6irc.net> | 2013-09-17 10:43:44 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-09-17 10:43:44 -0400 |
| commit | 6cb7eb939e549f978ca6dd7d2afe2dabc0f18025 (patch) | |
| tree | 8b2342bbf5c15847717db733ecf4f2f46718dacb /templates/mod/debug/antispam.html | |
| parent | 069f1def9bf8c8d769afdc5740e9ff13271065bd (diff) | |
| parent | 803f0c8ce1487ea791824197de9d1ee140127838 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
inc/config.php
inc/display.php
inc/mod/pages.php
install.php
js/quick-reply.js
post.php
templates/index.html
Diffstat (limited to 'templates/mod/debug/antispam.html')
| -rw-r--r-- | templates/mod/debug/antispam.html | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/templates/mod/debug/antispam.html b/templates/mod/debug/antispam.html index 95aa61a6..9979a093 100644 --- a/templates/mod/debug/antispam.html +++ b/templates/mod/debug/antispam.html @@ -14,11 +14,14 @@ <tr> <td>{{ config.board_abbreviation|sprintf(hash.board) }}</td> <td> - {% if hash.thread %} + {% if hash.thread > 0 %} {{ hash.thread }} + {% elseif hash.thread < 0 %} + Index (page {{ - hash.thread }}) {% else %} - - {% endif %}</td> + {% endif %} + </td> <td> <small><code>{{ hash.hash }}</code></small> </td> @@ -28,7 +31,11 @@ <td> {% if hash.expires %} <span title="{{ hash.expires|date(config.post_date) }}"> - {{ hash.expires|until }} + {% if hash.expires < time() %} + {{ hash.expires|ago }} ago + {% else %} + {{ hash.expires|until }} + {% endif %} </span> {% else %} - @@ -55,11 +62,14 @@ <tr> <td>{{ config.board_abbreviation|sprintf(hash.board) }}</td> <td> - {% if hash.thread %} + {% if hash.thread > 0 %} {{ hash.thread }} + {% elseif hash.thread < 0 %} + Index (page {{ - hash.thread }}) {% else %} - - {% endif %}</td> + {% endif %} + </td> <td> <small><code>{{ hash.hash }}</code></small> </td> @@ -69,7 +79,11 @@ <td> {% if hash.expires %} <span title="{{ hash.expires|date(config.post_date) }}"> - {{ hash.expires|until }} + {% if hash.expires < time() %} + {{ hash.expires|ago }} ago + {% else %} + {{ hash.expires|until }} + {% endif %} </span> {% else %} - |