diff options
| author | czaks <marcin@6irc.net> | 2013-07-31 14:54:20 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-31 14:54:20 -0400 |
| commit | 55c7146d884005f70d15e991a9e8ea31b7021361 (patch) | |
| tree | 57b6548601dfd1542febe05375efe49d439e1fb4 /templates/post_thread.html | |
| parent | ee23ec1e24bb2a0cec24af011012e95652ce85a9 (diff) | |
| parent | 8e4c493a4c5bbff07483fd4a11c44c687c99e441 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/config.php
inc/display.php
inc/functions.php
inc/image.php
js/expand.js
js/hide-threads.js
js/local-time.js
js/smartphone-spoiler.js
templates/header.html
templates/index.html
templates/main.js
templates/page.html
templates/post_reply.html
templates/post_thread.html
templates/thread.html
Diffstat (limited to 'templates/post_thread.html')
| -rw-r--r-- | templates/post_thread.html | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/templates/post_thread.html b/templates/post_thread.html index cbd37229..c8da07e3 100644 --- a/templates/post_thread.html +++ b/templates/post_thread.html @@ -99,27 +99,27 @@ {% endif %}"> {{ post.id }} </a> - {% if post.sticky %} - {% if config.font_awesome %} - <i class="icon-pushpin icon"></i> - {% else %} - <img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" /> - {% endif %} - {% endif %} - {% if post.locked %} - {% if config.font_awesome %} - <i class="icon-lock icon"></i> - {% else %} - <img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" /> - {% endif %} - {% endif %} - {% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %} - {% if config.font_awesome %} - <i class="icon-anchor icon"></i> - {% else %} - <img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" /> - {% endif %} - {% endif %} + {% if post.sticky %} + {% if config.font_awesome %} + <i class="icon-pushpin icon"></i> + {% else %} + <img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" /> + {% endif %} + {% endif %} + {% if post.locked %} + {% if config.font_awesome %} + <i class="icon-lock icon"></i> + {% else %} + <img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" /> + {% endif %} + {% endif %} + {% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %} + {% if config.font_awesome %} + <i class="icon-anchor icon"></i> + {% else %} + <img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" /> + {% endif %} + {% endif %} {% if index %} <a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ config.file_page|sprintf(post.id) }}">[{% trans %}Reply{% endtrans %}]</a> {% endif %} |