aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main/webapp/WEB-INF/views
diff options
context:
space:
mode:
Diffstat (limited to 'juick-www/src/main/webapp/WEB-INF/views')
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/blog.html5
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/index.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/macros/tags.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/usercolumn.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/users.html17
6 files changed, 22 insertions, 8 deletions
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 %}
<p class="page"><a href="/tag/{{ paramTag.name | urlencode }}">← Все записи с тегом <b>{{ paramTag.name | escape }}</b></a></p>
{% endif %}
-{% if paramTag | default('') is not empty %}
-<p class="page"><a href="/tag/{{ paramTag.name | urlencode }}">← Все записи с тегом <b>{{ paramTag.name | escape }}</b></a></p>
-{% endif %}
{% for msg in msgs %}
<article data-mid="{{ msg.mid }}">
<header class="h">@<a href="/{{ msg.user.name }}/">{{ msg.user.name }}</a>:
@@ -25,7 +22,7 @@
</a>
</div>
<div class="msg-tags">
- {{ tags(msg.user.name, msg.tags) }}
+ {{ tags(msg.user.name, msg.tags | tagsList) }}
</div>
</header>
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 @@
</a>
</div>
<div class="msg-tags">
- {{ tags(msg.getUser().getName(), msg.getTags()) }}
+ {{ tags(msg.user.name, msg.tags | tagsList ) }}
</div>
</header>
<p>{{ msg | formatMessage }}</p>
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 %}
-<a href="/{{ uname }}/?tag={{ tag.name | urlencode }}">{{ tag.name }}</a>
+<a href="/{{ uname }}/?tag={{ tag | urlencode }}">{{ tag }}</a>
{% 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 @@
<div id="ctitle"><a href="./">
<img src="//i.juick.com/as/{{ user.uid }}.png" alt=""/>{{ user.name }}</a></div>
{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}
-<ul id="ctoolbar">
+<ul class="toolbar">
{% if isSubscribed %}
<li>
<a href="/post?body=U+%40{{ user.name }}" title="Подписан">
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html b/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html
index 78e1416e..71d1303e 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/usertags.html
@@ -1,3 +1,3 @@
{% import "views/macros/tags" %}
-{{ tags(uname=user.name, tagsStats) }}
+{{ tags(user.name, tagStats) }}
<a href="/{{ user.name }}/tags" rel="nofollow">...</a> \ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/users.html b/juick-www/src/main/webapp/WEB-INF/views/users.html
new file mode 100644
index 00000000..0f66da54
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/users.html
@@ -0,0 +1,17 @@
+{% extends "layouts/content" %}
+{% import "views/macros/tags" %}
+{% block content %}
+<div class="users">
+ {% for u in users %}
+ <span>
+ <a href="/{{ u.name }}/">
+ <img src="//i.juick.com/as/{{ u.uid }}.png" alt="{{ u.name }}"/>
+ {{ u.name }}
+ </a>
+ </span>
+ {% endfor %}
+</div>
+{% endblock %}
+{% block "column" %}
+{% include "views/partial/usercolumn" %}
+{% endblock %} \ No newline at end of file