Initial grid layout

7 files changed, 93 insertions, 67 deletions

diff --git a/src/main/resources/templates/views/help.html b/src/main/resources/templates/views/help.html
index 3a022497..169ccb3f 100644
--- a/src/main/resources/templates/views/help.html
+++ b/src/main/resources/templates/views/help.html
@@ -6,5 +6,7 @@
 {% endblock %}
 
 {% block "column" %}
+<div class="toolbar">
 {{ navigation | raw }}
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/main/resources/templates/views/partial/footer.html b/src/main/resources/templates/views/partial/footer.html
index 785514bf..671b9b6a 100644
--- a/src/main/resources/templates/views/partial/footer.html
+++ b/src/main/resources/templates/views/partial/footer.html
@@ -1,16 +1,16 @@
 <div id="footer">
-    <div id="footer-right">         &middot;
-        <a href="/help/contacts" rel="nofollow">{{ i18n("messages","link.contacts") }}</a> &middot;
-        <a href="/help/tos" rel="nofollow">{{ i18n("messages","link.tos") }}</a>
-    </div>
+    <div id="footer-left">juick.com &copy; 2008-2020
+        {% if links | default ('')  is not empty %}
+        <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }}
+        {% endif %}
+    </div>    
     <div id="footer-social">
         <a href="https://twitter.com/Juick" rel="nofollow"><i data-icon="ei-sc-twitter" data-size="m"></i></a>
         <a href="https://vk.com/juick" rel="nofollow"><i data-icon="ei-sc-vk" data-size="m"></i></a>
         <a href="https://www.facebook.com/JuickCom" rel="nofollow"><i data-icon="ei-sc-facebook" data-size="m"></i></a>
     </div>
-    <div id="footer-left">juick.com &copy; 2008-2020
-        {% if links | default ('')  is not empty %}
-        <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }}
-        {% endif %}
+    <div id="footer-right">         &middot;
+        <a href="/help/contacts" rel="nofollow">{{ i18n("messages","link.contacts") }}</a> &middot;
+        <a href="/help/tos" rel="nofollow">{{ i18n("messages","link.tos") }}</a>
     </div>
 </div>
diff --git a/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources/templates/views/partial/homecolumn.html
index 5b13dd66..6f92f8ba 100644
--- a/src/main/resources/templates/views/partial/homecolumn.html
+++ b/src/main/resources/templates/views/partial/homecolumn.html
@@ -1,15 +1,18 @@
 <div class="toolbar">
     <a href="/?show=top" title="Top">
-        <i data-icon="ei-heart" data-size="s"></i>Top
+        <i data-icon="ei-heart" data-size="s"></i>
+        <span class="desktop">Top</span>
     </a>
     <a href="/?show=all" title="{{ i18n("messages", "link.allMessages") }}">
-    <i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }}
+    <i data-icon="ei-search" data-size="s"></i>
+        <span class="desktop">{{ i18n("messages","link.allMessages") }}</span>
     </a>
     <a href="/?show=photos" title="{{ i18n("messages", "link.withPhotos") }}">
-    <i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages", "link.withPhotos") }}
+    <i data-icon="ei-camera" data-size="s"></i>
+        <span class="desktop">{{ i18n("messages", "link.withPhotos") }}</span>
     </a>
 </div>
-<div class="tags">
+<div class="tags desktop">
     <h4>{{ i18n("messages","link.trends") }}</h4>
     {% include "views/partial/tags" %}
     {% if showAdv | default(false) %}
@@ -18,4 +21,7 @@
         <img src="https://ru.jooble.org/css/images/logos/jooble_80x30.png" alt="Работа в России"/>
     </a>
     {% endif %}
-</div>
\ No newline at end of file
+</div>
+<span class="desktop">
+    {% include "views/partial/footer" %}
+</span>
\ No newline at end of file
diff --git a/src/main/resources/templates/views/partial/navigation.html b/src/main/resources/templates/views/partial/navigation.html
index a3621bef..f3d43641 100644
--- a/src/main/resources/templates/views/partial/navigation.html
+++ b/src/main/resources/templates/views/partial/navigation.html
@@ -1,4 +1,4 @@
-<header>
+<div id="header">
     <div id="header_wrapper">
         {% if visitor.uid > 0 %}
         <div id="ctitle">
@@ -12,7 +12,7 @@
         {% else %}
         <div id="logo"><a href="/{% if visitor.uid > 0 %}?show=my{% endif %}">Juick</a></div>
         {% endif %}
-        <div id="search">
+        <div id="search" class="desktop">
             <form action="/">
                 <input name="search" class="text"
                        placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}"/>
@@ -21,23 +21,23 @@
         <nav id="global">
             <a href="/">
                 <i data-icon="ei-bell" data-size="s"></i>
-                <span class="icon-title">{{ i18n("messages","link.discuss") }}</span>{% if visitor.unreadCount > 0 %}<span class="badge">{{ visitor.unreadCount }}</span>{% endif %}
+                <span class="icon-title desktop">{{ i18n("messages","link.discuss") }}</span>{% if visitor.unreadCount > 0 %}<span class="badge">{{ visitor.unreadCount }}</span>{% endif %}
             </a>
             <a href="/?show=all" rel="nofollow">
                 <i data-icon="ei-search" data-size="s"></i>
-                <span class="icon-title">{{ i18n("messages","link.allMessages") }}</span>
+                <span class="icon-title desktop">{{ i18n("messages","link.allMessages") }}</span>
             </a>
                 {% if visitor.uid > 0 %}
             <a id="post" href="/post">
                 <i data-icon="ei-pencil" data-size="s"></i>
-                <span class="icon-title">{{ i18n("messages","link.postMessage") }}</span>
+                <span class="icon-title desktop">{{ i18n("messages","link.postMessage") }}</span>
             </a>
             {% else %}
             <a class="a-login" href="/login" rel="nofollow">
                 <i data-icon="ei-user" data-size="s"></i>
-                <span class="icon-title">{{ i18n("messages", "link.Login") }}</span>
+                <span class="icon-title desktop">{{ i18n("messages", "link.Login") }}</span>
             </a>
             {% endif %}
         </nav>
     </div>
-</header>
+</div>
diff --git a/src/main/resources/templates/views/partial/settings_tabs.html b/src/main/resources/templates/views/partial/settings_tabs.html
index 60337d92..00f7068a 100644
--- a/src/main/resources/templates/views/partial/settings_tabs.html
+++ b/src/main/resources/templates/views/partial/settings_tabs.html
@@ -5,4 +5,7 @@
         <a href="/settings?page=about">{{ i18n("messages","link.settings.about") }}</a>
         <a href="/logout"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","link.logout") }}</a>
     </div>
-</div>
\ No newline at end of file
+</div>
+<span class="desktop">
+    {% include "views/partial/footer" %}
+</span>
\ No newline at end of file
diff --git a/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources/templates/views/partial/tagcolumn.html
index c411c3c4..4d8ad160 100644
--- a/src/main/resources/templates/views/partial/tagcolumn.html
+++ b/src/main/resources/templates/views/partial/tagcolumn.html
@@ -23,3 +23,6 @@
     {% endif %}
 </div>
 {% endif %}
+<span class="desktop">
+    {% include "views/partial/footer" %}
+</span>
\ No newline at end of file
diff --git a/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources/templates/views/partial/usercolumn.html
index 5d1aaff6..4beefd8a 100644
--- a/src/main/resources/templates/views/partial/usercolumn.html
+++ b/src/main/resources/templates/views/partial/usercolumn.html
@@ -1,60 +1,69 @@
-{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}
-<div id="ctitle">
-    <a href="/{{ user.name }}">
-        <img src="{{ user.avatar }}" alt=""/>{{ user.name }}
-    </a>
-</div>
 <div class="toolbar">
-    {% if isSubscribed %}
-    <a href="/post?body=U+%40{{ user.name }}" title="Подписан">
-        <i data-icon="ei-check" data-size="s"></i>Subscribed
-    </a>
-    {% else %}
-    <a href="/post?body=S+%40{{ user.name }}" title="Подписаться">
-        <i data-icon="ei-plus" data-size="s"></i>Subscribe
-    </a>
+    {% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}
+    <div id="ctitle">
+        <a href="/{{ user.name }}">
+            <img src="{{ user.avatar }}" alt="" />{{ user.name }}
+        </a>
+    </div>
+    <div class="toolbar">
+        {% if isSubscribed %}
+        <a href="/post?body=U+%40{{ user.name }}" title="Подписан">
+            <i data-icon="ei-check" data-size="s"></i>Subscribed
+        </a>
+        {% else %}
+        <a href="/post?body=S+%40{{ user.name }}" title="Подписаться">
+            <i data-icon="ei-plus" data-size="s"></i>Subscribe
+        </a>
+        {% endif %}
+        {% if isInBL %}
+        <a href="/post?body=BL+%40{{ user.name }}" title="Разблокировать">
+            <i data-icon="ei-close-o" data-size="s"></i>Unblock
+        </a>
+        {% else %}
+        <a href="/post?body=BL+%40{{ user.name }}" title="Заблокировать">
+            <i data-icon="ei-close" data-size="s"></i>Block
+        </a>
+        {% endif %}
+        {% if not isInBLAny %}
+        <a href="/pm/sent?uname={{ user.name }}" title="Написать приватное сообщение">
+            <i data-icon="ei-envelope" data-size="s"></i>PM
+        </a>
+        {% endif %}
+    </div>
     {% endif %}
-    {% if isInBL %}
-    <a href="/post?body=BL+%40{{ user.name }}" title="Разблокировать">
-        <i data-icon="ei-close-o" data-size="s"></i>Unblock
+    {% if visitor is not empty and visitor.uid == user.uid %}
+    <a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i>
+        <span class="desktop">{{ i18n("messages","link.my") }}</span>
     </a>
-    {% else %}
-    <a href="/post?body=BL+%40{{ user.name }}" title="Заблокировать">
-        <i data-icon="ei-close" data-size="s"></i>Block
+    <a href="/pm/inbox"><i data-icon="ei-envelope" data-size="s"></i>
+        <span class="desktop">{{ i18n("messages","link.privateMessages") }}</span>
     </a>
-    {% endif %}
-    {% if not isInBLAny %}
-    <a href="/pm/sent?uname={{ user.name }}" title="Написать приватное сообщение">
-        <i data-icon="ei-envelope" data-size="s"></i>PM
+    <a href="/?show=discuss"><i data-icon="ei-bell" data-size="s"></i>
+        <span class="desktop">{{ i18n("messages","link.discuss") }}</span>
     </a>
     {% endif %}
-</div>
-{% endif %}
-<div class="toolbar">
-    {% if visitor is not empty and visitor.uid == user.uid %}
-    <a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i>{{ i18n("messages","link.my") }}</a>
-    <a href="/pm/inbox"><i data-icon="ei-envelope" data-size="s"></i>{{ i18n("messages","link.privateMessages") }}</a>
-    <a href="/?show=discuss"><i data-icon="ei-bell" data-size="s"></i>{{ i18n("messages","link.discuss") }}</a>
-    {% endif %}
     {% if visitor is not empty and visitor.uid == user.uid and false %}
     <a href="/?show=mycomments" rel="nofollow">{{ i18n("messages","blog.comments") }}</a>
     <a href="/?show=unanswered" rel="nofollow">Неотвеченные</a>
     {% endif %}
     {% if visitor is not empty and visitor.uid == user.uid %}
 
-        <a href="/settings" rel="nofollow">
-            <i data-icon="ei-gear" data-size="s"></i>{{ i18n("messages","link.settings") }}
-            {% if not visitor.verified %}
-            <span style="color:red;"><i data-icon="ei-exclamation" data-size="s"></i></span>
-            {% endif %}
-        </a>
+    <a href="/settings" rel="nofollow">
+        <i data-icon="ei-gear" data-size="s"></i>
+        <span class="desktop">{{ i18n("messages","link.settings") }}</span>
+        {% if not visitor.verified %}
+        <span style="color:red;"><i data-icon="ei-exclamation" data-size="s"></i></span>
+        {% endif %}
+    </a>
     {% endif %}
 </div>
-<form action="/{{ user.name }}/">
-    <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}"/></p>
+<form action="/{{ user.name }}/" class="desktop" style="padding: 6px;">
+    <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}" /></p>
 </form>
-{% include "views/partial/usertags" %}
-<div id="ustats">
+<span class="desktop" style="padding: 6px;">
+    {% include "views/partial/usertags" %}
+</span>
+<div id="ustats" class="desktop" style="padding: 6px;">
     <ul>
         <li><a href="/{{ user.name }}/friends">{{ i18n("messages","blog.iread") }}: {{ statsIRead }}</a></li>
         <li><a href="/{{ user.name }}/readers">{{ i18n("messages","blog.readers") }}: {{ statsMyReaders }}</a></li>
@@ -68,12 +77,15 @@
     <div class="iread">
         {% for u in iread %}
         <span>
-                <a href="/{{ u.name }}/">
-                    <img src="//i.juick.com/as/{{ u.uid }}.png" alt="{{ u.name }}"/>
-                </a>
-            </span>
+            <a href="/{{ u.name }}/">
+                <img src="//i.juick.com/as/{{ u.uid }}.png" alt="{{ u.name }}" />
+            </a>
+        </span>
         {% endfor %}
     </div>
     {% endif %}
 
 </div>
+<span class="desktop">
+    {% include "views/partial/footer" %}
+</span>
\ No newline at end of file