new layout

4 files changed, 32 insertions, 2 deletions

diff --git a/juick-www/src/main/java/com/juick/www/controllers/Messages.java b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
index 2af6c21ae..39e88b12f 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Messages.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
@@ -128,6 +128,8 @@ public class Messages {
             paramSearch = null;
         }
 
+        model.addAttribute("discover", false);
+
         String title;
         List<Integer> mids;
 
@@ -138,6 +140,7 @@ public class Messages {
             if (visitor.getUid() > 0) {
                 title = "Популярные";
                 mids = messagesService.getPopular(visitor.getUid(), paramBefore);
+                model.addAttribute("discover", true);
             } else {
                 title = "Микроблоги Juick: популярные записи";
                 mids = messagesService.getPopular(0, paramBefore);
@@ -160,9 +163,11 @@ public class Messages {
         } else if (paramShow.equals("photos")) {
             title = "Фотографии";
             mids = messagesService.getPhotos(visitor.getUid(), paramBefore);
+            model.addAttribute("discover", true);
         } else if (paramShow.equals("all")) {
             title = "Все сообщения";
             mids = messagesService.getAll(visitor.getUid(), paramBefore);
+            model.addAttribute("discover", true);
         } else {
             throw new HttpNotFoundException();
         }
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 10539c444..9a1cdb169 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/index.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/index.html
@@ -15,7 +15,11 @@
 {% if tag | default('') is not empty %}
 {% include "views/partial/tagcolumn" %}
 {% elseif visitor.uid > 0 %}
+{% if discover %}
+{% include "views/partial/homecolumn" %}
+{% else %}
 {% include "views/partial/usercolumn" %}
+{% endif %}
 {% 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 c466a128a..6142e9e9a 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,3 +1,20 @@
+<ul class="toolbar">
+    <li>
+        <a href="/" title="Top">
+            <i data-icon="ei-heart" data-size="s"></i>Top
+        </a>
+    </li>
+    <li>
+        <a href="/?show=all" title="{{ i18n("messages","link.allMessages") }}">
+        <i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }}
+        </a>
+    </li>
+    <li>
+        <a href="/?show=photos" title="{{ i18n("messages","link.withPhotos") }}">
+        <i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}
+        </a>
+    </li>
+</ul>
 <p class="tags">
     {% include "views/partial/tags" %}
     {% if showAdv | default(false) %}
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 cabdca027..7afabcc3e 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,10 +1,14 @@
 <header>
     <div id="header_wrapper">
-        <div id="logo"><a href="/">Juick</a></div>
+        <div id="logo"><a href="/{% if visitor.uid > 0 %}?show=my{% endif %}">Juick</a></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>
+                {% if visitor.uid > 0 %}
+                <li><a href="/?show=discuss"><i data-icon="ei-comment" data-size="s"></i>{{ i18n("messages","link.discuss") }}</a></li>
+                {% else %}
                 <li><a href="/?show=photos" rel="nofollow"><i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages","link.withPhotos") }}</a></li>
+                {% endif %}
+                <li><a href="/?show=all" rel="nofollow"><i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }}</a></li>
                 <li><a id="post" href="/post"><i data-icon="ei-pencil" data-size="s"></i>{{
                     i18n("messages","link.postMessage") }}</a>
                 </li>