summaryrefslogtreecommitdiff
path: root/templates/post_thread.html
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-05 06:03:40 -0400
committerczaks <marcin@6irc.net>2013-08-05 06:03:40 -0400
commita84c4510fccfdc0cfb6f187633daea10dc70f326 (patch)
tree6077f5211196ae40cac0184bb7cc67b81d320b0b /templates/post_thread.html
parent33c7abf11f3a9b5c0964a2d7a25533c2849dbc78 (diff)
parenta8327c3a37fd22d2aa5d63061c9d3eaa30ae425a (diff)
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts: js/post-hider.js
Diffstat (limited to 'templates/post_thread.html')
-rw-r--r--templates/post_thread.html24
1 files changed, 18 insertions, 6 deletions
diff --git a/templates/post_thread.html b/templates/post_thread.html
index edc07011..a24d7557 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -23,9 +23,9 @@
{% if config.show_filename and post.filename %}
,
{% if post.filename|length > config.max_filename_display %}
- <span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
+ <span class="postfilename" title="{{ post.filename|e|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
{% else %}
- <span class="postfilename">{{ post.filename|bidi_cleanup }}</span>
+ <span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
{% endif %}
{% endif %}
{% if post.thumb != 'file' and config.image_identification %}
@@ -100,13 +100,25 @@
{{ post.id }}
</a>
{% if post.sticky %}
- <img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="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 %}
- <img class="icon" title="Locked" src="{{ config.image_locked }}" alt="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))) %}
- <img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
+ {% 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>
@@ -145,4 +157,4 @@
{% include 'post_reply.html' %}
{% endfor %}
<br class="clear"/>{% if hr %}<hr/>{% endif %}
-</div> \ No newline at end of file
+</div>