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

---
 juick-www/src/main/webapp/WEB-INF/views/index.html |  4 ++
 .../src/main/webapp/WEB-INF/views/macros/tree.html |  3 --
 .../main/webapp/WEB-INF/views/partial/footer.html  |  3 +-
 .../main/webapp/WEB-INF/views/partial/message.html | 34 +++++++------
 .../webapp/WEB-INF/views/partial/navigation.html   | 43 +++++-----------
 .../webapp/WEB-INF/views/partial/thread_list.html  |  3 --
 .../webapp/WEB-INF/views/partial/usercolumn.html   | 33 ++++++++----
 .../src/main/webapp/WEB-INF/views/pm_inbox.html    |  2 +-
 .../src/main/webapp/WEB-INF/views/pm_sent.html     |  2 +-
 .../src/main/webapp/WEB-INF/views/thread.html      | 59 ++++++++++------------
 10 files changed, 89 insertions(+), 97 deletions(-)

(limited to 'juick-www/src/main/webapp/WEB-INF/views')

diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html
index 51590ce0..23d208b6 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/index.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/index.html
@@ -12,7 +12,11 @@
 {% endif %}
 {% endblock %}
 {% block "column" %}
+{% if visitor.uid > 0 %}
+{% include "views/partial/usercolumn" %}
+{% else %}
 {% include "views/partial/homecolumn" %}
+{% endif %}
 {% if noindex %}
 <!--/noindex-->
 {% endif %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html
index f0c283e9..bb2507aa 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html
@@ -15,9 +15,6 @@
                     <img src="//i.juick.com/av-96.png"/>
                 </div>
 {% endif %}
-                <div class="msg-menu">
-                    <a href="#" class="a-thread-links"><i data-icon="ei-link" data-size="s"></i></a>
-                </div>
                 <div class="msg-ts">
                     <a href="/{{ msg.mid }}#{{ msg.rid }}">
                         <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
index 114e4304..784011a9 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
@@ -1,6 +1,5 @@
 <div id="footer">
-    <div id="footer-right">
-        <a href="/settings" rel="nofollow">{{ i18n("messages","link.settings") }}</a> &middot;
+    <div id="footer-right">         &middot;
         <a href="/help/ru/contacts" rel="nofollow">{{ i18n("messages","link.contacts") }}</a> &middot;
         <a href="/help/" rel="nofollow">{{ i18n("messages","link.help") }}</a> &middot;
         <a href="/help/ru/adv" rel="nofollow">{{ i18n("messages","link.adv") }}</a>
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
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
index 79f1985d..cabdca02 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
@@ -1,35 +1,20 @@
 <header>
-    <div id="logo"><a href="/">Juick</a></div>
-    <nav id="global">
-        <ul>
-            <li><a href="/?show=all" rel="nofollow">{{ i18n("messages","link.allMessages") }}</a></li>
-            <li><a href="/?show=photos" rel="nofollow">{{ i18n("messages","link.withPhotos") }}</a></li>
-        </ul>
-    </nav>
-    <div id="search">
-        <form action="/">
-            <input name="search" class="text"
-                   placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}"/>
-        </form>
-    </div>
-    <div id="headdiv">
-        {% if visitor.uid > 0 %}
-        <nav id="user">
-            <ul>
-                <li><a href="/?show=my">{{ i18n("messages","link.my") }}</a></li>
-                <li><a href="/pm/inbox">{{ i18n("messages","link.privateMessages") }}</a></li>
-                <li><a href="/?show=discuss">{{ i18n("messages","link.discuss") }}</a></li>
-            </ul>
-        </nav>
-        <nav id="actions">
+    <div id="header_wrapper">
+        <div id="logo"><a href="/">Juick</a></div>
+        <nav id="global">
             <ul>
-                <li><a id="post" href="/post"><i data-icon="ei-pencil" data-size="s"></i>{{ i18n("messages","link.postMessage") }}</a></li>
-                <li><a href="/{{ visitor.getName() }}">@{{ visitor.getName() }}</a></li>
-                <li><a href="/logout">{{ i18n("messages","link.logout") }}</a></li>
+                <li><a href="/?show=all" rel="nofollow"><i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }}</a></li>
+                <li><a href="/?show=photos" rel="nofollow"><i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}</a></li>
+                <li><a id="post" href="/post"><i data-icon="ei-pencil" data-size="s"></i>{{
+                    i18n("messages","link.postMessage") }}</a>
+                </li>
             </ul>
         </nav>
-        {% else %}
-        <p>{{ i18n("messages","message.loginForSending", "/login") | raw }}.</p>
-        {% endif %}
+        <div id="search">
+            <form action="/">
+                <input name="search" class="text"
+                       placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}"/>
+            </form>
+        </div>
     </div>
 </header>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html
index 918c4fb0..30bbc44c 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html
@@ -13,9 +13,6 @@
                 <img src="//i.juick.com/av-96.png"/>
             </div>
             {% endif %}
-            <div class="msg-menu">
-                <a href="#" class="a-thread-links"><i data-icon="ei-link" data-size="s"></i></a>
-            </div>
             <div class="msg-ts">
                 <a href="/{{ msg.mid }}#{{ msg.rid }}">
                     <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html
index 463ad2ca..edf218a1 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html
@@ -1,37 +1,40 @@
-<div id="ctitle"><a href="./">
-    <img src="//i.juick.com/as/{{ user.uid }}.png" alt=""/>{{ user.name }}</a></div>
+<div id="ctitle">
+    <a href="/{{ user.name }}">
+        <img src="//i.juick.com/a/{{ user.uid }}.png" alt=""/>{{ user.name }}
+    </a>
+</div>
 {% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}
 <ul class="toolbar">
     {% if isSubscribed %}
     <li>
         <a href="/post?body=U+%40{{ user.name }}" title="Подписан">
-            <div style="background-position: -48px 0"></div>
+            <i data-icon="ei-check" data-size="s"></i>Subscribed
         </a>
     </li>
     {% else %}
     <li>
         <a href="/post?body=S+%40{{ user.name }}" title="Подписаться">
-            <div style="background-position: -16px 0"></div>
+            <i data-icon="ei-plus" data-size="s"></i>Subscribe
         </a>
     </li>
     {% endif %}
     {% if isInBL %}
     <li>
         <a href="/post?body=BL+%40{{ user.name }}" title="Разблокировать">
-            <div style="background-position: -96px 0"></div>
+            <i data-icon="ei-close-o" data-size="s"></i>Unblock
         </a>
     </li>
     {% else %}
     <li>
         <a href="/post?body=BL+%40{{ user.name }}" title="Заблокировать">
-            <div style="background-position: -80px 0"></div>
+            <i data-icon="ei-close" data-size="s"></i>Block
         </a>
     </li>
     {% endif %}
     {% if not isInBLAny %}
     <li>
         <a href="/pm/sent?uname={{ user.name }}" title="Написать приватное сообщение">
-            <div style="background-position: -112px 0"></div>
+            <i data-icon="ei-envelope" data-size="s"></i>PM
         </a>
     </li>
     {% endif %}
@@ -40,17 +43,25 @@
 <hr/>
 {% endif %}
 <ul>
-    <li><a href="/{{ user.name }}/">{{ i18n("messages","blog.blog") }}</a></li>
-    <li><a href="/{{ user.name }}/?show=recomm" rel="nofollow">{{ i18n("messages","blog.recommendations") }}</a></li>
-    <li><a href="/{{ user.name }}/?show=photos" rel="nofollow">{{ i18n("messages","blog.photos") }}</a></li>
+    {% if visitor is not empty and visitor.uid == user.uid %}
+    <li><a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i>{{ i18n("messages","link.my") }}</a></li>
+    <li><a href="/pm/inbox"><i data-icon="ei-envelope" data-size="s"></i>{{ i18n("messages","link.privateMessages") }}</a></li>
+    <li><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i>{{ i18n("messages","link.discuss") }}</a></li>
+    {% endif %}
+    <li><a href="/{{ user.name }}/?show=recomm" rel="nofollow"><i data-icon="ei-heart" data-size="s"></i>{{ i18n("messages","blog.recommendations") }}</a></li>
+    <li><a href="/{{ user.name }}/?show=photos" rel="nofollow"><i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","blog.photos") }}</a></li>
     {% if visitor is not empty and visitor.uid == user.uid and false %}
     <li><a href="/?show=mycomments" rel="nofollow">{{ i18n("messages","blog.comments") }}</a></li>
     <li><a href="/?show=unanswered" rel="nofollow">Неотвеченные</a></li>
     {% endif %}
+    {% if visitor is not empty and visitor.uid == user.uid %}
+    <li><a href="/settings" rel="nofollow"><i data-icon="ei-gear" data-size="s"></i>{{ i18n("messages","link.settings") }}</a></li>
+    <li><a href="/logout"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","link.logout") }}</a></li>
+    {% endif %}
 </ul>
 <hr/>
 <form action="/{{ user.name }}/">
-    <p><input type="text" name="search" class="inp" placeholder="Поиск"/></p>
+    <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}"/></p>
 </form>
 {% include "views/partial/usertags" %}
 <hr/>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
index 156877c0..b2f9abda 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
@@ -31,5 +31,5 @@
 {% endif %}
 {% endblock %}
 {% block "column" %}
-{% include "views/partial/homecolumn" %}
+{% include "views/partial/usercolumn" %}
 {% endblock %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
index 08b9585a..ee9c5b1c 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
@@ -29,5 +29,5 @@
 {% endif %}
 {% endblock %}
 {% block "column" %}
-{% include "views/partial/homecolumn" %}
+{% include "views/partial/usercolumn" %}
 {% endblock %}
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
-- 
cgit v1.2.3