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

5 files changed, 118 insertions, 58 deletions

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 10539c44..ccab381b 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/index.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/index.html
@@ -14,8 +14,6 @@
 {% block "column" %}
 {% if tag | default('') is not empty %}
 {% include "views/partial/tagcolumn" %}
-{% elseif visitor.uid > 0 %}
-{% include "views/partial/usercolumn" %}
 {% else %}
 {% include "views/partial/homecolumn" %}
 {% endif %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html
index c466a128..50f7e725 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html
@@ -1,6 +1,40 @@
-<p class="tags">
+<div id="ctitle">
+    <h2>{{ title }}</h2>
+    <div id="column-expander" tabindex="0"><i data-icon="ei-chevron-down" data-size="s"></i></div>
+</div>
+<hr/>
+<ul>
+    {% if paramShow != "top" %}
+    <li>
+        <a href="/">
+            <i data-icon="ei-star" data-size="s"></i>{{ i18n("messages","link.popular") }}
+        </a>
+    </li>
+    {% endif %}
+    {% if paramShow != "all" %}
+    <li>
+        <a href="/?show=all">
+            <i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }}
+        </a>
+    </li>
+    {% endif %}
+    {% if paramShow != "photos" %}
+    <li>
+        <a href="/?show=photos">
+            <i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}
+        </a>
+    </li>
+    {% endif %}
+</ul>
+<hr/>
+<form action="/">
+    <p>
+        <input name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}"/>
+    </p>
+</form>
+<div id="ctags">
     {% include "views/partial/tags" %}
     {% if showAdv | default(false) %}
     <a href="http://ru.wix.com/">конструктор сайтов</a>
     {% endif %}
-</p>
\ No newline at end of file
+</div>
\ 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 ff845ce9..5056b3f3 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,50 +1,51 @@
 <header>
     <div id="header_wrapper">
-        <div id="logo"><a href="/">Juick</a></div>
+        <div id="logo">
+            {% if visitor.uid > 0 %}
+            <a href="/?show=all">Juick</a>
+            {% else %}
+            <a href="/">Juick</a>
+            {% endif %}
+        </div>
         <nav id="global">
             <ul>
-                <li><a href="/?show=all" rel="nofollow"><i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }}</a></li>
-                <li id="menu-photos-1"><a href="/?show=photos" rel="nofollow"><i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}</a></li>
                 {% if visitor.uid > 0 %}
-                <li><a id="post" href="/post"><i data-icon="ei-pencil" data-size="s"></i>{{ i18n("messages","link.postMessage") }}</a></li>
-                {% else %}
-                <li><a href="/login" class="a-login"><i data-icon="ei-pencil" data-size="s"></i>{{ i18n("messages","link.postMessage") }}</a></li>
+                <li class="only-icon-2"><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i><span>{{ i18n("messages","link.discuss") }}</span></a></li>
+                <li class="only-icon-2"><a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i><span>{{ i18n("messages","link.my") }}</span></a></li>
+                {% elseif paramShow is empty %}
+                <li class="only-icon-3"><a href="/?show=all"><i data-icon="ei-search" data-size="s"></i><span>{{ i18n("messages","link.allMessages") }}</span></a></li>
+                <li class="only-icon-3"><a href="/?show=photos"><i data-icon="ei-camera" data-size="s"></i><span>{{ i18n("messages","link.withPhotos") }}</span></a></li>
                 {% endif %}
             </ul>
+            <div class="flex-spacer"></div>
         </nav>
-        <div id="menu-spacer-2" class="flex-spacer"></div>
-        <div id="search">
-            <form action="/">
-                <input name="search" class="text" placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}"/>
-            </form>
-        </div>
-        <div id="user-menu" tabindex="0">
-            <div id="menu-expander"><i data-icon="ei-chevron-down" data-size="s"></i></div>
-            <div id="menu-spacer-1" class="flex-spacer"></div>
-            <img src="//i.juick.com/a/{{ visitor.uid }}.png" alt="{{ visitor.name }}"/>
-            <div id="user-menu-dropdown">
-                <ul class="right-column">
-                    {% if visitor.uid > 0 %}
-                    <li><a href="/{{ visitor.name }}"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","blog.blog") }}</a></li>
-                    <li><a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i>{{ i18n("messages","link.my") }}</a></li>
-                    <li><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i>{{ i18n("messages","link.discuss") }}</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="/settings" rel="nofollow"><i data-icon="ei-gear" data-size="s"></i>{{ i18n("messages","link.settings") }}</a></li>
-                    <li class="next-section"><a href="/logout"><i data-icon="ei-share-apple" data-size="s"></i>{{ i18n("messages","link.logout") }}</a></li>
-                    {% else %}
-                    <li><a href="/login"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","link.login") }}</a></li>
-                    {% endif %}
-                </ul>
-                <ul class="left-column">
-                    <li id="menu-popular-2"><a href="/"><i data-icon="ei-star" data-size="s"></i>{{ i18n("messages","link.popular") }}</a></li>
-                    <li id="menu-photos-2"><a href="/?show=photos" rel="nofollow"><i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}</a></li>
-                    <li>
-                        <form action="/">
-                            <input name="search" class="text" placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}" size="1"/>
-                        </form>
-                    </li>
-                </ul>
+        <nav id="header-right">
+            <div class="flex-spacer"></div>
+            <!-- <form class="{% if visitor.uid > 0 %}hide-1{% else %}hide-2{% endif %}" id="site-search" action="/">
+                <i data-icon="ei-search" data-size="s"></i>
+                <input name="search" class="inp" title="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}" size="1"/>
+            </form> -->
+            {% if visitor.uid > 0 %}
+            <a id="post" href="/post" class="only-icon-4"><i data-icon="ei-pencil" data-size="s"></i><span>{{ i18n("messages","link.postMessage") }}</span></a>
+            <div id="user-menu" tabindex="0">
+                <img src="//i.juick.com/a/{{ visitor.uid }}.png" alt="{{ visitor.name }}"/>
+                <div id="user-menu-dropdown">
+                    <ul>
+                        <li><a href="/{{ visitor.name }}"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","blog.blog") }}</a></li>
+                        <li class="show-2"><a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i>{{ i18n("messages","link.my") }}</a></li>
+                        <li class="show-3"><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i>{{ i18n("messages","link.discuss") }}</a></li>
+                        <li><a href="/pm/inbox"><i data-icon="ei-envelope" data-size="s"></i>{{ i18n("messages","link.privateMessages") }}</a></li>
+                        {% if true or statsMyBL > 0 %}
+                        <li><a href="/bl"><i data-icon="ei-exclamation" data-size="s"></i>{{ i18n("messages","blog.bl") }}</a></li>
+                        {% endif %}
+                        <li><a href="/settings" rel="nofollow"><i data-icon="ei-gear" data-size="s"></i>{{ i18n("messages","link.settings") }}</a></li>
+                        <li class="next-section"><a href="/logout"><i data-icon="ei-share-apple" data-size="s"></i>{{ i18n("messages","link.logout") }}</a></li>
+                    </ul>
+                </div>
             </div>
-        </div>
+            {% else %}
+            <a href="/login" class="a-login"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","link.login") }}</a>
+            {% endif %}
+        </nav>
     </div>
 </header>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html
index 3e61d3d3..16eadc1b 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html
@@ -1,6 +1,7 @@
 <div id="ctitle">
     <h2>*{{ tag.name }}</h2>
 </div>
+<hr/>
 {% if visitor is not empty and visitor.uid > 0 %}
 <ul class="toolbar">
     {% if isSubscribed %}
@@ -30,4 +31,11 @@
     </li>
     {% endif %}
 </ul>
+<ul>
+    <li>
+        <a href="/{{ visitor.name }}/?tag={{ tag.name }}" title="В моём блоге">
+            In my blog
+        </a>
+    </li>
+</ul>
 {% endif %}
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>