www: new design

1 files changed, 27 insertions, 32 deletions

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 679550d5..f7093e0a 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/thread.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/thread.html
@@ -4,7 +4,6 @@
 <ul id="0">
     <li id="msg-{{ msg.mid }}" class="msg msgthread">
         <div class="msg-cont" itemscope="" itemtype="http://schema.org/BlogPosting" itemref="org">
-            <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" datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
                       title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT">
@@ -32,6 +31,32 @@
                 </a>
             </div>
             {% endif %}
+            <nav class="l">
+                {% if visitor.uid != msg.user.uid %}
+                {% if 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>
+                {% else %}
+                <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="#" class="msg-menu"><i data-icon="ei-link" data-size="s"></i>&nbsp;Share</a>
+                {% endif %}
+                {% if msg.FriendsOnly %}
+                <a href="#" class="a-privacy">Открыть доступ</a>
+                {% endif %}
+                {% if isModerator %}
+                <a href="#" class="a-popular-plus">+</a>
+                <a href="#" class="a-popular-minus">-</a>
+                <a href="#" class="a-popular-delete">x</a>
+                {% endif %}
+            </nav>
             {% if msg.VisitorCanComment %}
             <form action="/comment" method="POST" enctype="multipart/form-data">
                 <input type="hidden" name="mid" value="{{ msg.mid }}"/>
@@ -51,37 +76,6 @@
             {% endif %}
         </div>
     </li>
-
-    <li class="toolbar">
-        <ul>
-            <li><a href="/{{ msg.mid }}">
-                <div style="background-position: -64px 0"></div>
-                {{ msg.mid }}</a>
-            </li>
-            {% if visitor.uid > 0 %}
-            {% if visitor.uid != msg.user.uid %}
-            {% if visitorSubscribed %}
-            <li><a href="/post?body=U+%23{{ msg.mid }}">
-                <div style="background-position: -48px 0"></div>
-                {{ i18n("messages","message.subscribed") }}</a></li>
-            {% else %}
-            <li><a href="/post?body=S+%23{{ msg.mid }}">
-                <div style="background-position: -16px 0"></div>
-                {{ i18n("messages","message.subscribe") }}</a></li>
-            {% endif %}
-            {% if not visitorInBL %}
-            <li><a href="/post?body=%21+%23{{ msg.mid }}">
-                <div style="background-position: -32px 0"></div>
-                {{ i18n("messages","message.recommend") }}</a></li>
-            {% endif %}
-            {% else %}
-            <li><a href="/post?body=D+%23{{ msg.mid }}">
-                <div style="background-position: 0"></div>
-                {{ i18n("messages","message.delete") }}</a></li>
-            {% endif %}
-            {% endif %}
-        </ul>
-    </li>
 </ul>
 <div class="title2">
     <div class="title2-right">
@@ -106,4 +100,5 @@
 </ul>
 {% endblock %}
 {% block "column" %}
+{% include "views/partial/usercolumn" %}
 {% endblock %}
\ No newline at end of file