From d91c5508f2172347e18ad93f6048582deda4ae02 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 26 Feb 2018 12:06:10 +0300 Subject: www: move templates to resources --- .../www/configuration/WwwServletConfiguration.java | 10 +- .../main/resources/templates/layouts/content.html | 50 +++++++ .../main/resources/templates/layouts/default.html | 16 +++ .../main/resources/templates/layouts/minimal.html | 10 ++ .../src/main/resources/templates/views/404.html | 11 ++ .../src/main/resources/templates/views/blog.html | 25 ++++ .../main/resources/templates/views/blog_tags.html | 10 ++ .../src/main/resources/templates/views/help.html | 10 ++ .../src/main/resources/templates/views/index.html | 29 ++++ .../src/main/resources/templates/views/login.html | 144 ++++++++++++++++++++ .../resources/templates/views/macros/tags.html | 5 + .../resources/templates/views/macros/tree.html | 57 ++++++++ .../resources/templates/views/partial/footer.html | 17 +++ .../templates/views/partial/homecolumn.html | 23 ++++ .../resources/templates/views/partial/message.html | 70 ++++++++++ .../templates/views/partial/navigation.html | 24 ++++ .../templates/views/partial/settings_tabs.html | 6 + .../templates/views/partial/tagcolumn.html | 33 +++++ .../resources/templates/views/partial/tags.html | 3 + .../templates/views/partial/thread_list.html | 49 +++++++ .../templates/views/partial/thread_tree.html | 2 + .../templates/views/partial/usercolumn.html | 89 ++++++++++++ .../templates/views/partial/usertags.html | 3 + .../main/resources/templates/views/pm_inbox.html | 35 +++++ .../main/resources/templates/views/pm_sent.html | 33 +++++ .../src/main/resources/templates/views/post.html | 19 +++ .../resources/templates/views/post_success.html | 19 +++ .../resources/templates/views/settings_about.html | 20 +++ .../templates/views/settings_auth-email.html | 9 ++ .../resources/templates/views/settings_main.html | 151 +++++++++++++++++++++ .../templates/views/settings_password.html | 17 +++ .../templates/views/settings_privacy.html | 9 ++ .../resources/templates/views/settings_result.html | 9 ++ .../src/main/resources/templates/views/signup.html | 41 ++++++ .../src/main/resources/templates/views/test.html | 2 + .../src/main/resources/templates/views/thread.html | 134 ++++++++++++++++++ .../src/main/resources/templates/views/users.html | 17 +++ .../src/main/webapp/WEB-INF/layouts/content.html | 50 ------- .../src/main/webapp/WEB-INF/layouts/default.html | 16 --- .../src/main/webapp/WEB-INF/layouts/minimal.html | 10 -- juick-www/src/main/webapp/WEB-INF/views/404.html | 11 -- juick-www/src/main/webapp/WEB-INF/views/blog.html | 25 ---- .../src/main/webapp/WEB-INF/views/blog_tags.html | 10 -- juick-www/src/main/webapp/WEB-INF/views/help.html | 10 -- juick-www/src/main/webapp/WEB-INF/views/index.html | 29 ---- juick-www/src/main/webapp/WEB-INF/views/login.html | 144 -------------------- .../src/main/webapp/WEB-INF/views/macros/tags.html | 5 - .../src/main/webapp/WEB-INF/views/macros/tree.html | 57 -------- .../main/webapp/WEB-INF/views/partial/footer.html | 17 --- .../webapp/WEB-INF/views/partial/homecolumn.html | 23 ---- .../main/webapp/WEB-INF/views/partial/message.html | 70 ---------- .../webapp/WEB-INF/views/partial/navigation.html | 24 ---- .../WEB-INF/views/partial/settings_tabs.html | 6 - .../webapp/WEB-INF/views/partial/tagcolumn.html | 33 ----- .../main/webapp/WEB-INF/views/partial/tags.html | 3 - .../webapp/WEB-INF/views/partial/thread_list.html | 49 ------- .../webapp/WEB-INF/views/partial/thread_tree.html | 2 - .../webapp/WEB-INF/views/partial/usercolumn.html | 89 ------------ .../webapp/WEB-INF/views/partial/usertags.html | 3 - .../src/main/webapp/WEB-INF/views/pm_inbox.html | 35 ----- .../src/main/webapp/WEB-INF/views/pm_sent.html | 33 ----- juick-www/src/main/webapp/WEB-INF/views/post.html | 19 --- .../main/webapp/WEB-INF/views/post_success.html | 19 --- .../main/webapp/WEB-INF/views/settings_about.html | 20 --- .../webapp/WEB-INF/views/settings_auth-email.html | 9 -- .../main/webapp/WEB-INF/views/settings_main.html | 151 --------------------- .../webapp/WEB-INF/views/settings_password.html | 17 --- .../webapp/WEB-INF/views/settings_privacy.html | 9 -- .../main/webapp/WEB-INF/views/settings_result.html | 9 -- .../src/main/webapp/WEB-INF/views/signup.html | 41 ------ juick-www/src/main/webapp/WEB-INF/views/test.html | 2 - .../src/main/webapp/WEB-INF/views/thread.html | 134 ------------------ juick-www/src/main/webapp/WEB-INF/views/users.html | 17 --- 73 files changed, 1205 insertions(+), 1207 deletions(-) create mode 100644 juick-www/src/main/resources/templates/layouts/content.html create mode 100644 juick-www/src/main/resources/templates/layouts/default.html create mode 100644 juick-www/src/main/resources/templates/layouts/minimal.html create mode 100644 juick-www/src/main/resources/templates/views/404.html create mode 100644 juick-www/src/main/resources/templates/views/blog.html create mode 100644 juick-www/src/main/resources/templates/views/blog_tags.html create mode 100644 juick-www/src/main/resources/templates/views/help.html create mode 100644 juick-www/src/main/resources/templates/views/index.html create mode 100644 juick-www/src/main/resources/templates/views/login.html create mode 100644 juick-www/src/main/resources/templates/views/macros/tags.html create mode 100644 juick-www/src/main/resources/templates/views/macros/tree.html create mode 100644 juick-www/src/main/resources/templates/views/partial/footer.html create mode 100644 juick-www/src/main/resources/templates/views/partial/homecolumn.html create mode 100644 juick-www/src/main/resources/templates/views/partial/message.html create mode 100644 juick-www/src/main/resources/templates/views/partial/navigation.html create mode 100644 juick-www/src/main/resources/templates/views/partial/settings_tabs.html create mode 100644 juick-www/src/main/resources/templates/views/partial/tagcolumn.html create mode 100644 juick-www/src/main/resources/templates/views/partial/tags.html create mode 100644 juick-www/src/main/resources/templates/views/partial/thread_list.html create mode 100644 juick-www/src/main/resources/templates/views/partial/thread_tree.html create mode 100644 juick-www/src/main/resources/templates/views/partial/usercolumn.html create mode 100644 juick-www/src/main/resources/templates/views/partial/usertags.html create mode 100644 juick-www/src/main/resources/templates/views/pm_inbox.html create mode 100644 juick-www/src/main/resources/templates/views/pm_sent.html create mode 100644 juick-www/src/main/resources/templates/views/post.html create mode 100644 juick-www/src/main/resources/templates/views/post_success.html create mode 100644 juick-www/src/main/resources/templates/views/settings_about.html create mode 100644 juick-www/src/main/resources/templates/views/settings_auth-email.html create mode 100644 juick-www/src/main/resources/templates/views/settings_main.html create mode 100644 juick-www/src/main/resources/templates/views/settings_password.html create mode 100644 juick-www/src/main/resources/templates/views/settings_privacy.html create mode 100644 juick-www/src/main/resources/templates/views/settings_result.html create mode 100644 juick-www/src/main/resources/templates/views/signup.html create mode 100644 juick-www/src/main/resources/templates/views/test.html create mode 100644 juick-www/src/main/resources/templates/views/thread.html create mode 100644 juick-www/src/main/resources/templates/views/users.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/content.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/default.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/minimal.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/404.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/blog.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/blog_tags.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/help.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/index.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/login.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/macros/tags.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/macros/tree.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/footer.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/message.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/tags.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/thread_tree.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/pm_sent.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/post.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/post_success.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_about.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_main.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_password.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_result.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/signup.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/test.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/thread.html delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/users.html (limited to 'juick-www') diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java index 60a3b9cc..1654f2ac 100644 --- a/juick-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java +++ b/juick-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java @@ -20,6 +20,7 @@ package com.juick.www.configuration; import com.juick.server.configuration.BaseWebConfiguration; import com.mitchellbosecke.pebble.PebbleEngine; import com.mitchellbosecke.pebble.extension.FormatterExtension; +import com.mitchellbosecke.pebble.loader.ClasspathLoader; import com.mitchellbosecke.pebble.loader.Loader; import com.mitchellbosecke.pebble.loader.ServletLoader; import com.mitchellbosecke.pebble.spring4.PebbleViewResolver; @@ -71,12 +72,9 @@ public class WwwServletConfiguration extends BaseWebConfiguration { configurer.enable(); } - @Inject - private ServletContext servletContext; - @Bean - public Loader templateLoader(){ - return new ServletLoader(servletContext); + public Loader templateLoader() { + return new ClasspathLoader(); } @Bean @@ -97,7 +95,7 @@ public class WwwServletConfiguration extends BaseWebConfiguration { @Bean public ViewResolver viewResolver() { PebbleViewResolver viewResolver = new PebbleViewResolver(); - viewResolver.setPrefix("/WEB-INF/"); + viewResolver.setPrefix("templates"); viewResolver.setSuffix(".html"); viewResolver.setPebbleEngine(pebbleEngine()); viewResolver.setCharacterEncoding(CharEncoding.UTF_8); diff --git a/juick-www/src/main/resources/templates/layouts/content.html b/juick-www/src/main/resources/templates/layouts/content.html new file mode 100644 index 00000000..4c283116 --- /dev/null +++ b/juick-www/src/main/resources/templates/layouts/content.html @@ -0,0 +1,50 @@ + + + + + + + + {% block headers %} + {{ headers | default('') | raw }} + {% endblock %} + {{ title | default('Juick') }} + + + + + + + + + + + + + + + + + + + + + + + + + + 0 %}data-hash="{{visitor.authHash}}"{% endif %}> +{% block body %} +{% endblock %} + + diff --git a/juick-www/src/main/resources/templates/layouts/default.html b/juick-www/src/main/resources/templates/layouts/default.html new file mode 100644 index 00000000..343885c4 --- /dev/null +++ b/juick-www/src/main/resources/templates/layouts/default.html @@ -0,0 +1,16 @@ +{% extends "layouts/content" %} +{% block body %} +{% include "views/partial/navigation" %} +
+
+ {% block content %} + {% endblock %} +
+ +
+{% include "views/partial/footer" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/layouts/minimal.html b/juick-www/src/main/resources/templates/layouts/minimal.html new file mode 100644 index 00000000..15924521 --- /dev/null +++ b/juick-www/src/main/resources/templates/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/resources/templates/views/404.html b/juick-www/src/main/resources/templates/views/404.html new file mode 100644 index 00000000..02a790e6 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/404.html @@ -0,0 +1,11 @@ +{% extends "layouts/default" %} +{% block content %} +
+

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

+

Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.

+
+{% endblock %} + +{% block "column" %} +{% include "views/partial/homecolumn" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/blog.html b/juick-www/src/main/resources/templates/views/blog.html new file mode 100644 index 00000000..9cf4714e --- /dev/null +++ b/juick-www/src/main/resources/templates/views/blog.html @@ -0,0 +1,25 @@ +{% extends "layouts/default" %} +{% import "views/macros/tags" %} +{% block content %} +{% if noindex %} + +{% endif %} +{% if paramTag | default('') is not empty %} +

← {{ i18n("messages","blog.allPostsWithTag") }} {{ paramTag.name | escape }}

+{% endif %} +
+ +{% for msg in msgs %} +{% include "views/partial/message" %} +{% endfor %} +
+{% if nextpage | default('') is not empty %} +

+{% endif %} +{% endblock %} +{% block "column" %} +{% include "views/partial/usercolumn" %} +{% if noindex %} + +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/blog_tags.html b/juick-www/src/main/resources/templates/views/blog_tags.html new file mode 100644 index 00000000..48e517eb --- /dev/null +++ b/juick-www/src/main/resources/templates/views/blog_tags.html @@ -0,0 +1,10 @@ +{% extends "layouts/default" %} +{% import "views/macros/tags" %} +{% block content %} +

+ {{ tags(user.name, tags) }} +

+{% endblock %} +{% block "column" %} +{% include "views/partial/usercolumn" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/help.html b/juick-www/src/main/resources/templates/views/help.html new file mode 100644 index 00000000..3a022497 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/help.html @@ -0,0 +1,10 @@ +{% extends "layouts/default" %} +{% block content %} +
+ {{ content | raw }} +
+{% endblock %} + +{% block "column" %} +{{ navigation | raw }} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/index.html b/juick-www/src/main/resources/templates/views/index.html new file mode 100644 index 00000000..97d726de --- /dev/null +++ b/juick-www/src/main/resources/templates/views/index.html @@ -0,0 +1,29 @@ +{% extends "layouts/default" %} +{% import "views/macros/tags" %} +{% block content %} +{% if noindex %} + +{% endif %} +{% for msg in msgs %} +{% include "views/partial/message" %} +{% endfor %} +{% if nextpage | default('') is not empty %} +

+{% endif %} +{% endblock %} +{% block "column" %} +{% if tag | default('') is not empty %} +{% include "views/partial/tagcolumn" %} +{% elseif visitor.uid > 0 %} +{% if discover %} +{% include "views/partial/homecolumn" %} +{% else %} +{% include "views/partial/usercolumn" %} +{% endif %} +{% else %} +{% include "views/partial/homecolumn" %} +{% endif %} +{% if noindex %} + +{% endif %} +{% endblock %} diff --git a/juick-www/src/main/resources/templates/views/login.html b/juick-www/src/main/resources/templates/views/login.html new file mode 100644 index 00000000..a538cb26 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/login.html @@ -0,0 +1,144 @@ + + + + Juick + + + + + + + + + +
juick.com © 2008-2018   Контакты · Помощь
+ +
+ {{ i18n("messages","label.register") }}: +
Facebook
+
ВКонтакте
+
+ +
+
+
+ + {{ i18n("messages","question.areRegistered") }} + +
+ + + +
+
+ + + diff --git a/juick-www/src/main/resources/templates/views/macros/tags.html b/juick-www/src/main/resources/templates/views/macros/tags.html new file mode 100644 index 00000000..09278ffe --- /dev/null +++ b/juick-www/src/main/resources/templates/views/macros/tags.html @@ -0,0 +1,5 @@ +{% macro tags(uname="", tagsList) %} +{% for tag in tagsList %} +{{ tag | raw }} +{% endfor %} +{% endmacro %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/macros/tree.html b/juick-www/src/main/resources/templates/views/macros/tree.html new file mode 100644 index 00000000..71ffd74b --- /dev/null +++ b/juick-www/src/main/resources/templates/views/macros/tree.html @@ -0,0 +1,57 @@ +{% macro tree(replies, visitor, level, margin, hidden) %} +{% for msg in replies %} + {% if msg.replyto == level %} +
  • +
    +
    +{% if not msg.user.banned %} + {{ msg.user.name }} +
    + {{ msg.user.name }} +
    +{% else %} + [удалено]: +
    + +
    +{% endif %} + +
    +
    {{ msg | formatMessage }}
    + {% if msg.AttachmentType is not empty %} +
    + + + +
    + {% endif %} + +
    +{% elseif visitor.uid == 0 %} + ·
    +{% endif %} + +{% if level == 0 and msg.childsCount > 1 and replies.size() > 10 %} +
    {{ msg | formatReplies }}
    +{% endif %} +
  • + {% if (level == 0 and msg.childsCount > 1 and replies.size() > 10) %} + {{ tree(msg.childs, visitor, msg.rid, margin + 20, true) }} + {% elseif (msg.childsCount > 0) %} + {{ tree(msg.childs, visitor, msg.rid, margin + 20, hidden) }} + {% endif %} + {% endif %} +{% endfor %} +{% endmacro %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/footer.html b/juick-www/src/main/resources/templates/views/partial/footer.html new file mode 100644 index 00000000..87744183 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/footer.html @@ -0,0 +1,17 @@ + diff --git a/juick-www/src/main/resources/templates/views/partial/homecolumn.html b/juick-www/src/main/resources/templates/views/partial/homecolumn.html new file mode 100644 index 00000000..6142e9e9 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/homecolumn.html @@ -0,0 +1,23 @@ + +

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

    \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/message.html b/juick-www/src/main/resources/templates/views/partial/message.html new file mode 100644 index 00000000..9e3ede6c --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/message.html @@ -0,0 +1,70 @@ +
    +
    + +
    + {{ msg.user.name }} +
    + +
    + {{ tags(msg.user.name, msg.tags | tagsList) }} +
    +
    +

    {{ msg | formatMessage }}

    + {% if msg.AttachmentType is not empty %} +

    + +

    + {% endif %} + +
    \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/navigation.html b/juick-www/src/main/resources/templates/views/partial/navigation.html new file mode 100644 index 00000000..7afabcc3 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/navigation.html @@ -0,0 +1,24 @@ +
    +
    + + + +
    +
    diff --git a/juick-www/src/main/resources/templates/views/partial/settings_tabs.html b/juick-www/src/main/resources/templates/views/partial/settings_tabs.html new file mode 100644 index 00000000..4715253e --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/settings_tabs.html @@ -0,0 +1,6 @@ +
    \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/tagcolumn.html b/juick-www/src/main/resources/templates/views/partial/tagcolumn.html new file mode 100644 index 00000000..3e61d3d3 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/tagcolumn.html @@ -0,0 +1,33 @@ +
    +

    *{{ tag.name }}

    +
    +{% if visitor is not empty and visitor.uid > 0 %} + +{% endif %} diff --git a/juick-www/src/main/resources/templates/views/partial/tags.html b/juick-www/src/main/resources/templates/views/partial/tags.html new file mode 100644 index 00000000..3235213e --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/tags.html @@ -0,0 +1,3 @@ +{% for tag in tags %} + {{ tag | raw }} +{% endfor %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/thread_list.html b/juick-www/src/main/resources/templates/views/partial/thread_list.html new file mode 100644 index 00000000..f273dec7 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/thread_list.html @@ -0,0 +1,49 @@ +{% for msg in replies %} +
  • +
    +
    + {% if not msg.user.banned %} + {{ msg.user.name }} +
    + {{ msg.user.name }} +
    + {% else %} + [удалено]: +
    + +
    + {% endif %} + +
    +
    {{ msg | formatMessage }}
    + {% if msg.AttachmentType is not empty %} +
    + + + +
    + {% endif %} + +
    + {% elseif visitor.uid == 0 %} + · +
    + {% else %} + + {% endif %} + +
  • +{% endfor %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/thread_tree.html b/juick-www/src/main/resources/templates/views/partial/thread_tree.html new file mode 100644 index 00000000..f207b8e0 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/thread_tree.html @@ -0,0 +1,2 @@ +{% import "views/macros/tree" %} +{{ tree(replies, visitor, 0, 0, false) }} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/partial/usercolumn.html b/juick-www/src/main/resources/templates/views/partial/usercolumn.html new file mode 100644 index 00000000..382c3622 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/usercolumn.html @@ -0,0 +1,89 @@ +
    + + {{ user.name }} + +
    +{% 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 %} + + + {{ u.name }} + + + {% endfor %} +
    + {% endif %} + +
    diff --git a/juick-www/src/main/resources/templates/views/partial/usertags.html b/juick-www/src/main/resources/templates/views/partial/usertags.html new file mode 100644 index 00000000..71d1303e --- /dev/null +++ b/juick-www/src/main/resources/templates/views/partial/usertags.html @@ -0,0 +1,3 @@ +{% import "views/macros/tags" %} +{{ tags(user.name, tagStats) }} +... \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/pm_inbox.html b/juick-www/src/main/resources/templates/views/pm_inbox.html new file mode 100644 index 00000000..d6a9b65f --- /dev/null +++ b/juick-www/src/main/resources/templates/views/pm_inbox.html @@ -0,0 +1,35 @@ +{% extends "layouts/default" %} +{% block content %} +{% if not msgs.isEmpty() %} + +{% endif %} +{% endblock %} +{% block "column" %} +{% include "views/partial/usercolumn" %} +{% endblock %} diff --git a/juick-www/src/main/resources/templates/views/pm_sent.html b/juick-www/src/main/resources/templates/views/pm_sent.html new file mode 100644 index 00000000..bc42c4ab --- /dev/null +++ b/juick-www/src/main/resources/templates/views/pm_sent.html @@ -0,0 +1,33 @@ +{% extends "layouts/default" %} +{% block content %} +
    +
    +
    To:
    +
    +
    +
    +
    +{% if not msgs.isEmpty() %} + +{% endif %} +{% endblock %} +{% block "column" %} +{% include "views/partial/usercolumn" %} +{% endblock %} diff --git a/juick-www/src/main/resources/templates/views/post.html b/juick-www/src/main/resources/templates/views/post.html new file mode 100644 index 00000000..1f642ce1 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/post.html @@ -0,0 +1,19 @@ +{% extends "layouts/minimal" %} +{% import "views/macros/tags" %} +{% block content %} +
    +
    +

    + Фото: + ({{ i18n("messages","postForm.imageFormats") }}) +

    +

    + +
    + +

    +
    +
    +

    Теги:

    +{{ tags(visitor.name, tags) }} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/post_success.html b/juick-www/src/main/resources/templates/views/post_success.html new file mode 100644 index 00000000..2106f3cb --- /dev/null +++ b/juick-www/src/main/resources/templates/views/post_success.html @@ -0,0 +1,19 @@ +{% extends "layouts/minimal" %} +{% block content %} +

    Сообщение опубликовано

    +

    Поделитесь своим новым постом в социальных сетях:

    +{% if sharetwi | default('') is not empty %} +

    + Отправить в Twitter

    +{% endif %} +

    + Отправить в ВКонтакте

    +{% if facebook | default('') is not empty %} +

    + Отправить в Facebook

    +{% endif %} +

    Ссылка на сообщение: {{ url }}

    +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/settings_about.html b/juick-www/src/main/resources/templates/views/settings_about.html new file mode 100644 index 00000000..bbf9e772 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/settings_about.html @@ -0,0 +1,20 @@ +{% extends "layouts/default" %} +{% block content %} +
    +
    +

    Full name:

    +

    Country:

    +

    URL:
    + Please, start with "http://"

    +

    About:
    +
    + Max. 255 symbols

    +

    Avatar:
    + Recommendations: PNG, 96x96, <50Kb. Also, JPG and GIF supported.

    +

    +
    +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/settings_tabs" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/settings_auth-email.html b/juick-www/src/main/resources/templates/views/settings_auth-email.html new file mode 100644 index 00000000..e906d704 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/settings_auth-email.html @@ -0,0 +1,9 @@ +{% extends "layouts/default" %} +{% block content %} +
    +

    {{ result }}

    Settings.

    +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/settings_tabs" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/settings_main.html b/juick-www/src/main/resources/templates/views/settings_main.html new file mode 100644 index 00000000..ef46542d --- /dev/null +++ b/juick-www/src/main/resources/templates/views/settings_main.html @@ -0,0 +1,151 @@ +{% extends "layouts/default" %} +{% block content %} +
    +

    Настройки

    +
    +
    + Notification options +

    Reply notifications ("Message posted")

    +

    Subscriptions notifications ("@user subscribed...")

    +

    Posts recommendations ("Recommended by @user")

    +

    +
    +
    +
    + + Telegram + {% if telegram_name is not empty %} +
    +
    Telegram: {{ telegram_name }} — + + +
    +
    + {% else %} +

    To connect Telegram account: send any text message to @Juick_bot +

    + {% endif %} +
    + {% if jids | length > 0 %} +
    +
    + + XMPP accounts + +

    Your accounts:

    +

    + {% for jid in jids %} +
    + {% endfor %} + {% for auth in auths %} + + — Confirm
    + {% endfor %} +

    + {% if jids | length > 1 %} +

    + {% endif %} +

    To add new jabber account: send any text message to juick@juick.com +

    +
    +
    + {% endif %} +
    + + E-mail + +
    +

    Add account:
    + + + +

    +
    +
    +

    Your accounts:

    +

    + {% for email in emails %} +
    + {% endfor %} + {% if emails is empty %} + -

    + {% else %} +

    + {% if jids | length > 1 %} +

    + {% endif %} + {% endif %} +
    + {% if emails is not empty %} + +
    +

    You can receive notifications to email:
    + Sent to + +

    +
    + + {% endif %} +

     

    +

    You can post to Juick via e-mail. Send your plain text + messages to juick@juick.com. You can attach one photo or video file.

    +
    +
    + + Facebook + + {% if fbstatus.connected %} + {% if fbstatus.crosspostEnabled %} +
    +
    + Facebook: Enabled — + + +
    +
    + {% else %} +
    +
    + Facebook: Disabled — + + +
    +
    + {% endif %} + {% else %} +

    Cross-posting to Facebook: Connect to Facebook

    + {% endif %} +
    +
    + + Twitter + {% if twitter_name is not empty %} +
    +
    Twitter: {{ twitter_name }} — + + +
    +
    + {% else %} +

    Cross-posting to Twitter: Connect to Twitter

    + {% endif %} +
    + +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/settings_tabs" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/settings_password.html b/juick-www/src/main/resources/templates/views/settings_password.html new file mode 100644 index 00000000..aba0b139 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/settings_password.html @@ -0,0 +1,17 @@ +{% extends "layouts/default" %} +{% block content %} +
    +
    + Changing your password +
    + +

    Change password:
    + (max. length - 16 symbols)

    +
    +
    +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/settings_tabs" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/settings_privacy.html b/juick-www/src/main/resources/templates/views/settings_privacy.html new file mode 100644 index 00000000..83b87b93 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/settings_privacy.html @@ -0,0 +1,9 @@ +{% extends "layouts/default" %} +{% block content %} +
    +

    Privacy

    +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/settings_tabs" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/settings_result.html b/juick-www/src/main/resources/templates/views/settings_result.html new file mode 100644 index 00000000..d87a5ea6 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/settings_result.html @@ -0,0 +1,9 @@ +{% extends "layouts/default" %} +{% block content %} +
    +

    {{ result | raw }}

    +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/settings_tabs" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/signup.html b/juick-www/src/main/resources/templates/views/signup.html new file mode 100644 index 00000000..44fd366f --- /dev/null +++ b/juick-www/src/main/resources/templates/views/signup.html @@ -0,0 +1,41 @@ +{% extends "layouts/default" %} +{% block content %} +

    + {% if type | slice(0, 1) == 'f' %} + Facebook + {% elseif type | slice(0, 1) == 'v' %} + VKontakte + {% elseif type | slice(0, 1) == 'x' %} + XMPP + {% elseif type | slice(0, 1) == 'd' %} + Telegram + {% endif %} + {{ account | raw }}

    + +

    Связать с существующим аккаунтом Juick

    +
    + + + + {% if visitor.getUID() > 0 %} + + {% else %} +

    Имя пользователя:

    +

    Пароль:

    +

    + {% endif %} +
    + +
    + +

    Создать новый аккаунт Juick

    +
    + + + +

    Имя пользователя:
    (От 2-х до 16-и латинских символов + и/или цифр, дефис)

    +

    Пароль:
    (от 6-и до 32-х символов)

    +

    +
    +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/test.html b/juick-www/src/main/resources/templates/views/test.html new file mode 100644 index 00000000..7700be6f --- /dev/null +++ b/juick-www/src/main/resources/templates/views/test.html @@ -0,0 +1,2 @@ +{% import "views/macros/tags" %} +{{ tags("ugnich", tagsList)}} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/thread.html b/juick-www/src/main/resources/templates/views/thread.html new file mode 100644 index 00000000..2115f442 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/thread.html @@ -0,0 +1,134 @@ +{% extends "layouts/default" %} +{% import "views/macros/tags" %} +{% block content %} + +
    +
    + {% if listview %} + {{ i18n("messages","replies.showAsTree") }} + {% else %} + {% if foldable %} + {{ i18n("messages","replies.unfoldAll") }} · + {% endif %} + {{ i18n("messages","replies.showAsList") }} + {% endif %} +
    +

    {{ i18n("messages","reply.replies") }} ({{ replies.size() }})

    +
    + + +{% endblock %} +{% block "column" %} +{% include "views/partial/usercolumn" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/templates/views/users.html b/juick-www/src/main/resources/templates/views/users.html new file mode 100644 index 00000000..702ba6b9 --- /dev/null +++ b/juick-www/src/main/resources/templates/views/users.html @@ -0,0 +1,17 @@ +{% extends "layouts/default" %} +{% import "views/macros/tags" %} +{% block content %} +
    + {% for u in users %} + + + {{ u.name }} + {{ u.name }} + + + {% endfor %} +
    +{% endblock %} +{% block "column" %} +{% include "views/partial/usercolumn" %} +{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html deleted file mode 100644 index 4c283116..00000000 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - {% block headers %} - {{ headers | default('') | raw }} - {% endblock %} - {{ title | default('Juick') }} - - - - - - - - - - - - - - - - - - - - - - - - - - 0 %}data-hash="{{visitor.authHash}}"{% endif %}> -{% 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 deleted file mode 100644 index 343885c4..00000000 --- a/juick-www/src/main/webapp/WEB-INF/layouts/default.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "layouts/content" %} -{% block body %} -{% include "views/partial/navigation" %} -
    -
    - {% 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 deleted file mode 100644 index 15924521..00000000 --- a/juick-www/src/main/webapp/WEB-INF/layouts/minimal.html +++ /dev/null @@ -1,10 +0,0 @@ -{% 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 deleted file mode 100644 index 02a790e6..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/404.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -

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

    -

    Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.

    -
    -{% endblock %} - -{% block "column" %} -{% include "views/partial/homecolumn" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/blog.html b/juick-www/src/main/webapp/WEB-INF/views/blog.html deleted file mode 100644 index 9cf4714e..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/blog.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "layouts/default" %} -{% import "views/macros/tags" %} -{% block content %} -{% if noindex %} - -{% endif %} -{% if paramTag | default('') is not empty %} -

    ← {{ i18n("messages","blog.allPostsWithTag") }} {{ paramTag.name | escape }}

    -{% endif %} -
    - -{% for msg in msgs %} -{% include "views/partial/message" %} -{% endfor %} -
    -{% if nextpage | default('') is not empty %} -

    -{% endif %} -{% endblock %} -{% block "column" %} -{% include "views/partial/usercolumn" %} -{% if noindex %} - -{% endif %} -{% endblock %} \ No newline at end of file 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 deleted file mode 100644 index 48e517eb..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/blog_tags.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "layouts/default" %} -{% import "views/macros/tags" %} -{% block content %} -

    - {{ tags(user.name, tags) }} -

    -{% endblock %} -{% block "column" %} -{% include "views/partial/usercolumn" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/help.html b/juick-www/src/main/webapp/WEB-INF/views/help.html deleted file mode 100644 index 3a022497..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/help.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    - {{ content | raw }} -
    -{% endblock %} - -{% block "column" %} -{{ navigation | raw }} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html deleted file mode 100644 index 97d726de..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "layouts/default" %} -{% import "views/macros/tags" %} -{% block content %} -{% if noindex %} - -{% endif %} -{% for msg in msgs %} -{% include "views/partial/message" %} -{% endfor %} -{% if nextpage | default('') is not empty %} -

    -{% endif %} -{% endblock %} -{% block "column" %} -{% if tag | default('') is not empty %} -{% include "views/partial/tagcolumn" %} -{% elseif visitor.uid > 0 %} -{% if discover %} -{% include "views/partial/homecolumn" %} -{% else %} -{% include "views/partial/usercolumn" %} -{% endif %} -{% else %} -{% include "views/partial/homecolumn" %} -{% endif %} -{% if noindex %} - -{% endif %} -{% endblock %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/login.html b/juick-www/src/main/webapp/WEB-INF/views/login.html deleted file mode 100644 index a538cb26..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/login.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - Juick - - - - - - - - - -
    juick.com © 2008-2018   Контакты · Помощь
    - -
    - {{ i18n("messages","label.register") }}: -
    Facebook
    -
    ВКонтакте
    -
    - -
    -
    -
    - - {{ i18n("messages","question.areRegistered") }} - -
    - - - -
    -
    - - - diff --git a/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html b/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html deleted file mode 100644 index 09278ffe..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html +++ /dev/null @@ -1,5 +0,0 @@ -{% macro tags(uname="", tagsList) %} -{% for tag in tagsList %} -{{ tag | raw }} -{% endfor %} -{% endmacro %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html deleted file mode 100644 index 71ffd74b..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html +++ /dev/null @@ -1,57 +0,0 @@ -{% macro tree(replies, visitor, level, margin, hidden) %} -{% for msg in replies %} - {% if msg.replyto == level %} -
  • -
    -
    -{% if not msg.user.banned %} - {{ msg.user.name }} -
    - {{ msg.user.name }} -
    -{% else %} - [удалено]: -
    - -
    -{% endif %} - -
    -
    {{ msg | formatMessage }}
    - {% if msg.AttachmentType is not empty %} -
    - - - -
    - {% endif %} - -
    -{% elseif visitor.uid == 0 %} - ·
    -{% endif %} - -{% if level == 0 and msg.childsCount > 1 and replies.size() > 10 %} -
    {{ msg | formatReplies }}
    -{% endif %} -
  • - {% if (level == 0 and msg.childsCount > 1 and replies.size() > 10) %} - {{ tree(msg.childs, visitor, msg.rid, margin + 20, true) }} - {% elseif (msg.childsCount > 0) %} - {{ tree(msg.childs, visitor, msg.rid, margin + 20, hidden) }} - {% endif %} - {% endif %} -{% endfor %} -{% endmacro %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html deleted file mode 100644 index 87744183..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html +++ /dev/null @@ -1,17 +0,0 @@ - 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 deleted file mode 100644 index 6142e9e9..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html +++ /dev/null @@ -1,23 +0,0 @@ - -

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

    \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html deleted file mode 100644 index 9e3ede6c..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html +++ /dev/null @@ -1,70 +0,0 @@ -
    -
    - -
    - {{ msg.user.name }} -
    - -
    - {{ tags(msg.user.name, msg.tags | tagsList) }} -
    -
    -

    {{ msg | formatMessage }}

    - {% if msg.AttachmentType is not empty %} -

    - -

    - {% endif %} - -
    \ 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 deleted file mode 100644 index 7afabcc3..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html +++ /dev/null @@ -1,24 +0,0 @@ -
    -
    - - - -
    -
    diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html deleted file mode 100644 index 4715253e..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html +++ /dev/null @@ -1,6 +0,0 @@ -
    \ No newline at end of file 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 deleted file mode 100644 index 3e61d3d3..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/tagcolumn.html +++ /dev/null @@ -1,33 +0,0 @@ -
    -

    *{{ tag.name }}

    -
    -{% if visitor is not empty and visitor.uid > 0 %} - -{% endif %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/tags.html b/juick-www/src/main/webapp/WEB-INF/views/partial/tags.html deleted file mode 100644 index 3235213e..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/tags.html +++ /dev/null @@ -1,3 +0,0 @@ -{% for tag in tags %} - {{ tag | raw }} -{% endfor %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html deleted file mode 100644 index f273dec7..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html +++ /dev/null @@ -1,49 +0,0 @@ -{% for msg in replies %} -
  • -
    -
    - {% if not msg.user.banned %} - {{ msg.user.name }} -
    - {{ msg.user.name }} -
    - {% else %} - [удалено]: -
    - -
    - {% endif %} - -
    -
    {{ msg | formatMessage }}
    - {% if msg.AttachmentType is not empty %} -
    - - - -
    - {% endif %} - -
    - {% elseif visitor.uid == 0 %} - · -
    - {% else %} - - {% endif %} - -
  • -{% endfor %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_tree.html b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_tree.html deleted file mode 100644 index f207b8e0..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_tree.html +++ /dev/null @@ -1,2 +0,0 @@ -{% import "views/macros/tree" %} -{{ tree(replies, visitor, 0, 0, false) }} \ No newline at end of file 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 deleted file mode 100644 index 382c3622..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html +++ /dev/null @@ -1,89 +0,0 @@ -
    - - {{ user.name }} - -
    -{% 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 %} - - - {{ u.name }} - - - {% endfor %} -
    - {% endif %} - -
    diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html b/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html deleted file mode 100644 index 71d1303e..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html +++ /dev/null @@ -1,3 +0,0 @@ -{% import "views/macros/tags" %} -{{ tags(user.name, tagStats) }} -... \ No newline at end of file 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 deleted file mode 100644 index d6a9b65f..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -{% if not msgs.isEmpty() %} - -{% endif %} -{% endblock %} -{% block "column" %} -{% include "views/partial/usercolumn" %} -{% endblock %} 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 deleted file mode 100644 index bc42c4ab..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -
    -
    To:
    -
    -
    -
    -
    -{% if not msgs.isEmpty() %} - -{% endif %} -{% endblock %} -{% block "column" %} -{% include "views/partial/usercolumn" %} -{% endblock %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/post.html b/juick-www/src/main/webapp/WEB-INF/views/post.html deleted file mode 100644 index 1f642ce1..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/post.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "layouts/minimal" %} -{% import "views/macros/tags" %} -{% block content %} -
    -
    -

    - Фото: - ({{ i18n("messages","postForm.imageFormats") }}) -

    -

    - -
    - -

    -
    -
    -

    Теги:

    -{{ tags(visitor.name, tags) }} -{% 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 deleted file mode 100644 index 2106f3cb..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/post_success.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "layouts/minimal" %} -{% block content %} -

    Сообщение опубликовано

    -

    Поделитесь своим новым постом в социальных сетях:

    -{% if sharetwi | default('') is not empty %} -

    - Отправить в Twitter

    -{% endif %} -

    - Отправить в ВКонтакте

    -{% if facebook | default('') is not empty %} -

    - Отправить в Facebook

    -{% endif %} -

    Ссылка на сообщение: {{ url }}

    -{% 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 deleted file mode 100644 index bbf9e772..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/settings_about.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -
    -

    Full name:

    -

    Country:

    -

    URL:
    - Please, start with "http://"

    -

    About:
    -
    - Max. 255 symbols

    -

    Avatar:
    - Recommendations: PNG, 96x96, <50Kb. Also, JPG and GIF supported.

    -

    -
    -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs" %} -{% endblock %} \ No newline at end of file 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 deleted file mode 100644 index e906d704..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -

    {{ result }}

    Settings.

    -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs" %} -{% endblock %} \ No newline at end of file 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 deleted file mode 100644 index ef46542d..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html +++ /dev/null @@ -1,151 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -

    Настройки

    -
    -
    - Notification options -

    Reply notifications ("Message posted")

    -

    Subscriptions notifications ("@user subscribed...")

    -

    Posts recommendations ("Recommended by @user")

    -

    -
    -
    -
    - - Telegram - {% if telegram_name is not empty %} -
    -
    Telegram: {{ telegram_name }} — - - -
    -
    - {% else %} -

    To connect Telegram account: send any text message to @Juick_bot -

    - {% endif %} -
    - {% if jids | length > 0 %} -
    -
    - - XMPP accounts - -

    Your accounts:

    -

    - {% for jid in jids %} -
    - {% endfor %} - {% for auth in auths %} - - — Confirm
    - {% endfor %} -

    - {% if jids | length > 1 %} -

    - {% endif %} -

    To add new jabber account: send any text message to juick@juick.com -

    -
    -
    - {% endif %} -
    - - E-mail - -
    -

    Add account:
    - - - -

    -
    -
    -

    Your accounts:

    -

    - {% for email in emails %} -
    - {% endfor %} - {% if emails is empty %} - -

    - {% else %} -

    - {% if jids | length > 1 %} -

    - {% endif %} - {% endif %} -
    - {% if emails is not empty %} - -
    -

    You can receive notifications to email:
    - Sent to - -

    -
    - - {% endif %} -

     

    -

    You can post to Juick via e-mail. Send your plain text - messages to juick@juick.com. You can attach one photo or video file.

    -
    -
    - - Facebook - - {% if fbstatus.connected %} - {% if fbstatus.crosspostEnabled %} -
    -
    - Facebook: Enabled — - - -
    -
    - {% else %} -
    -
    - Facebook: Disabled — - - -
    -
    - {% endif %} - {% else %} -

    Cross-posting to Facebook: Connect to Facebook

    - {% endif %} -
    -
    - - Twitter - {% if twitter_name is not empty %} -
    -
    Twitter: {{ twitter_name }} — - - -
    -
    - {% else %} -

    Cross-posting to Twitter: Connect to Twitter

    - {% endif %} -
    - -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs" %} -{% endblock %} \ No newline at end of file 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 deleted file mode 100644 index aba0b139..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/settings_password.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -
    - Changing your password -
    - -

    Change password:
    - (max. length - 16 symbols)

    -
    -
    -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs" %} -{% endblock %} \ No newline at end of file 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 deleted file mode 100644 index 83b87b93..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -

    Privacy

    -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs" %} -{% endblock %} \ No newline at end of file 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 deleted file mode 100644 index d87a5ea6..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/settings_result.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -
    -

    {{ result | raw }}

    -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/signup.html b/juick-www/src/main/webapp/WEB-INF/views/signup.html deleted file mode 100644 index 44fd366f..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/signup.html +++ /dev/null @@ -1,41 +0,0 @@ -{% extends "layouts/default" %} -{% block content %} -

    - {% if type | slice(0, 1) == 'f' %} - Facebook - {% elseif type | slice(0, 1) == 'v' %} - VKontakte - {% elseif type | slice(0, 1) == 'x' %} - XMPP - {% elseif type | slice(0, 1) == 'd' %} - Telegram - {% endif %} - {{ account | raw }}

    - -

    Связать с существующим аккаунтом Juick

    -
    - - - - {% if visitor.getUID() > 0 %} - - {% else %} -

    Имя пользователя:

    -

    Пароль:

    -

    - {% endif %} -
    - -
    - -

    Создать новый аккаунт Juick

    -
    - - - -

    Имя пользователя:
    (От 2-х до 16-и латинских символов - и/или цифр, дефис)

    -

    Пароль:
    (от 6-и до 32-х символов)

    -

    -
    -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/test.html b/juick-www/src/main/webapp/WEB-INF/views/test.html deleted file mode 100644 index 7700be6f..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/test.html +++ /dev/null @@ -1,2 +0,0 @@ -{% import "views/macros/tags" %} -{{ tags("ugnich", tagsList)}} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/thread.html b/juick-www/src/main/webapp/WEB-INF/views/thread.html deleted file mode 100644 index 2115f442..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/thread.html +++ /dev/null @@ -1,134 +0,0 @@ -{% extends "layouts/default" %} -{% import "views/macros/tags" %} -{% block content %} - -
    -
    - {% if listview %} - {{ i18n("messages","replies.showAsTree") }} - {% else %} - {% if foldable %} - {{ i18n("messages","replies.unfoldAll") }} · - {% endif %} - {{ i18n("messages","replies.showAsList") }} - {% endif %} -
    -

    {{ i18n("messages","reply.replies") }} ({{ replies.size() }})

    -
    - - -{% endblock %} -{% block "column" %} -{% include "views/partial/usercolumn" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/users.html b/juick-www/src/main/webapp/WEB-INF/views/users.html deleted file mode 100644 index 702ba6b9..00000000 --- a/juick-www/src/main/webapp/WEB-INF/views/users.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "layouts/default" %} -{% import "views/macros/tags" %} -{% block content %} -
    - {% for u in users %} - - - {{ u.name }} - {{ u.name }} - - - {% endfor %} -
    -{% endblock %} -{% block "column" %} -{% include "views/partial/usercolumn" %} -{% endblock %} \ No newline at end of file -- cgit v1.2.3