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 --- .../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 +++ 36 files changed, 1201 insertions(+) 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 (limited to 'juick-www/src/main/resources/templates') 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 %} +
    /{{ msg.rid }} +{% if msg.replyto > 0 %} + {{ i18n("messages","reply.inReplyTo") }} /{{ msg.replyto }} +{% endif %} +{% if msg.VisitorCanComment %} + · {{ i18n("messages","reply.reply") }}
    +
    +{% 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 %} +
    /{{ msg.rid }} + {% if msg.replyto > 0 %} + {{ i18n("messages","reply.inReplyTo") }} /{{ msg.replyto }} + {% endif %} + {% if msg.VisitorCanComment %} + · {{ i18n("messages","reply.reply") }} +
    +
    + {% 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 -- cgit v1.2.3