www: new design

1 files changed, 22 insertions, 11 deletions

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/>