From 93c8d1a052753584a4f55118f6753a952a3089a9 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 24 Aug 2018 14:48:50 +0300 Subject: drop www files --- juick-www/src/main/resources/errors.properties | 3 - juick-www/src/main/resources/errors_ru.properties | 3 - juick-www/src/main/resources/help | 1 - juick-www/src/main/resources/messages.properties | 79 ---------- .../src/main/resources/messages_ru.properties | 77 ---------- juick-www/src/main/resources/static/favicon.png | Bin 244 -> 0 bytes juick-www/src/main/resources/static/logo.png | Bin 1184 -> 0 bytes juick-www/src/main/resources/static/tagscloud.png | Bin 42316 -> 0 bytes .../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/login_success.html | 13 -- .../resources/templates/views/macros/tags.html | 5 - .../resources/templates/views/partial/footer.html | 16 -- .../templates/views/partial/homecolumn.html | 25 --- .../resources/templates/views/partial/message.html | 76 --------- .../templates/views/partial/navigation.html | 40 ----- .../templates/views/partial/settings_tabs.html | 6 - .../templates/views/partial/tagcolumn.html | 33 ---- .../resources/templates/views/partial/tags.html | 3 - .../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 | 170 --------------------- .../src/main/resources/templates/views/users.html | 17 --- 42 files changed, 1328 deletions(-) delete mode 100644 juick-www/src/main/resources/errors.properties delete mode 100644 juick-www/src/main/resources/errors_ru.properties delete mode 160000 juick-www/src/main/resources/help delete mode 100644 juick-www/src/main/resources/messages.properties delete mode 100644 juick-www/src/main/resources/messages_ru.properties delete mode 100644 juick-www/src/main/resources/static/favicon.png delete mode 100644 juick-www/src/main/resources/static/logo.png delete mode 100644 juick-www/src/main/resources/static/tagscloud.png delete mode 100644 juick-www/src/main/resources/templates/layouts/content.html delete mode 100644 juick-www/src/main/resources/templates/layouts/default.html delete mode 100644 juick-www/src/main/resources/templates/layouts/minimal.html delete mode 100644 juick-www/src/main/resources/templates/views/404.html delete mode 100644 juick-www/src/main/resources/templates/views/blog.html delete mode 100644 juick-www/src/main/resources/templates/views/blog_tags.html delete mode 100644 juick-www/src/main/resources/templates/views/help.html delete mode 100644 juick-www/src/main/resources/templates/views/index.html delete mode 100644 juick-www/src/main/resources/templates/views/login.html delete mode 100644 juick-www/src/main/resources/templates/views/login_success.html delete mode 100644 juick-www/src/main/resources/templates/views/macros/tags.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/footer.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/homecolumn.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/message.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/navigation.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/settings_tabs.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/tagcolumn.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/tags.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/usercolumn.html delete mode 100644 juick-www/src/main/resources/templates/views/partial/usertags.html delete mode 100644 juick-www/src/main/resources/templates/views/pm_inbox.html delete mode 100644 juick-www/src/main/resources/templates/views/pm_sent.html delete mode 100644 juick-www/src/main/resources/templates/views/post.html delete mode 100644 juick-www/src/main/resources/templates/views/post_success.html delete mode 100644 juick-www/src/main/resources/templates/views/settings_about.html delete mode 100644 juick-www/src/main/resources/templates/views/settings_auth-email.html delete mode 100644 juick-www/src/main/resources/templates/views/settings_main.html delete mode 100644 juick-www/src/main/resources/templates/views/settings_password.html delete mode 100644 juick-www/src/main/resources/templates/views/settings_privacy.html delete mode 100644 juick-www/src/main/resources/templates/views/settings_result.html delete mode 100644 juick-www/src/main/resources/templates/views/signup.html delete mode 100644 juick-www/src/main/resources/templates/views/test.html delete mode 100644 juick-www/src/main/resources/templates/views/thread.html delete mode 100644 juick-www/src/main/resources/templates/views/users.html (limited to 'juick-www/src/main/resources') diff --git a/juick-www/src/main/resources/errors.properties b/juick-www/src/main/resources/errors.properties deleted file mode 100644 index 7ec8fbfd..00000000 --- a/juick-www/src/main/resources/errors.properties +++ /dev/null @@ -1,3 +0,0 @@ -error.title = Error page - -error.login=Wrong user or password \ No newline at end of file diff --git a/juick-www/src/main/resources/errors_ru.properties b/juick-www/src/main/resources/errors_ru.properties deleted file mode 100644 index ca13b926..00000000 --- a/juick-www/src/main/resources/errors_ru.properties +++ /dev/null @@ -1,3 +0,0 @@ -error.title = Произошла ошибка - -error.login=Произошла ошибка, проверьте имя пользователя и пароль \ No newline at end of file diff --git a/juick-www/src/main/resources/help b/juick-www/src/main/resources/help deleted file mode 160000 index ce103cd9..00000000 --- a/juick-www/src/main/resources/help +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ce103cd9a2a8a200c6ebb3b41525e7c8f639d98c diff --git a/juick-www/src/main/resources/messages.properties b/juick-www/src/main/resources/messages.properties deleted file mode 100644 index e53e9e7b..00000000 --- a/juick-www/src/main/resources/messages.properties +++ /dev/null @@ -1,79 +0,0 @@ -date.format=MM/dd/yyyy - -link.settings=Settings -link.returnToMain=Back to Home Page -link.contacts=Contacts -link.tos=TOS -link.adv=Advertisement - -link.popular=Popular -link.allMessages=Discover -link.withPhotos=Photos -link.trends=Trends -link.my=My feed -link.privateMessages=PM -link.discuss=Discuss -link.recommended=Recommended -link.postMessage=Post -link.Login=Login -link.logout=Logout - -link.settings.main=Main -link.settings.password=Password -link.settings.about=About - -label.sponsor=Sponsor -label.sponsors=Sponsors -label.search=Search -label.register=Register -label.username=User name -label.password=Password - -postForm.newMessage=New message... -postForm.imageLink=Link to image -postForm.imageFormats=JPG/PNG, up to 10 MB -postForm.or=or -postForm.upload=Upload -postForm.tags=Tags (space separated) -postForm.submit=Send - -message.recommend=Recommend -message.recommendedBy=Recommended by -message.comment=Comment -message.writeComment=Write a comment... -message.share=Share -message.subscribe=Subscribe -message.subscribed=Subscribed -message.delete=Delete -message.loginForSending=Login to post messages and comments -message.sendLoginToXmpp=Send LOGIN to juick@juick.com - -messages.next=Next - -reply.reply=Reply -reply.inReplyTo=in reply to -reply.replies=Replies - -replies.showAsList=Show as list -replies.showAsTree=Show as tree -replies.unfoldAll=Unfold all - -question.areRegistered=Already registered? - -title.help=Help -title.loginOrSignup=Juick - Log In or Sign Up -title.index.anonym=Juick microblogs: popular posts -title.index.user=Popular - -error.pageNotFound=Page not found -error.pageNotFound.description=User probably deleted this post, or this page never existed. - -blog.blog=Blog -blog.recommendations=Recommendations -blog.photos=Photos -blog.iread=I read -blog.readers=My readers -blog.bl=My blacklist -blog.messages=Messages -blog.comments=Comments -blog.allPostsWithTag=All posts tagged \ No newline at end of file diff --git a/juick-www/src/main/resources/messages_ru.properties b/juick-www/src/main/resources/messages_ru.properties deleted file mode 100644 index fca6aa4b..00000000 --- a/juick-www/src/main/resources/messages_ru.properties +++ /dev/null @@ -1,77 +0,0 @@ -date.format=dd.MM.yyyy - -link.settings=Настройки -link.returnToMain=Вернуться на главную -link.contacts=Контакты -link.tos=TOS - -link.popular=Популярные -link.allMessages=Обзор -link.withPhotos=Фото -link.trends=Темы -link.my=Моя лента -link.privateMessages=Приватные -link.discuss=Диалоги -link.recommended=Рекомендации -link.postMessage=Написать -link.Login=Войти -link.logout=Выйти - -link.settings.main=Главная -link.settings.password=Пароль -link.settings.about=О пользователе - -label.sponsor=Спонсор -label.sponsors=Спонсоры -label.search=Поиск -label.register=Зарегистрироваться -label.username=Имя пользователя -label.password=Пароль - -postForm.newMessage=Новое сообщение... -postForm.imageLink=Ссылка на изображение -postForm.imageFormats=JPG/PNG, до 10Мб -postForm.or=или -postForm.upload=загрузить -postForm.tags=Теги (через пробел) -postForm.submit=Отправить - -message.recommend=Рекомендовать -message.recommendedBy=Рекомендовали -message.comment=Комментировать -message.writeComment=Написать комментарий... -message.share=Поделиться -message.subscribe=Подписаться -message.subscribed=Подписан -message.delete=Удалить -message.loginForSending=Чтобы добавлять сообщения и комментарии, представьтесь -message.sendLoginToXmpp=Отправьте LOGIN на juick@juick.com - -messages.next=Читать дальше - -reply.reply=Ответить -reply.inReplyTo=в ответ на -reply.replies=Ответы -replies.showAsList=Показать списком -replies.showAsTree=Показать деревом -replies.unfoldAll=Раскрыть все - -question.areRegistered=Уже зарегистрированы? - -title.help=Справка -title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь -title.index.anonym=Микроблоги Juick: популярные записи -title.index.user=Популярные - -error.pageNotFound=Страница не найдена -error.pageNotFound.description=Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало. - -blog.blog=Блог -blog.recommendations=Рекомендации -blog.photos=Фотографии -blog.iread=Я читаю -blog.readers=Мои подписчики -blog.bl=Черный список -blog.messages=Сообщения -blog.comments=Комментарии -blog.allPostsWithTag=Все записи с тегом \ No newline at end of file diff --git a/juick-www/src/main/resources/static/favicon.png b/juick-www/src/main/resources/static/favicon.png deleted file mode 100644 index bc7161e2..00000000 Binary files a/juick-www/src/main/resources/static/favicon.png and /dev/null differ diff --git a/juick-www/src/main/resources/static/logo.png b/juick-www/src/main/resources/static/logo.png deleted file mode 100644 index 933f6099..00000000 Binary files a/juick-www/src/main/resources/static/logo.png and /dev/null differ diff --git a/juick-www/src/main/resources/static/tagscloud.png b/juick-www/src/main/resources/static/tagscloud.png deleted file mode 100644 index 3e1bf169..00000000 Binary files a/juick-www/src/main/resources/static/tagscloud.png and /dev/null differ diff --git a/juick-www/src/main/resources/templates/layouts/content.html b/juick-www/src/main/resources/templates/layouts/content.html deleted file mode 100644 index 2ca9fd7e..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/layouts/default.html b/juick-www/src/main/resources/templates/layouts/default.html deleted file mode 100644 index 343885c4..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/layouts/minimal.html b/juick-www/src/main/resources/templates/layouts/minimal.html deleted file mode 100644 index 15924521..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/404.html b/juick-www/src/main/resources/templates/views/404.html deleted file mode 100644 index 02a790e6..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/blog.html b/juick-www/src/main/resources/templates/views/blog.html deleted file mode 100644 index 9cf4714e..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/blog_tags.html b/juick-www/src/main/resources/templates/views/blog_tags.html deleted file mode 100644 index 48e517eb..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/help.html b/juick-www/src/main/resources/templates/views/help.html deleted file mode 100644 index 3a022497..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/index.html b/juick-www/src/main/resources/templates/views/index.html deleted file mode 100644 index 97d726de..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/login.html b/juick-www/src/main/resources/templates/views/login.html deleted file mode 100644 index a538cb26..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/login_success.html b/juick-www/src/main/resources/templates/views/login_success.html deleted file mode 100644 index ee71f12f..00000000 --- a/juick-www/src/main/resources/templates/views/login_success.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Blank window - - - - - diff --git a/juick-www/src/main/resources/templates/views/macros/tags.html b/juick-www/src/main/resources/templates/views/macros/tags.html deleted file mode 100644 index 09278ffe..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/partial/footer.html b/juick-www/src/main/resources/templates/views/partial/footer.html deleted file mode 100644 index 35972254..00000000 --- a/juick-www/src/main/resources/templates/views/partial/footer.html +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/juick-www/src/main/resources/templates/views/partial/homecolumn.html b/juick-www/src/main/resources/templates/views/partial/homecolumn.html deleted file mode 100644 index 64dd9cbd..00000000 --- a/juick-www/src/main/resources/templates/views/partial/homecolumn.html +++ /dev/null @@ -1,25 +0,0 @@ - -
-

{{ i18n("messages","link.trends") }}

- {% 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 deleted file mode 100644 index 0b6db3df..00000000 --- a/juick-www/src/main/resources/templates/views/partial/message.html +++ /dev/null @@ -1,76 +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/resources/templates/views/partial/navigation.html b/juick-www/src/main/resources/templates/views/partial/navigation.html deleted file mode 100644 index fa1dadcc..00000000 --- a/juick-www/src/main/resources/templates/views/partial/navigation.html +++ /dev/null @@ -1,40 +0,0 @@ -
-
- {% if visitor.uid > 0 %} - - {% else %} - - {% endif %} - - -
-
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 deleted file mode 100644 index 4715253e..00000000 --- a/juick-www/src/main/resources/templates/views/partial/settings_tabs.html +++ /dev/null @@ -1,6 +0,0 @@ -
\ 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 deleted file mode 100644 index 3e61d3d3..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/partial/tags.html b/juick-www/src/main/resources/templates/views/partial/tags.html deleted file mode 100644 index 3235213e..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/partial/usercolumn.html b/juick-www/src/main/resources/templates/views/partial/usercolumn.html deleted file mode 100644 index 2b1963e3..00000000 --- a/juick-www/src/main/resources/templates/views/partial/usercolumn.html +++ /dev/null @@ -1,89 +0,0 @@ -{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} -
- - {{ user.name }} - -
- -{% 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 deleted file mode 100644 index 71d1303e..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/pm_inbox.html b/juick-www/src/main/resources/templates/views/pm_inbox.html deleted file mode 100644 index d6a9b65f..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/pm_sent.html b/juick-www/src/main/resources/templates/views/pm_sent.html deleted file mode 100644 index bc42c4ab..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/post.html b/juick-www/src/main/resources/templates/views/post.html deleted file mode 100644 index 1f642ce1..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/post_success.html b/juick-www/src/main/resources/templates/views/post_success.html deleted file mode 100644 index 2106f3cb..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/settings_about.html b/juick-www/src/main/resources/templates/views/settings_about.html deleted file mode 100644 index bbf9e772..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/settings_auth-email.html b/juick-www/src/main/resources/templates/views/settings_auth-email.html deleted file mode 100644 index e906d704..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/settings_main.html b/juick-www/src/main/resources/templates/views/settings_main.html deleted file mode 100644 index 65fbc984..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/settings_password.html b/juick-www/src/main/resources/templates/views/settings_password.html deleted file mode 100644 index aba0b139..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/settings_privacy.html b/juick-www/src/main/resources/templates/views/settings_privacy.html deleted file mode 100644 index 83b87b93..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/settings_result.html b/juick-www/src/main/resources/templates/views/settings_result.html deleted file mode 100644 index d87a5ea6..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/signup.html b/juick-www/src/main/resources/templates/views/signup.html deleted file mode 100644 index 44fd366f..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/test.html b/juick-www/src/main/resources/templates/views/test.html deleted file mode 100644 index 7700be6f..00000000 --- a/juick-www/src/main/resources/templates/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/resources/templates/views/thread.html b/juick-www/src/main/resources/templates/views/thread.html deleted file mode 100644 index e002bc71..00000000 --- a/juick-www/src/main/resources/templates/views/thread.html +++ /dev/null @@ -1,170 +0,0 @@ -{% extends "layouts/default" %} -{% import "views/macros/tags" %} -{% block content %} - -
- {% if visitor.uid > 0 %} - - {% 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 deleted file mode 100644 index 702ba6b9..00000000 --- a/juick-www/src/main/resources/templates/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