From 559ae343aa72db04e12b94acfa0bec30ed9a11f1 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 9 Dec 2016 16:14:27 +0300 Subject: juick-spring-www: merge some work from develop branch, port some templates to Thymeleaf --- .../WEB-INF/templates/layout/mainLayout.html | 48 +----- .../webapp/WEB-INF/templates/layout/sponsors.html | 8 - .../main/webapp/WEB-INF/templates/views/help.html | 18 +++ .../WEB-INF/templates/views/partial/footer.html | 34 +++++ .../templates/views/partial/homecolumn.html | 6 + .../templates/views/partial/navigation.html | 37 +++++ .../templates/views/partial/settings_tabs.html | 5 + .../WEB-INF/templates/views/partial/tags.html | 3 + .../WEB-INF/templates/views/settings_about.html | 31 ++++ .../templates/views/settings_auth-email.html | 20 +++ .../WEB-INF/templates/views/settings_main.html | 167 +++++++++++++++++++++ .../WEB-INF/templates/views/settings_password.html | 26 ++++ .../WEB-INF/templates/views/settings_result.html | 18 +++ 13 files changed, 373 insertions(+), 48 deletions(-) delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html (limited to 'juick-spring-www/src/main/webapp/WEB-INF') diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html index bbee7f6a..61062a3b 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html @@ -11,53 +11,21 @@ Juick.com - + - -
+
Navigation block
+
+

Main content

+ - + \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html deleted file mode 100644 index 6c68a867..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html +++ /dev/null @@ -1,8 +0,0 @@ - - - -
- Спонсоры: -
- - \ 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 new file mode 100644 index 00000000..0500839b --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html @@ -0,0 +1,18 @@ + + + + Help title + + + +
+
Help text
+
+ + + + \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html new file mode 100644 index 00000000..6978a2c0 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html @@ -0,0 +1,34 @@ + + \ 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 new file mode 100644 index 00000000..5293918d --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html @@ -0,0 +1,6 @@ +

+ {% include "views/partial/tags.html" %} + {% if showAdv %} + конструктор сайтов + {% endif %} +

\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html new file mode 100644 index 00000000..2863d0c3 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html @@ -0,0 +1,37 @@ +
+ + + +
+ {% if visitor.getUID() > 0 %} + + + {% else %} +

Чтобы добавлять сообщения и комментарии, представьтесь. +

+ {% endif %} +
+
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 new file mode 100644 index 00000000..d7901d5e --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html @@ -0,0 +1,5 @@ +
\ 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 new file mode 100644 index 00000000..4d05b7fb --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html @@ -0,0 +1,3 @@ +{% for tag in tags %} + {{ tag }} +{% endfor %} \ 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 new file mode 100644 index 00000000..ff82b542 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html @@ -0,0 +1,31 @@ + + + + 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 new file mode 100644 index 00000000..d4788fd6 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html @@ -0,0 +1,20 @@ + + + + Settings title + + + +
+ +
+ + + + \ 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 new file mode 100644 index 00000000..42eff2e3 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html @@ -0,0 +1,167 @@ + + + + Settings title + + + +
+
+

Настройки

+
+
+ 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 %} +
+
+
+ + XMPP accounts + +

Your accounts:

+

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

+ {% if jids is not empty %} +

+ {% endif %} +

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

+
+
+
+ + E-mail + +
+

Add account:
+ + + +

+
+
+

Your accounts:

+

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

+ {% else %} +

+

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

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

+
+ {% endif %} +

 

+

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: {% if ehash is not empty %} {{ ehash }} {% else %}-{% endif %}

+
+

+
+
+
+ + Facebook + + {% if fbstatus.isConnected() %} + {% if fbstatus.isCrosspostEnabled() %} +
+
+ 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 %} +
+ +
+
+ + + + \ 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 new file mode 100644 index 00000000..4c6e0d4d --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html @@ -0,0 +1,26 @@ + + + + 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 new file mode 100644 index 00000000..ddde1baf --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html @@ -0,0 +1,18 @@ + + + + Settings title + + + +
+

Settings update status

+
+ + + + \ No newline at end of file -- cgit v1.2.3