diff --git a/components/Tag/Controller/Tag.php b/components/Tag/Controller/Tag.php
index b79ab69b4a..172a91f83e 100644
--- a/components/Tag/Controller/Tag.php
+++ b/components/Tag/Controller/Tag.php
@@ -36,6 +36,7 @@ class Tag extends Controller
return [
'_template' => $template,
+ 'tag_name' => $canonical,
'results' => $results,
'page' => $page,
];
diff --git a/components/Tag/templates/actor_tag_feed.html.twig b/components/Tag/templates/actor_tag_feed.html.twig
index 8aa818f48e..0b888ce821 100644
--- a/components/Tag/templates/actor_tag_feed.html.twig
+++ b/components/Tag/templates/actor_tag_feed.html.twig
@@ -1,6 +1,13 @@
{% extends 'base.html.twig' %}
+{% block stylesheets %}
+ {{ parent() }}
+
+{% endblock stylesheets %}
+
{% block body %}
+
{{ 'Notes containing tag:' | trans }} {{ tag_name }}
+
{% for pinned in handle_event('AddPinnedFeedContent', app.request) %}
{% include pinned['template'] with { 'actor_tags': pinned['vars']} only %}
{% endfor %}
@@ -9,5 +16,7 @@
{% block profile_view %}{% include 'cards/profile/view.html.twig' %}{% endblock profile_view %}
{% endfor %}
- {{ "Page: " ~ page }}
+
+ {{ "Page: " ~ page }}
+
{% endblock %}
diff --git a/components/Tag/templates/note_tag_feed.html.twig b/components/Tag/templates/note_tag_feed.html.twig
index 9bf82e7955..61644da68c 100644
--- a/components/Tag/templates/note_tag_feed.html.twig
+++ b/components/Tag/templates/note_tag_feed.html.twig
@@ -1,18 +1,25 @@
{% extends 'base.html.twig' %}
{% import '/cards/note/view.html.twig' as noteView %}
+{% block stylesheets %}
+ {{ parent() }}
+
+{% endblock stylesheets %}
+
{% block body %}
+ {{ 'Notes containing tag:' | trans }} {{ tag_name }}
+
{% for pinned in handle_event('AddPinnedFeedContent', app.request) %}
{% include pinned['template'] with { 'note_tags': pinned['vars']} only %}
{% endfor %}
{% for note in results %}
{% block current_note %}
-
{{ noteView.macro_note(note) }}
-
{% endblock current_note %}
{% endfor %}
- {{ "Page: " ~ page }}
+
+ {{ "Page " ~ page }}
+
{% endblock %}
diff --git a/plugins/RelatedTags/templates/related_tags/actor_tags.html.twig b/plugins/RelatedTags/templates/related_tags/actor_tags.html.twig
index 069a966d54..a04b6482db 100644
--- a/plugins/RelatedTags/templates/related_tags/actor_tags.html.twig
+++ b/plugins/RelatedTags/templates/related_tags/actor_tags.html.twig
@@ -1,7 +1,9 @@
-