aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'juick-www/src/main')
-rw-r--r--juick-www/src/main/static/style.css11
-rw-r--r--juick-www/src/main/webapp/WEB-INF/layouts/content.html20
-rw-r--r--juick-www/src/main/webapp/WEB-INF/layouts/default.html21
-rw-r--r--juick-www/src/main/webapp/WEB-INF/layouts/minimal.html10
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/404.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/blog.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/blog_tags.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/help.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/index.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/pm_sent.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/post.html4
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/post_success.html4
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_about.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_main.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_password.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_result.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/signup.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/thread.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/users.html2
22 files changed, 60 insertions, 42 deletions
diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css
index 639174c3..ce80e650 100644
--- a/juick-www/src/main/static/style.css
+++ b/juick-www/src/main/static/style.css
@@ -86,6 +86,11 @@ html {
margin: 12px 0 0 0;
width: 728px;
}
+#minimal_content {
+ margin: 0 auto;
+ min-width: 310px;
+ width: auto;
+}
body > header {
box-shadow: 0 0 3px rgba(0, 0, 0, 0.28);
background: #fff;
@@ -263,10 +268,12 @@ body > header {
/* #endregion */
/* #region main content */
-
#content > p,
#content > h1,
-#content > h2 {
+#content > h2,
+#minimal_content > p,
+#minimal_content > h1,
+#minimal_content > h2 {
margin: 1em 0;
}
.page {
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 @@
</script>
</head>
<body id="body" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}"{% endif %}>
-{% include "views/partial/navigation" %}
-<div id="wrapper">
- {% if visitor.uid == 0 %}
- <div class="page">
- <p>{{ i18n("messages","message.loginForSending", "/login") | raw }}.</p>
- </div>
- {% endif %}
-<section id="content"
- {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}"{% endif %}>
- {% block content %}
- {% endblock %}
-</section>
-<aside id="column">
- {% block column %}
- {% endblock %}
-</aside>
-</div>
-{% include "views/partial/footer" %}
+{% block body %}
+{% endblock %}
</body>
</html>
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" %}
+<div id="wrapper">
+ {% if visitor.uid == 0 %}
+ <div class="page">
+ <p>{{ i18n("messages","message.loginForSending", "/login") | raw }}.</p>
+ </div>
+ {% endif %}
+ <section id="content"
+ {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}"{% endif %}>
+ {% block content %}
+ {% endblock %}
+ </section>
+ <aside id="column">
+ {% block column %}
+ {% endblock %}
+ </aside>
+</div>
+{% 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 %}
+<div id="wrapper">
+ <section id="minimal_content">
+ {% block content %}
+ {% endblock %}
+ </section>
+</div>
+{% 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 %}
<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">