aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main/webapp
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-12-18 22:48:28 +0300
committerGravatar Vitaly Takmazov2017-12-18 22:48:28 +0300
commit96248d79b49edf36d2b3765b9b3a6c1ad872f56d (patch)
treed89bf40a0d6a14a8eac3da3b84fc11582570af28 /juick-www/src/main/webapp
parent0b19e12587e25f51a2f398bb9014b71ff9aacbbd (diff)
new layout
Diffstat (limited to 'juick-www/src/main/webapp')
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/index.html4
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html17
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html8
3 files changed, 27 insertions, 2 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..9a1cdb16 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 c466a128..6142e9e9 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 cabdca02..7afabcc3 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>