From ff106a64431e6510267ab0677c41d95d555b3956 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 19 Oct 2017 16:34:02 +0300 Subject: www: new design --- .../src/main/webapp/WEB-INF/layouts/content.html | 9 +++- juick-www/src/main/webapp/WEB-INF/views/index.html | 4 ++ .../src/main/webapp/WEB-INF/views/macros/tree.html | 3 -- .../main/webapp/WEB-INF/views/partial/footer.html | 3 +- .../main/webapp/WEB-INF/views/partial/message.html | 34 +++++++------ .../webapp/WEB-INF/views/partial/navigation.html | 43 +++++----------- .../webapp/WEB-INF/views/partial/thread_list.html | 3 -- .../webapp/WEB-INF/views/partial/usercolumn.html | 33 ++++++++---- .../src/main/webapp/WEB-INF/views/pm_inbox.html | 2 +- .../src/main/webapp/WEB-INF/views/pm_sent.html | 2 +- .../src/main/webapp/WEB-INF/views/thread.html | 59 ++++++++++------------ 11 files changed, 96 insertions(+), 99 deletions(-) (limited to 'juick-www/src/main/webapp') diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html index 9ced2d76..73d140f1 100644 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ b/juick-www/src/main/webapp/WEB-INF/layouts/content.html @@ -46,8 +46,13 @@ 0 %}data-hash="{{visitor.authHash}}"{% endif %}> {% include "views/partial/navigation" %}

+ {% if visitor.uid == 0 %} +

{{ i18n("messages","message.loginForSending", "/login") | raw }}.

+ {% endif %} +

{% block content %} {% endblock %}

diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html index 51590ce0..23d208b6 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -12,7 +12,11 @@ {% endif %} {% endblock %} {% block "column" %} +{% if visitor.uid > 0 %} +{% include "views/partial/usercolumn" %} +{% else %} {% include "views/partial/homecolumn" %} +{% endif %} {% if noindex %} {% endif %} 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 index f0c283e9..bb2507aa 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html +++ b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html @@ -15,9 +15,6 @@

{% endif %} -

- {{ i18n("messages","link.settings") }} · +

· {{ i18n("messages","link.contacts") }} · {{ i18n("messages","link.help") }} · {{ i18n("messages","link.adv") }} 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 index c0d345ba..72e5cce0 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html @@ -6,7 +6,6 @@

{% if visitor.uid != msg.user.uid %} {% if visitor.uid > 0 %} - {{ i18n("messages","message.recommend") }} + + {{ i18n("messages","message.recommend") }} + {% if msg.Likes > 0 %} ({{ msg.Likes }}){% endif %} + {% else %} - + {% endif %} {% endif %} {% if (visitor.uid > 0 and not msg.ReadOnly) or (visitor.uid == msg.user.uid) %} - {{ i18n("messages","message.comment") }} + + {{ i18n("messages","message.comment") }} + {% if msg.Replies > 0 %} ({{ msg.Replies }}){% endif %} + + {% elseif visitor.uid == 0 and not msg.ReadOnly %} - + {% endif %} {% if msg.FriendsOnly %} Открыть доступ @@ -47,14 +61,4 @@ x {% 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 index 79f1985d..cabdca02 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html @@ -1,35 +1,20 @@

Juick

- -

- {% if visitor.uid > 0 %} - -

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 index 918c4fb0..30bbc44c 100644 --- 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 @@ -13,9 +13,6 @@

{% endif %} -

+ +

{{ user.name }} + +

{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}

-
+ Subscribed
-
+ Subscribe
-
+ Unblock
-
+ Block
-
+ PM

{{ i18n("messages","blog.blog") }}
{{ i18n("messages","blog.recommendations") }}
{{ i18n("messages","blog.photos") }}
{{ i18n("messages","link.my") }}
{{ i18n("messages","link.privateMessages") }}
{{ i18n("messages","link.discuss") }}
{{ i18n("messages","blog.recommendations") }}
{{ i18n("messages","blog.photos") }}
{{ i18n("messages","blog.comments") }}
Неотвеченные
{{ i18n("messages","link.settings") }}
{{ i18n("messages","link.logout") }}

-

@@ -32,6 +31,32 @@
{% endif %} +
+ {% if visitor.uid != msg.user.uid %} + {% if visitor.uid > 0 %} + + {{ i18n("messages","message.recommend") }} + {% if msg.Likes > 0 %} ({{ msg.Likes }}){% endif %} + + {% else %} + + {{ i18n("messages","message.recommend") }} + {% if msg.Likes > 0 %} ({{ msg.Likes }}){% endif %} + + {% endif %} + {% endif %} + {% if (visitor.uid > 0 and not msg.ReadOnly) or (visitor.uid == msg.user.uid) %} + Share + {% endif %} + {% if msg.FriendsOnly %} + Открыть доступ + {% endif %} + {% if isModerator %} + + + - + x + {% endif %} +
{% if msg.VisitorCanComment %}
@@ -51,37 +76,6 @@ {% endif %}
-
- -
  - {{ msg.mid }} -
- -
  - {{ i18n("messages","message.subscribed") }}
- -
  - {{ i18n("messages","message.subscribe") }}
- -
  - {{ i18n("messages","message.recommend") }}
- -
  - {{ i18n("messages","message.delete") }}
-

@@ -106,4 +100,5 @@

{% endblock %} {% block "column" %} +{% include "views/partial/usercolumn" %} {% endblock %} \ No newline at end of file -- cgit v1.2.3