From f216eaa143febe357fb901f4e568e3f0a54cc7ce Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 14 Apr 2020 16:10:49 +0300 Subject: Initial grid layout --- src/main/resources/help | 2 +- src/main/resources/templates/layouts/default.html | 73 ++++++++------- src/main/resources/templates/views/help.html | 2 + .../resources/templates/views/partial/footer.html | 16 ++-- .../templates/views/partial/homecolumn.html | 16 +++- .../templates/views/partial/navigation.html | 14 +-- .../templates/views/partial/settings_tabs.html | 5 +- .../templates/views/partial/tagcolumn.html | 3 + .../templates/views/partial/usercolumn.html | 104 ++++++++++++--------- 9 files changed, 132 insertions(+), 103 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/help b/src/main/resources/help index ce103cd9..eb9734e2 160000 --- a/src/main/resources/help +++ b/src/main/resources/help @@ -1 +1 @@ -Subproject commit ce103cd9a2a8a200c6ebb3b41525e7c8f639d98c +Subproject commit eb9734e24867c70a9cf7309786ebc1db058bea37 diff --git a/src/main/resources/templates/layouts/default.html b/src/main/resources/templates/layouts/default.html index 575e7707..5974e19b 100644 --- a/src/main/resources/templates/layouts/default.html +++ b/src/main/resources/templates/layouts/default.html @@ -1,49 +1,52 @@ + - - + + - + {% block headers %} {{ headers | default('') | raw }} {% endblock %} {{ title | default('Juick') }} - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - 0 %}data-hash="{{visitor.authHash}}"{% endif %}> -{% include "views/partial/navigation" %} -
-
- {% block content %} - {% endblock %} -
- -
-{% include "views/partial/footer" %} + + 0 %}data-hash="{{visitor.authHash}}" {% endif %}> +
+ {% include "views/partial/navigation" %} +
+
+ {% block content %} + {% endblock %} +
+ +
+
+ \ No newline at end of file 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" %} +
{{ navigation | raw }} +
{% 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 @@ 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 @@ {{ i18n("messages","link.settings.about") }} {{ i18n("messages","link.logout") }} - \ No newline at end of file + + + {% include "views/partial/footer" %} + \ 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 %} {% endif %} + + {% include "views/partial/footer" %} + \ 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 %} -
- - {{ user.name }} - -
- {% if isSubscribed %} - - Subscribed - - {% else %} - - Subscribe - + {% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} +
+ + {{ user.name }} + +
+
+ {% if isSubscribed %} + + Subscribed + + {% else %} + + Subscribe + + {% endif %} + {% if isInBL %} + + Unblock + + {% else %} + + Block + + {% endif %} + {% if not isInBLAny %} + + PM + + {% endif %} +
{% endif %} - {% if isInBL %} - - Unblock + {% if visitor is not empty and visitor.uid == user.uid %} + + {{ i18n("messages","link.my") }} - {% else %} - - Block + + {{ i18n("messages","link.privateMessages") }} - {% endif %} - {% if not isInBLAny %} - - PM + + {{ i18n("messages","link.discuss") }} {% endif %} -
-{% endif %} -
- {% if visitor is not empty and visitor.uid == user.uid %} - {{ i18n("messages","link.my") }} - {{ i18n("messages","link.privateMessages") }} - {{ i18n("messages","link.discuss") }} - {% endif %} {% if visitor is not empty and visitor.uid == user.uid and false %} {{ i18n("messages","blog.comments") }} Неотвеченные {% endif %} {% if visitor is not empty and visitor.uid == user.uid %} - - {{ i18n("messages","link.settings") }} - {% if not visitor.verified %} - - {% endif %} - + + + {{ i18n("messages","link.settings") }} + {% if not visitor.verified %} + + {% endif %} + {% endif %}
- -

+ +

-{% include "views/partial/usertags" %} -
+ + {% include "views/partial/usertags" %} + +
+ + {% include "views/partial/footer" %} + \ No newline at end of file -- cgit v1.2.3