diff options
| author |  Vitaly Takmazov | 2017-12-18 22:48:28 +0300 |
|---|---|---|
| committer |  KillyMXI | 2017-12-27 15:04:57 +0300 |
| commit | 573971d10d7af79b74ce367383ab445814dcb039 (patch) | |
| tree | 0a98e4a69ceb4b3498667513276033daafdafab8 /juick-www/src/main/webapp/WEB-INF | |
| parent | a48a12bf8255e10a17d5fb9a1810e4789751faff (diff) | |
Revert "new layout"
This reverts commit 96248d79b49edf36d2b3765b9b3a6c1ad872f56d.
Diffstat (limited to 'juick-www/src/main/webapp/WEB-INF')
3 files changed, 2 insertions, 27 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 9a1cdb16..10539c44 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -15,11 +15,7 @@ {% 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 6142e9e9..c466a128 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,20 +1,3 @@ -<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 7afabcc3..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,14 +1,10 @@ <header> <div id="header_wrapper"> - <div id="logo"><a href="/{% if visitor.uid > 0 %}?show=my{% endif %}">Juick</a></div> + <div id="logo"><a href="/">Juick</a></div> <nav id="global"> <ul> - {% 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 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> |