diff options
| author | czaks <marcin@6irc.net> | 2014-06-20 23:27:34 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-20 23:27:34 +0200 |
| commit | 73177fcffc040d1c225782fe85f09576a39f6890 (patch) | |
| tree | b101f49b4ff3b2b00d20b874abd702bb04ea6220 /templates | |
| parent | 9e2b722db6784226b1394ddf957aa9a4a16ac9a9 (diff) | |
| parent | 7933abd271b5bb3578cd80f62302cc6ac8961b91 (diff) | |
Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD
Conflicts:
templates/themes/basic/index.html
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/post/poster_id.html | 6 | ||||
| -rw-r--r-- | templates/themes/basic/thumb.png | bin | 9298 -> 7872 bytes | |||
| -rw-r--r-- | templates/themes/categories/thumb.png | bin | 9965 -> 8760 bytes | |||
| -rw-r--r-- | templates/themes/frameset/thumb.png | bin | 7571 -> 6333 bytes | |||
| -rw-r--r-- | templates/themes/recent/thumb.png | bin | 24532 -> 22566 bytes | |||
| -rw-r--r-- | templates/themes/ukko/thumb.png | bin | 15123 -> 13085 bytes |
6 files changed, 5 insertions, 1 deletions
diff --git a/templates/post/poster_id.html b/templates/post/poster_id.html index 3f168003..63cdf562 100644 --- a/templates/post/poster_id.html +++ b/templates/post/poster_id.html @@ -1,3 +1,7 @@ {% if config.poster_ids %} - ID: {{ post.ip|poster_id(post.id) }} + {% if post.thread %} + ID: {{ post.ip|poster_id(post.thread) }} + {% else %} + ID: {{ post.ip|poster_id(post.id) }} + {% endif %} {% endif %} diff --git a/templates/themes/basic/thumb.png b/templates/themes/basic/thumb.png Binary files differindex 05dcd96c..d0c3c771 100644 --- a/templates/themes/basic/thumb.png +++ b/templates/themes/basic/thumb.png diff --git a/templates/themes/categories/thumb.png b/templates/themes/categories/thumb.png Binary files differindex 35d747e2..8bdd7a8a 100644 --- a/templates/themes/categories/thumb.png +++ b/templates/themes/categories/thumb.png diff --git a/templates/themes/frameset/thumb.png b/templates/themes/frameset/thumb.png Binary files differindex df18a8e9..22d73da4 100644 --- a/templates/themes/frameset/thumb.png +++ b/templates/themes/frameset/thumb.png diff --git a/templates/themes/recent/thumb.png b/templates/themes/recent/thumb.png Binary files differindex fff5b824..98e3ecfc 100644 --- a/templates/themes/recent/thumb.png +++ b/templates/themes/recent/thumb.png diff --git a/templates/themes/ukko/thumb.png b/templates/themes/ukko/thumb.png Binary files differindex 49c4237b..eb616ef7 100644 --- a/templates/themes/ukko/thumb.png +++ b/templates/themes/ukko/thumb.png |
