From b1e6f250e1c9d69f80899e4b877f40ccf8a214df Mon Sep 17 00:00:00 2001 From: Killy Date: Wed, 27 Dec 2017 16:15:57 +0300 Subject: www: responsive layout (2) --- juick-www/src/main/webapp/WEB-INF/views/index.html | 2 - .../webapp/WEB-INF/views/partial/homecolumn.html | 38 ++++++++++- .../webapp/WEB-INF/views/partial/navigation.html | 79 +++++++++++----------- .../webapp/WEB-INF/views/partial/tagcolumn.html | 8 +++ .../webapp/WEB-INF/views/partial/usercolumn.html | 49 ++++++++++---- 5 files changed, 118 insertions(+), 58 deletions(-) (limited to 'juick-www/src/main/webapp/WEB-INF') 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..ccab381b 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -14,8 +14,6 @@ {% block "column" %} {% if tag | default('') is not empty %} {% include "views/partial/tagcolumn" %} -{% elseif visitor.uid > 0 %} -{% include "views/partial/usercolumn" %} {% 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..50f7e725 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,6 +1,40 @@ -

+

+

{{ title }}

+
+
+
+ +
+
+

+ +

+
+
{% include "views/partial/tags" %} {% if showAdv | default(false) %} конструктор сайтов {% endif %} -

\ No newline at end of file +
\ No newline at end of file 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 ff845ce9..5056b3f3 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,50 +1,51 @@
- + - - -
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html index 3e61d3d3..16eadc1b 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html @@ -1,6 +1,7 @@

*{{ tag.name }}

+
{% if visitor is not empty and visitor.uid > 0 %} + {% endif %} 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 0906218a..27cde3a3 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 @@ -4,6 +4,7 @@
+
{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} -{% else %} -
{% endif %}
-

+

+
{% include "views/partial/usertags" %} +

- {% if iread is not empty %}
{% for u in iread %} @@ -74,5 +94,4 @@ {% endfor %}
{% endif %} -
-- cgit v1.2.3