diff options
| author | Simon McFarlane <simon@piston.pw> | 2015-05-26 23:31:47 -0700 |
|---|---|---|
| committer | Simon McFarlane <simon@piston.pw> | 2015-05-29 01:34:53 -0700 |
| commit | 4b40f69a4e6d190f6d342875bd084c2a6c9d8b0f (patch) | |
| tree | fcc5dc9efa24afcb0bda3740b59f0c4e81c42f62 /templates/post | |
| parent | 2ac451ecb7aaae1ed1402425b8df6a5cb9831f2b (diff) | |
| parent | d20149b57929c27da87a7d9603d85717da15c5bc (diff) | |
Merge remote-tracking branch 'upstream/master' into vichan-merge
Diffstat (limited to 'templates/post')
| -rw-r--r-- | templates/post/image_identification.html | 2 | ||||
| -rw-r--r-- | templates/post/name.html | 2 | ||||
| -rw-r--r-- | templates/post/poster_id.html | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/templates/post/image_identification.html b/templates/post/image_identification.html index eaef2259..ff25ff95 100644 --- a/templates/post/image_identification.html +++ b/templates/post/image_identification.html @@ -8,7 +8,7 @@ <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">Exif</a> {% endif %} {% if config.image_identification_google %} - <a href="https://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">Google</a> + <a href="https://www.google.com/searchbyimage?image_url={{ config.domain|url_encode }}{{ config.uri_img|url_encode }}{{ file.file|url_encode }}" target="_blank">Google</a> {% endif %} {% if config.image_identification_iqdb %} <a href="http://iqdb.org/?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">iqdb</a> diff --git a/templates/post/name.html b/templates/post/name.html index 009b234d..13c676c7 100644 --- a/templates/post/name.html +++ b/templates/post/name.html @@ -1,5 +1,5 @@ {% set capcode = post.capcode|capcode %} -{% if post.email|length > 0 %} +{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') %} {# start email #} <a class="email" href="mailto:{{ post.email }}"> {% endif %} diff --git a/templates/post/poster_id.html b/templates/post/poster_id.html index 63cdf562..4efc56ff 100644 --- a/templates/post/poster_id.html +++ b/templates/post/poster_id.html @@ -1,7 +1,7 @@ {% if config.poster_ids %} {% if post.thread %} - ID: {{ post.ip|poster_id(post.thread) }} + ID: <span class="poster_id">{{ post.ip|poster_id(post.thread) }}</span> {% else %} - ID: {{ post.ip|poster_id(post.id) }} + ID: <span class="poster_id">{{ post.ip|poster_id(post.id) }}</span> {% endif %} {% endif %} |