www: hide navigation in post

18 files changed, 18 insertions, 22 deletions

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 %}
     <article>
         <h1>Страница не найдена</h1>
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 %}
 <p>
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 %}
 <article>
     {{ 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() %}
 <ul id="private-messages">
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
index ee9c5b1c..bc42c4ab 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <form action="/pm/send" method="POST" enctype="multipart/form-data">
     <div class="newpm">
diff --git a/juick-www/src/main/webapp/WEB-INF/views/post.html b/juick-www/src/main/webapp/WEB-INF/views/post.html
index a553666a..1f642ce1 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/post.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/post.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/minimal" %}
 {% import "views/macros/tags" %}
 {% block content %}
 <article>
@@ -16,6 +16,4 @@
 </article>
 <p style="text-align: left"><b>Теги:</b></p>
 {{ tags(visitor.name, tags) }}
-{% endblock %}
-{% block "column" %}
 {% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/post_success.html b/juick-www/src/main/webapp/WEB-INF/views/post_success.html
index 8b62c148..2106f3cb 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/post_success.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/post_success.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/minimal" %}
 {% block content %}
 <h1>Сообщение опубликовано</h1>
 <p>Поделитесь своим новым постом в социальных сетях:</p>
@@ -16,6 +16,4 @@
        class="sharenew"><i data-icon="ei-sc-facebook" data-size="m"></i>Отправить в Facebook</a></p>
 {% endif %}
 <p>Ссылка на сообщение: <a href="{{ url | raw }}">{{ url }}</a></p>
-{% endblock %}
-{% block "column" %}
 {% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_about.html b/juick-www/src/main/webapp/WEB-INF/views/settings_about.html
index 04f82b58..bbf9e772 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_about.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_about.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <article>
     <form action="/settings" method="POST" enctype="multipart/form-data">
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html b/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html
index e7ed985a..e906d704 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <article>
     <p>{{ result }}</p><p><a href="/settings">Settings</a>.</p>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
index dddf63bb..ef46542d 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <article>
     <h1>Настройки</h1>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_password.html b/juick-www/src/main/webapp/WEB-INF/views/settings_password.html
index d7883546..aba0b139 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_password.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_password.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <article>
     <fieldset>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html b/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html
index 29ed5e95..83b87b93 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <article>
     <p>Privacy</p>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_result.html b/juick-www/src/main/webapp/WEB-INF/views/settings_result.html
index 88a52938..d87a5ea6 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_result.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_result.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <article>
     <p>{{ result | raw }}</p>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/signup.html b/juick-www/src/main/webapp/WEB-INF/views/signup.html
index e454f7dd..44fd366f 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/signup.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/signup.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% block content %}
 <h1 class="signup-h1">
     {% if type | slice(0, 1) == 'f' %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/thread.html b/juick-www/src/main/webapp/WEB-INF/views/thread.html
index 558a9d30..2115f442 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/thread.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/thread.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% import "views/macros/tags" %}
 {% block content %}
 <ul id="0">
diff --git a/juick-www/src/main/webapp/WEB-INF/views/users.html b/juick-www/src/main/webapp/WEB-INF/views/users.html
index 0f66da54..702ba6b9 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/users.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/users.html
@@ -1,4 +1,4 @@
-{% extends "layouts/content" %}
+{% extends "layouts/default" %}
 {% import "views/macros/tags" %}
 {% block content %}
 <div class="users">