From 9820abe11c0c037f50bb2f7ddbb0bd19646264dc Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 7 Apr 2017 10:29:52 +0300 Subject: juick-www: merge juick-spring-www i18n, drop thymeleaf --- .../main/webapp/WEB-INF/templates/views/error.html | 16 --- .../main/webapp/WEB-INF/templates/views/help.html | 17 --- .../main/webapp/WEB-INF/templates/views/index.html | 21 --- .../main/webapp/WEB-INF/templates/views/login.html | 145 ------------------- .../templates/views/partial/blog_messages.html | 54 -------- .../templates/views/partial/blog_paginator.html | 3 - .../templates/views/partial/blog_postform.html | 14 -- .../templates/views/partial/homecolumn.html | 4 - .../templates/views/partial/settings_tabs.html | 7 - .../WEB-INF/templates/views/partial/tags.html | 3 - .../templates/views/partial/thread_message.html | 57 -------- .../webapp/WEB-INF/templates/views/pm_inbox.html | 45 ------ .../webapp/WEB-INF/templates/views/pm_sent.html | 42 ------ .../webapp/WEB-INF/templates/views/posted.html | 40 ------ .../WEB-INF/templates/views/settings_about.html | 31 ----- .../templates/views/settings_auth-email.html | 20 --- .../WEB-INF/templates/views/settings_main.html | 153 --------------------- .../WEB-INF/templates/views/settings_password.html | 28 ---- .../WEB-INF/templates/views/settings_result.html | 18 --- .../webapp/WEB-INF/templates/views/thread.html | 17 --- 20 files changed, 735 deletions(-) delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates/views') diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html deleted file mode 100644 index 9d763feb..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - Page not found - - -
-
-

Page not found

-

Probably, user deleted this post, or this page never existed.

-
-
-

Main side column

- - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html deleted file mode 100644 index d935b9d4..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - Help title - - - -
-
Help text
-
- - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html deleted file mode 100644 index 24aa9472..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - Page title - - - - -
-
-
- - - - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html deleted file mode 100644 index 2736ca53..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - Juick - - - - - - - - -
juick.com © 2008-2017   Контакты · Помощь
- -
- Зарегистрироваться: -
Facebook
-
VK
-
XMPP -
[(#{message.sendLoginToXmpp})]
-
-
-
-

Произошла ошибка, проверьте имя пользователя и пароль

- Уже зарегистрированы? -
-
- - - -
-
-
- - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html deleted file mode 100644 index 5d808f98..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html +++ /dev/null @@ -1,54 +0,0 @@ - -
-
- @ugnich: -
- - - -
-
- - - -
-
-
-

- - -

-

Lorem ipsum

-
- - -
- \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html deleted file mode 100644 index aa1e0466..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html +++ /dev/null @@ -1,3 +0,0 @@ -

- -

\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html deleted file mode 100644 index a9ed9f5d..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
- -
- - [(#{postForm.orImageUpload})] - -
- -
-
-
-
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html deleted file mode 100644 index 46c146f2..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html +++ /dev/null @@ -1,4 +0,0 @@ -

-

Tags
- конструктор сайтов -

diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html deleted file mode 100644 index 253511b5..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html +++ /dev/null @@ -1,7 +0,0 @@ -
- -
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html deleted file mode 100644 index f4822b4a..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html +++ /dev/null @@ -1,3 +0,0 @@ - - Tag - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html deleted file mode 100644 index 159eebf5..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html +++ /dev/null @@ -1,57 +0,0 @@ - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html deleted file mode 100644 index 80464e65..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - Inbox title - - - -
- -
- - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html deleted file mode 100644 index 8978ff67..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - Settings title - - - -
-
-
-
-
To:
-
-
-
-
- -
-
- - - - diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html deleted file mode 100644 index 25432c2c..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - Page title - - - -
-

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

-

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

-

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

-

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

-

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

-

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

-

Ссылка на сообщение: - http://juick.com/12345 - -

-
- - - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html deleted file mode 100644 index 6f8f61dd..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - Settings title - - - -
-
-
-

Full name:

-

Country:

-

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

-

About:
-
- Max. 255 symbols

-

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

-

-
-
-
- - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html deleted file mode 100644 index 715d474d..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - Settings title - - - -
-
-

Authentication result

Settings.

-
-
- - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html deleted file mode 100644 index 2db977f4..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html +++ /dev/null @@ -1,153 +0,0 @@ - - - - Settings title - - - -
-
-

Настройки

-
-
- Notification options -

Reply notifications ("Message posted")

-

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

-

Posts recommendations ("Recommended by @user")

-

-
-
-
- - Telegram -
-
Telegram: telegram_name — - - -
-
-

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

-
-
-
- - XMPP accounts - -

Your accounts:

-

- -
- - - - — Confirm
- -

-

-

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

-
-
-
- - E-mail - -
-

Add account:
- - - -

-
-
-

Your accounts:

-

- -
- -

- -

- -

-

- -
-
-

You can receive all your subscriptions by email:
- Sent to every day at - -

-
-

 

-

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

-

Secret email: SecretEmail@juick.com-

-
-

-
-
-
- - Facebook - -
-
- Facebook: Enabled — - - -
-
-
-
- Facebook: Disabled — - - -
-
-

Cross-posting to Facebook: - - Connect to Facebook - -

-
-
- - Twitter -
-
Twitter: @twitterName — - - -
-
-

Cross-posting to Twitter: Connect to Twitter

-
- -
-
- - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html deleted file mode 100644 index c76363e5..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - Settings title - - - -
-
-
- Changing your password -
- -

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

-
-
-
-
- - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html deleted file mode 100644 index 20cb097d..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - Settings title - - - -
-

Settings update status

-
- - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html deleted file mode 100644 index ac7da17f..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - Page title - - - -
- - - -
- - - -- cgit v1.2.3