1 files changed, 14 insertions, 29 deletions
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>