From b965122cdf4f23c07d169c706f2bf49a0b9b3d08 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 1 Nov 2018 14:06:52 +0300
Subject: ActivityPub: update tag format

---
 juick-server/src/main/resources/templates/layouts/note.html      | 8 +++-----
 juick-server/src/main/resources/templates/views/macros/tags.html | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'juick-server/src/main/resources')

diff --git a/juick-server/src/main/resources/templates/layouts/note.html b/juick-server/src/main/resources/templates/layouts/note.html
index 57ec667f..42b939c0 100644
--- a/juick-server/src/main/resources/templates/layouts/note.html
+++ b/juick-server/src/main/resources/templates/layouts/note.html
@@ -1,7 +1,5 @@
 {% import "views/macros/tags" %}
+<p>{{ msg | formatMessage }}</p>
 {% if msg.tags.size > 0 %}
-<div class="msg-tags">
-    {{ allTags(baseUri, msg.tags | tagsList) }}
-</div>
-{% endif %}
-<p>{{ msg | formatMessage }}</p>
\ No newline at end of file
+<div class="msg-tags">{{ allTags(baseUri, msg.tags | tagsList) }}</div>
+{% endif %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/macros/tags.html b/juick-server/src/main/resources/templates/views/macros/tags.html
index 1e668292..defed8e6 100644
--- a/juick-server/src/main/resources/templates/views/macros/tags.html
+++ b/juick-server/src/main/resources/templates/views/macros/tags.html
@@ -6,6 +6,6 @@
 
 {% macro allTags(baseUri, tagsList) %}
 {% for tag in tagsList %}
-<a href="{{ baseUri }}tag/{{ tag | urlencode }}">{{ tag | raw }}</a>
+<a href="{{ baseUri }}tag/{{ tag | urlencode }}">#{{ tag | raw }}</a>
 {% endfor %}
 {% endmacro %}
\ No newline at end of file
-- 
cgit v1.2.3