From 5ed39dda637059d56f6d8c501880ec9bca7b2fee Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 7 Feb 2018 12:49:00 +0300 Subject: www: hide navigation in post --- .../src/main/webapp/WEB-INF/layouts/content.html | 20 ++------------------ .../src/main/webapp/WEB-INF/layouts/default.html | 21 +++++++++++++++++++++ .../src/main/webapp/WEB-INF/layouts/minimal.html | 10 ++++++++++ juick-www/src/main/webapp/WEB-INF/views/404.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/blog.html | 2 +- .../src/main/webapp/WEB-INF/views/blog_tags.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/help.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/index.html | 2 +- .../src/main/webapp/WEB-INF/views/pm_inbox.html | 2 +- .../src/main/webapp/WEB-INF/views/pm_sent.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/post.html | 4 +--- .../src/main/webapp/WEB-INF/views/post_success.html | 4 +--- .../main/webapp/WEB-INF/views/settings_about.html | 2 +- .../webapp/WEB-INF/views/settings_auth-email.html | 2 +- .../main/webapp/WEB-INF/views/settings_main.html | 2 +- .../webapp/WEB-INF/views/settings_password.html | 2 +- .../main/webapp/WEB-INF/views/settings_privacy.html | 2 +- .../main/webapp/WEB-INF/views/settings_result.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/signup.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/thread.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/users.html | 2 +- 21 files changed, 51 insertions(+), 40 deletions(-) create mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/default.html create mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/minimal.html (limited to 'juick-www/src/main/webapp') diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html index f4ca0d84..4c283116 100644 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ b/juick-www/src/main/webapp/WEB-INF/layouts/content.html @@ -44,23 +44,7 @@ 0 %}data-hash="{{visitor.authHash}}"{% endif %}> -{% include "views/partial/navigation" %} -
- {% if visitor.uid == 0 %} -
-

{{ i18n("messages","message.loginForSending", "/login") | raw }}.

-
- {% endif %} -
- {% block content %} - {% endblock %} -
- -
-{% include "views/partial/footer" %} +{% block body %} +{% endblock %} diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/default.html b/juick-www/src/main/webapp/WEB-INF/layouts/default.html new file mode 100644 index 00000000..f056322f --- /dev/null +++ b/juick-www/src/main/webapp/WEB-INF/layouts/default.html @@ -0,0 +1,21 @@ +{% extends "layouts/content" %} +{% block body %} +{% include "views/partial/navigation" %} +
+ {% if visitor.uid == 0 %} +
+

{{ i18n("messages","message.loginForSending", "/login") | raw }}.

+
+ {% endif %} +
+ {% block content %} + {% endblock %} +
+ +
+{% include "views/partial/footer" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/minimal.html b/juick-www/src/main/webapp/WEB-INF/layouts/minimal.html new file mode 100644 index 00000000..15924521 --- /dev/null +++ b/juick-www/src/main/webapp/WEB-INF/layouts/minimal.html @@ -0,0 +1,10 @@ +{% extends "layouts/content" %} +{% block body %} +
+
+ {% block content %} + {% endblock %} +
+
+{% include "views/partial/footer" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/404.html b/juick-www/src/main/webapp/WEB-INF/views/404.html index 21f42d75..02a790e6 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/404.html +++ b/juick-www/src/main/webapp/WEB-INF/views/404.html @@ -1,4 +1,4 @@ -{% extends "layouts/content" %} +{% extends "layouts/default" %} {% block content %}

Страница не найдена

diff --git a/juick-www/src/main/webapp/WEB-INF/views/blog.html b/juick-www/src/main/webapp/WEB-INF/views/blog.html index 29b636dd..9cf4714e 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/blog.html +++ b/juick-www/src/main/webapp/WEB-INF/views/blog.html @@ -1,4 +1,4 @@ -{% extends "layouts/content" %} +{% extends "layouts/default" %} {% import "views/macros/tags" %} {% block content %} {% if noindex %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/blog_tags.html b/juick-www/src/main/webapp/WEB-INF/views/blog_tags.html index 51c91e30..48e517eb 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/blog_tags.html +++ b/juick-www/src/main/webapp/WEB-INF/views/blog_tags.html @@ -1,4 +1,4 @@ -{% extends "layouts/content" %} +{% extends "layouts/default" %} {% import "views/macros/tags" %} {% block content %}

diff --git a/juick-www/src/main/webapp/WEB-INF/views/help.html b/juick-www/src/main/webapp/WEB-INF/views/help.html index a4b76676..3a022497 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/help.html +++ b/juick-www/src/main/webapp/WEB-INF/views/help.html @@ -1,4 +1,4 @@ -{% extends "layouts/content" %} +{% extends "layouts/default" %} {% block content %}

{{ content | raw }} 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..97d726de 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -1,4 +1,4 @@ -{% extends "layouts/content" %} +{% extends "layouts/default" %} {% import "views/macros/tags" %} {% block content %} {% if noindex %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html index b2f9abda..d6a9b65f 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html +++ b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html @@ -1,4 +1,4 @@ -{% extends "layouts/content" %} +{% extends "layouts/default" %} {% block content %} {% if not msgs.isEmpty() %}