From be30d843aab467aa628f1c3f3c7d194bfda54284 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 23 May 2017 14:47:38 +0300 Subject: fix style --- juick-www/src/main/webapp/WEB-INF/views/blog.html | 5 +---- juick-www/src/main/webapp/WEB-INF/views/index.html | 2 +- .../src/main/webapp/WEB-INF/views/macros/tags.html | 2 +- .../main/webapp/WEB-INF/views/partial/usercolumn.html | 2 +- .../src/main/webapp/WEB-INF/views/partial/usertags.html | 2 +- juick-www/src/main/webapp/WEB-INF/views/users.html | 17 +++++++++++++++++ 6 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 juick-www/src/main/webapp/WEB-INF/views/users.html (limited to 'juick-www/src/main/webapp') diff --git a/juick-www/src/main/webapp/WEB-INF/views/blog.html b/juick-www/src/main/webapp/WEB-INF/views/blog.html index 6672adff..f68ebf3e 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/blog.html +++ b/juick-www/src/main/webapp/WEB-INF/views/blog.html @@ -7,9 +7,6 @@ {% if paramTag | default('') is not empty %}

← Все записи с тегом {{ paramTag.name | escape }}

{% endif %} -{% if paramTag | default('') is not empty %} -

← Все записи с тегом {{ paramTag.name | escape }}

-{% endif %} {% for msg in msgs %}
@{{ msg.user.name }}: @@ -25,7 +22,7 @@
- {{ tags(msg.user.name, msg.tags) }} + {{ tags(msg.user.name, msg.tags | tagsList) }}
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 0bf2a2fd..88178cc5 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -22,7 +22,7 @@
- {{ tags(msg.getUser().getName(), msg.getTags()) }} + {{ tags(msg.user.name, msg.tags | tagsList ) }}

{{ msg | formatMessage }}

diff --git a/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html b/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html index b34e6ecc..167f9168 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html +++ b/juick-www/src/main/webapp/WEB-INF/views/macros/tags.html @@ -1,5 +1,5 @@ {% macro tags(uname="", tagsList) %} {% for tag in tagsList %} -{{ tag.name }} +{{ tag }} {% endfor %} {% endmacro %} \ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html index 7e3b8a64..9024dd81 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html @@ -1,7 +1,7 @@
{{ user.name }}
{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} -