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/search_results.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/search_results.html')
| -rw-r--r-- | templates/mod/search_results.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/templates/mod/search_results.html b/templates/mod/search_results.html index 0c87f75f..0d3c2a10 100644 --- a/templates/mod/search_results.html +++ b/templates/mod/search_results.html @@ -56,10 +56,10 @@ {% for ban in results %} <tr{% if ban.expires != 0 and ban.expires < time() %} style="text-decoration:line-through"{% endif %}> <td style="white-space: nowrap"> - {% if ban.real_ip %} - <a href="?/IP/{{ ban.ip }}#bans">{{ ban.ip }}</a> + {% if ban.single_addr %} + <a href="?/IP/{{ ban.mask }}#bans">{{ ban.mask }}</a> {% else %} - {{ ban.ip|e }} + {{ ban.mask|e }} {% endif %} </td> <td> @@ -77,15 +77,15 @@ {% endif %} </td> <td style="white-space: nowrap"> - <span title="{{ ban.set|date(config.post_date) }}"> - {{ ban.set|ago }} ago + <span title="{{ ban.created|date(config.post_date) }}"> + {{ ban.created|ago }} ago </span> </td> <td style="white-space: nowrap"> {% if ban.expires == 0 %} - {% else %} - {{ (ban.expires - ban.set + time()) | until }} + {{ (ban.expires - ban.created + time()) | until }} {% endif %} </td> <td style="white-space: nowrap"> @@ -116,7 +116,7 @@ {% endif %} {% endif %} - {% elseif ban.mod == -1 %} + {% elseif ban.creator == -1 %} <em>system</em> {% else %} <em>{% trans 'deleted?' %}</em> |