diff --git a/machina/templates/machina/forum/forum_list.html b/machina/templates/machina/forum/forum_list.html
index ac00f087d..d85475690 100644
--- a/machina/templates/machina/forum/forum_list.html
+++ b/machina/templates/machina/forum/forum_list.html
@@ -72,16 +72,7 @@
{% if node.last_post %}
- {% if node.last_post.poster %}
- {% url 'forum_member:profile' node.last_post.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=node.last_post.poster|forum_member_display_name %}
- By:
{{ username }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with poster_username=node.last_post.username %}
- By: {{ poster_username }}
- {% endblocktrans %}
- {% endif %}
+ {% include "partials/posted_by.html" with poster=node.last_post.poster username=node.last_post.username %}
{{ node.last_post.created }}
@@ -145,16 +136,7 @@
{% trans "Forums" %}
{{ node.posts_count }}
{% if node.last_post %}
- {% if node.last_post.poster_id %}
- {% url 'forum_member:profile' node.last_post.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=node.last_post.poster|forum_member_display_name %}
- By:
{{ username }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with poster_username=node.last_post.username %}
- By: {{ poster_username }}
- {% endblocktrans %}
- {% endif %}
+ {% include "partials/posted_by.html" with poster=node.last_post.poster username=node.last_post.username %}
{{ node.last_post.created }}
diff --git a/machina/templates/machina/forum_conversation/post_create.html b/machina/templates/machina/forum_conversation/post_create.html
index ce9aeac07..9f3df7494 100644
--- a/machina/templates/machina/forum_conversation/post_create.html
+++ b/machina/templates/machina/forum_conversation/post_create.html
@@ -46,16 +46,7 @@
{{ post.subject }}
{% spaceless %}
- {% if post.poster %}
- {% url 'forum_member:profile' post.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=post.poster|forum_member_display_name creation_date=post.created %}
- By: {{ username }} on {{ creation_date }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with poster_username=post.username creation_date=post.created %}
- By: {{ poster_username }} on {{ creation_date }}
- {% endblocktrans %}
- {% endif %}
+ {% include "partials/posted_by.html" with poster=post.poster creation_date=post.created username=post.username %}
{% endspaceless %}
@@ -64,7 +55,9 @@
{{ post.subject }}
{% include "forum_conversation/forum_attachments/attachments_detail.html" %}
{% endfor %}
diff --git a/machina/templates/machina/forum_conversation/topic_detail.html b/machina/templates/machina/forum_conversation/topic_detail.html
index d1b5875de..6775ada02 100644
--- a/machina/templates/machina/forum_conversation/topic_detail.html
+++ b/machina/templates/machina/forum_conversation/topic_detail.html
@@ -45,21 +45,14 @@
{% endspaceless %}
+ {% block written_by %}
{% spaceless %}
- {% if post.poster %}
- {% url 'forum_member:profile' post.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=post.poster|forum_member_display_name creation_date=post.created %}
- By: {{ username }} on {{ creation_date }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with poster_username=post.username creation_date=post.created %}
- By: {{ poster_username }} on {{ creation_date }}
- {% endblocktrans %}
- {% endif %}
+ {% include "partials/posted_by.html" with poster=post.poster creation_date=post.created username=post.username %}
{% endspaceless %}
+ {% endblock %}
{{ post.content.rendered }}
@@ -73,7 +66,7 @@
{% if post.updates_count %}
- {% if post.updated_by %}{% trans "Last edited by:" %} {{ post.updated_by|forum_member_display_name }} {% else %}{% trans "Updated" %} {% endif %}{% trans "on" %} {{ post.updated }}, {% blocktrans count counter=post.updates_count %}edited {{counter }} time in total.{% plural %}edited {{counter }} times in total.{% endblocktrans %}
+ {% if post.updated_by %}{% trans "Last edited by:" %} {% include "partials/profile_link.html" with poster=post.updated_by %} {% else %}{% trans "Updated" %} {% endif %}{% trans "on" %} {{ post.updated }}, {% blocktrans count counter=post.updates_count %}edited {{counter }} time in total.{% plural %}edited {{counter }} times in total.{% endblocktrans %}
{% if post.update_reason %}
@@ -91,7 +84,7 @@
{% include "partials/avatar.html" with profile=post.poster.forum_profile show_placeholder=True %}
-
+
{% include "partials/profile_link.html" with poster=post.poster username_highlighted=True %}
{% trans "Posts:" %} {{ post.poster.forum_profile.posts_count }}
{% else %}
{{ post.username }}
diff --git a/machina/templates/machina/forum_conversation/topic_list.html b/machina/templates/machina/forum_conversation/topic_list.html
index f8c0305fd..13f1993c9 100644
--- a/machina/templates/machina/forum_conversation/topic_list.html
+++ b/machina/templates/machina/forum_conversation/topic_list.html
@@ -29,16 +29,7 @@
{{ topic.subject }}{% if topic.is_locked %} {% endif %}
- {% if topic.poster %}
- {% url 'forum_member:profile' topic.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=topic.poster|forum_member_display_name creation_date=topic.created %}
- By:
{{ username }} on {{ creation_date }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with poster_username=topic.first_post.username creation_date=topic.created %}
- By: {{ poster_username }} on {{ creation_date }}
- {% endblocktrans %}
- {% endif %}
+ {% include "partials/posted_by.html" with poster=topic.poster creation_date=topic.created username=topic.first_post.username %}
@@ -49,16 +40,7 @@
{{ topic.views_count }}
{% with last_post=topic.last_post %}
- {% if last_post.poster %}
- {% url 'forum_member:profile' last_post.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=last_post.poster|forum_member_display_name %}
- By:
{{ username }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with poster_username=last_post.username %}
- By: {{ poster_username }}
- {% endblocktrans %}
- {% endif %}
+ {% include "partials/posted_by.html" with poster=last_post.poster username=last_post.username %}
{{ last_post.created }}
diff --git a/machina/templates/machina/forum_member/user_posts_list.html b/machina/templates/machina/forum_member/user_posts_list.html
index b7631a47b..d660f49ad 100644
--- a/machina/templates/machina/forum_member/user_posts_list.html
+++ b/machina/templates/machina/forum_member/user_posts_list.html
@@ -46,10 +46,7 @@
{% spaceless %}
- {% url 'forum_member:profile' post.poster_id as poster_url %}
- {% blocktrans trimmed with poster_url=poster_url username=post.poster|forum_member_display_name creation_date=post.created %}
- By: {{ username }} on {{ creation_date }}
- {% endblocktrans %}
+ {% include "partials/profile_link.html" with poster=post.poster creation_date=post.created %}
{% endspaceless %}
@@ -63,7 +60,7 @@
{% include "partials/avatar.html" with profile=post.poster placeholder=False %}
-
+ {% include "partials/profile_link.html" with poster=post.poster username_highlighted=True %}
{% trans "Posts:" %} {{ post.poster.forum_profile.posts_count }}
diff --git a/machina/templates/machina/forum_moderation/moderation_queue/detail.html b/machina/templates/machina/forum_moderation/moderation_queue/detail.html
index 11131b2aa..04c054d73 100644
--- a/machina/templates/machina/forum_moderation/moderation_queue/detail.html
+++ b/machina/templates/machina/forum_moderation/moderation_queue/detail.html
@@ -81,16 +81,7 @@ {% include "partials/profile_link.html" with poster=post.poster username_highlighted=True %}