From a48a12bf8255e10a17d5fb9a1810e4789751faff Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 19 Dec 2017 16:45:11 +0300
Subject: Revert "www: move logout to settings"

This reverts commit 9653cf099891d6db215e4748df3b94e028aa3a7e.
---
 juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html | 1 -
 juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
index 4715253e..35a5a98e 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
@@ -2,5 +2,4 @@
     <li><a href="/settings">{{ i18n("messages","link.settings.main") }}</a></li>
     <li><a href="/settings?page=password">{{ i18n("messages","link.settings.password") }}</a></li>
     <li><a href="/settings?page=about">{{ i18n("messages","link.settings.about") }}</a></li>
-    <li><a href="/logout"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","link.logout") }}</a></li>
 </ul></div>
\ No newline at end of file
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 382c3622..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
@@ -56,6 +56,7 @@
     {% 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/>
-- 
cgit v1.2.3