From 06d89c8784dd9e8745837cbd3295e3b25ad6b43f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 26 Aug 2021 18:09:20 +0300
Subject: ActivityPub: improve Note layout

add rel=tag on tag links, remove more line breaks
---
 src/main/resources/templates/layouts/note.html      | 2 +-
 src/main/resources/templates/views/macros/tags.html | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/main/resources/templates')

diff --git a/src/main/resources/templates/layouts/note.html b/src/main/resources/templates/layouts/note.html
index 7f704925..8c3d535d 100644
--- a/src/main/resources/templates/layouts/note.html
+++ b/src/main/resources/templates/layouts/note.html
@@ -1 +1 @@
-{% import "views/macros/tags" %}<p>{{ msg | formatMessage }}{% if msg.tags | length > 0 %} {{ allTags(baseUri, msg.tags | tagsList) }}{% endif %}</p>
\ No newline at end of file
+{% import "views/macros/tags" %}<p>{{ msg | formatMessage }}{% if msg.tags | length > 0 %}{{ allTags(baseUri, msg.tags | tagsList) }}{% endif %}</p>
\ No newline at end of file
diff --git a/src/main/resources/templates/views/macros/tags.html b/src/main/resources/templates/views/macros/tags.html
index d1b3fdea..459cedd6 100644
--- a/src/main/resources/templates/views/macros/tags.html
+++ b/src/main/resources/templates/views/macros/tags.html
@@ -1,7 +1,2 @@
-{% macro tags(uname="", tagsList) %}
-{% for tag in tagsList %}<a class="hashtag" href="/{{ uname }}/?tag={{ tag | urlencode }}">{{ tag }}</a>{% endfor %}
-{% endmacro %}
-
-{% macro allTags(baseUri, tagsList) %}
-{% for tag in tagsList %}<a class="hashtag" href="{{ baseUri }}tag/{{ tag | urlencode }}">#{{ tag }}</a>{% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% macro tags(uname="", tagsList) %}{% for tag in tagsList %}<a class="hashtag" href="/{{ uname }}/?tag={{ tag | urlencode }}">{{ tag }}</a>{% endfor %}{% endmacro %}
+{% macro allTags(baseUri, tagsList) %}{% for tag in tagsList %}<a class="hashtag" href="{{ baseUri }}tag/{{ tag | urlencode }}" rel="tag">#{{ tag }}</a>{% endfor %}{% endmacro %}
\ No newline at end of file
-- 
cgit v1.2.3