www: responsive layout (2)killy-responsive-2

1 files changed, 34 insertions, 15 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 0906218a..27cde3a3 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
@@ -4,6 +4,7 @@
     </a>
     <div id="column-expander" tabindex="0"><i data-icon="ei-chevron-down" data-size="s"></i></div>
 </div>
+<hr/>
 {% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}
 <ul class="toolbar">
     {% if isSubscribed %}
@@ -40,29 +41,48 @@
     </li>
     {% endif %}
 </ul>
-{% else %}
-<hr/>
 {% endif %}
 <ul>
-    <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>
+    <li>
+        <a href="/{{ user.name }}">
+            {{ i18n("messages","blog.messages") }}{% if statsMessages > 0 %} <span>{{ statsMessages }}</span>{% endif %}
+        </a>
+    </li>
+    <li>
+        <a href="/{{ user.name }}/?show=recomm" rel="nofollow">
+            {{ i18n("messages","blog.recommendations") }}{% if statsFavorites > 0 %} <span>{{ statsFavorites }}</span>{% endif %}
+        </a>
+    </li>
+    <li>
+        <a href="/{{ user.name }}/?show=photos" rel="nofollow">
+            {{ i18n("messages","blog.photos") }}{% if statsPhotos > 0 %} <span>{{ statsPhotos }}</span>{% endif %}
+        </a>
+    </li>
+    <li>
+        <a href="/{{ user.name }}/friends">
+            {{ i18n("messages","blog.iread") }}{% if statsIRead > 0 %} <span>{{ statsIRead }}</span>{% endif %}
+        </a>
+    </li>
+    <li>
+        <a href="/{{ user.name }}/readers">
+            {{ i18n("messages","blog.readers") }}{% if statsMyReaders > 0 %} <span>{{ statsMyReaders }}</span>{% endif %}
+        </a>
+    </li>
+    <li>
+        <p>
+            {{ i18n("messages","blog.comments") }}{% if statsReplies > 0 %} <span>{{ statsReplies }}</span>{% endif %}
+        </p>
+    </li>
 </ul>
 <hr/>
 <form action="/{{ user.name }}/">
-    <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}"/></p>
+    <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages', 'label.searchInUserPosts', user.name) }}"/></p>
 </form>
+<div id="ctags">
 {% include "views/partial/usertags" %}
+</div>
 <hr/>
 <div id="ustats">
-    <ul>
-        <li><a href="/{{ user.name }}/friends">{{ i18n("messages","blog.iread") }}: {{ statsIRead }}</a></li>
-        <li><a href="/{{ user.name }}/readers">{{ i18n("messages","blog.readers") }}: {{ statsMyReaders }}</a></li>
-        {% if statsMyBL > 0 and visitor.uid == user.uid %}
-        <li><a href="/{{ user.name }}/bl">{{ i18n("messages","blog.bl") }}: {{ statsMyBL }}</a></li>
-        {% endif %}
-        <li>{{ i18n("messages","blog.messages") }}: {{ statsMessages }}</li>
-        <li>{{ i18n("messages","blog.comments") }}: {{ statsReplies }}</li>
-    </ul>
     {% if iread is not empty %}
     <div class="iread">
         {% for u in iread %}
@@ -74,5 +94,4 @@
         {% endfor %}
     </div>
     {% endif %}
-
 </div>