From ff106a64431e6510267ab0677c41d95d555b3956 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 19 Oct 2017 16:34:02 +0300
Subject: www: new design

---
 .../main/webapp/WEB-INF/views/partial/message.html | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'juick-www/src/main/webapp/WEB-INF/views/partial/message.html')

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 c0d345ba..72e5cce0 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
@@ -6,7 +6,6 @@
         <div class="msg-avatar"><a href="/{{ msg.user.name }}/">
             <img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/></a>
         </div>
-        <div class="msg-menu"><a href="#"><i data-icon="ei-link" data-size="s"></i></a></div>
         <div class="msg-ts">
             <a href="/{{ msg.user.name }}/{{ msg.mid }}">
                 <time itemprop="datePublished dateModified" itemtype="http://schema.org/Date" datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
@@ -28,15 +27,30 @@
     <nav class="l">
         {% if visitor.uid != msg.user.uid %}
         {% if visitor.uid > 0 %}
-        <a href="/post?body=!+%23{{ msg.mid }}" class="a-like">{{ i18n("messages","message.recommend") }}</a>
+        <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>
         {% else %}
-        <a href="/login" class="a-login">{{ i18n("messages","message.recommend") }}</a>
+        <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>
         {% endif %}
         {% endif %}
         {% if (visitor.uid > 0 and not msg.ReadOnly) or (visitor.uid == msg.user.uid) %}
-        <a href="/{{ msg.mid }}" class="a-comment">{{ i18n("messages","message.comment") }}</a>
+        <a href="/{{ msg.mid }}" class="a-comment">
+            <i data-icon="ei-comment" data-size="s"></i>&nbsp;{{ i18n("messages","message.comment") }}
+            {% if msg.Replies > 0 %}&nbsp;({{ msg.Replies }}){% endif %}
+        </a>
+        <a href="#" class="msg-menu">
+            <i data-icon="ei-link" data-size="s"></i>&nbsp;Share
+        </a>
         {% elseif visitor.uid == 0 and not msg.ReadOnly %}
-        <a href="/login" class="a-login">{{ i18n("messages","message.comment") }}</a>
+        <a href="/login" class="a-login">
+            <i data-icon="ei-comment" data-size="s"></i>&nbsp;{{ i18n("messages","message.comment") }}
+            {% if msg.Replies > 0 %}&nbsp;({{ msg.Replies }}){% endif %}
+        </a>
         {% endif %}
         {% if msg.FriendsOnly %}
         <a href="#" class="a-privacy">Открыть доступ</a>
@@ -47,14 +61,4 @@
         <a href="#" class="a-popular-delete">x</a>
         {% endif %}
     </nav>
-    <nav class="s">
-        {% if msg.Likes > 0 %}
-        <a href="/{{ msg.user.name }}/{{ msg.mid }}" class="likes">
-            <i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ msg.Likes }}</a>
-        {% endif %}
-        {% if msg.Replies > 0 %}
-        <a href="/{{ msg.user.name }}/{{ msg.mid }}" class="replies">
-            <i data-icon="ei-comment" data-size="s"></i>&nbsp;&nbsp;<span itemprop="commentCount">{{ msg.Replies }}</span></a>
-        {% endif %}
-    </nav>
 </article>
\ No newline at end of file
-- 
cgit v1.2.3