aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-10-25 23:43:14 +0300
committerGravatar Vitaly Takmazov2017-10-25 23:43:14 +0300
commita0147e7d5a1fad7c0bb3349a1c66657b0b9d1e46 (patch)
treeb8781788a06304d356905f55cebc07b922473a28
parent22e98a043c468441d1581a63622947ca11c0122b (diff)
www: fix recommend template condition
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/message.html12
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/thread.html9
2 files changed, 11 insertions, 10 deletions
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html
index ed3e7e90..0e0d2c7a 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html
@@ -25,20 +25,18 @@
</p>
{% endif %}
<nav class="l">
- {% if visitor.uid != msg.user.uid %}
- {% if visitor.uid > 0 %}
- <a href="/post?body=!+%23{{ msg.mid }}" class="a-like">
+ {% if visitor.uid == msg.user.uid %}
+ <a href="/{{ msg.mid }}" class="a-like">
<i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ i18n("messages","message.recommend") }}
{% if msg.Likes > 0 %}&nbsp;({{ msg.Likes }}){% endif %}
</a>
- {% else %}
- <a href="/login" class="a-login">
+ {% elseif visitor.uid > 0 %}
+ <a href="/post?body=!+%23{{ msg.mid }}" class="a-like">
<i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ i18n("messages","message.recommend") }}
{% if msg.Likes > 0 %}&nbsp;({{ msg.Likes }}){% endif %}
</a>
- {% endif %}
{% else %}
- <a href="/{{ msg.mid }}" class="a-like">
+ <a href="/login" class="a-login">
<i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ i18n("messages","message.recommend") }}
{% if msg.Likes > 0 %}&nbsp;({{ msg.Likes }}){% endif %}
</a>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/thread.html b/juick-www/src/main/webapp/WEB-INF/views/thread.html
index 1b1e4384..e45592e2 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/thread.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/thread.html
@@ -32,8 +32,12 @@
</div>
{% endif %}
<nav class="l">
- {% if visitor.uid != msg.user.uid %}
- {% if visitor.uid > 0 %}
+ {% if visitor.uid == msg.user.uid %}
+ <a href="/{{ msg.mid }}" class="a-like">
+ <i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ i18n("messages","message.recommend") }}
+ {% if msg.Likes > 0 %}&nbsp;({{ msg.Likes }}){% endif %}
+ </a>
+ {% elseif visitor.uid > 0 %}
<a href="/post?body=!+%23{{ msg.mid }}" class="a-like">
<i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ i18n("messages","message.recommend") }}
{% if msg.Likes > 0 %}&nbsp;({{ msg.Likes }}){% endif %}
@@ -44,7 +48,6 @@
{% if msg.Likes > 0 %}&nbsp;({{ msg.Likes }}){% endif %}
</a>
{% endif %}
- {% endif %}
{% if (visitor.uid > 0 and not msg.ReadOnly) or (visitor.uid == msg.user.uid) %}
<a href="#" class="msg-menu"><i data-icon="ei-link" data-size="s"></i>&nbsp;Share</a>
{% endif %}