From 9781a4fbfdfb19756ce72352f895ac0c44cf4c7c Mon Sep 17 00:00:00 2001
From: Ricky Rosario <rickyrosario@gmail.com>
Date: Fri, 16 Nov 2012 09:18:55 -0500
Subject: [PATCH] [bug 803484] Linkify usernames on /flagged page.

---
 .../templates/flagit/includes/flagged_answer.html | 15 +++++++++++----
 .../templates/flagit/includes/flagged_post.html   | 13 ++++++++++---
 .../flagit/includes/flagged_profile.html          |  5 ++++-
 .../flagit/includes/flagged_question.html         | 13 ++++++++++---
 apps/flagit/templates/flagit/includes/macros.html |  5 +++++
 5 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 apps/flagit/templates/flagit/includes/macros.html

diff --git a/apps/flagit/templates/flagit/includes/flagged_answer.html b/apps/flagit/templates/flagit/includes/flagged_answer.html
index 028dd579f27..bed88d88f9b 100644
--- a/apps/flagit/templates/flagit/includes/flagged_answer.html
+++ b/apps/flagit/templates/flagit/includes/flagged_answer.html
@@ -1,13 +1,20 @@
+{% from 'flagit/includes/macros.html' import date_by_user with context %}
 <h3>{{ _('Content:') }}</h3>
 <div class="content">{{ object.content_object.content_parsed }}</div>
 <h3>{{ _('Created:') }}</h3>
-<p class="created">{{ _('{date} by {user}')|fe(user=object.content_object.creator, date=datetimeformat(object.content_object.created, format='longdatetime')) }}</p>
+<p class="created">
+  {{ date_by_user(object.content_object.created, object.content_object.creator) }}
+</p>
 {% if object.content_object.updated_by %}
   <h3>{{ _('Updated:') }}</h3>
-  <p class="updated">{{ _('{date} by {user}')|fe(user=object.content_object.updated_by, date=datetimeformat(object.content_object.updated, format='longdatetime')) }}</p>
+  <p class="updated">
+    {{ date_by_user(object.content_object.updated, object.content_object.updated_by) }}
+  </p>
 {% endif %}
 <h3>{{ _('Flagged:') }}</h3>
-<p class="flagged">{{ _('{date} by {user}')|fe(user=object.creator, date=datetimeformat(object.created, format='longdatetime')) }}</p>
+<p class="flagged">
+  {{ date_by_user(object.created, object.creator) }}
+</p>
 <h3>{{ _('Take Action:') }}</h3>
 <div class="actions">
   <a href="{{ object.content_object.get_absolute_url() }}">View</a>
@@ -17,4 +24,4 @@ <h3>{{ _('Take Action:') }}</h3>
   {% if user.has_perm('questions.delete_question') %}
     <a class="delete" href="{{ url('questions.delete_answer', object.content_object.question.id, object.content_object.id) }}">{{ _('Delete') }}</a>
   {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/flagit/templates/flagit/includes/flagged_post.html b/apps/flagit/templates/flagit/includes/flagged_post.html
index 3a8c3c5435f..6ed041fa833 100644
--- a/apps/flagit/templates/flagit/includes/flagged_post.html
+++ b/apps/flagit/templates/flagit/includes/flagged_post.html
@@ -1,15 +1,22 @@
+{% from 'flagit/includes/macros.html' import date_by_user with context %}
 <h3>{{ _('Title:') }}</h3>
 <p class="title">{{ object.content_object.thread.title }}</p>
 <h3>{{ _('Content:') }}</h3>
 <div class="content">{{ object.content_object.content_parsed }}</div>
 <h3>{{ _('Created:') }}</h3>
-<p class="created">{{ _('{date} by {user}')|fe(user=object.content_object.creator, date=datetimeformat(object.content_object.created, format='longdatetime')) }}</p>
+<p class="created">
+  {{ date_by_user(object.content_object.created, object.content_object.creator) }}
+</p>
 {% if object.content_object.updated_by %}
   <h3>{{ _('Updated:') }}</h3>
-  <p class="updated">{{ _('{date} by {user}')|fe(user=object.content_object.updated_by, date=datetimeformat(object.content_object.updated, format='longdatetime')) }}</p>
+  <p class="updated">
+    {{ date_by_user(object.content_object.updated, object.content_object.updated_by) }}
+  </p>
 {% endif %}
 <h3>{{ _('Flagged:') }}</h3>
-<p class="flagged">{{ _('{date} by {user}')|fe(user=object.creator, date=datetimeformat(object.created, format='longdatetime')) }}</p>
+<p class="flagged">
+  {{ date_by_user(object.created, object.creator) }}
+</p>
 <h3>{{ _('Take Action:') }}</h3>
 <div class="actions">
   <a href="{{ object.content_object.get_absolute_url() }}">View</a>
diff --git a/apps/flagit/templates/flagit/includes/flagged_profile.html b/apps/flagit/templates/flagit/includes/flagged_profile.html
index cef72673f82..5be5725c9a1 100644
--- a/apps/flagit/templates/flagit/includes/flagged_profile.html
+++ b/apps/flagit/templates/flagit/includes/flagged_profile.html
@@ -1,10 +1,13 @@
+{% from 'flagit/includes/macros.html' import date_by_user with context %}
 <h3>{{ _('Content:') }}</h3>
 <div class="content">
   <h2>{{ object.content_object }}</h2>
   {{ object.content_object.bio|wiki_to_html(nofollow=True) }}
 </div>
 <h3>{{ _('Flagged:') }}</h3>
-<p class="flagged">{{ _('{date} by {user}')|fe(user=object.creator, date=datetimeformat(object.created, format='longdatetime')) }}</p>
+<p class="flagged">
+  {{ date_by_user(object.created, object.creator) }}
+</p>
 <h3>{{ _('Take Action:') }}</h3>
 <div class="actions">
   <a href="{{ object.content_object.get_absolute_url() }}">View</a>
diff --git a/apps/flagit/templates/flagit/includes/flagged_question.html b/apps/flagit/templates/flagit/includes/flagged_question.html
index 58751f04bd0..b061336fd09 100644
--- a/apps/flagit/templates/flagit/includes/flagged_question.html
+++ b/apps/flagit/templates/flagit/includes/flagged_question.html
@@ -1,15 +1,22 @@
+{% from 'flagit/includes/macros.html' import date_by_user with context %}
 <h3>{{ _('Title:') }}</h3>
 <p class="title">{{ object.content_object.title }}</p>
 <h3>{{ _('Content:') }}</h3>
 <div class="content">{{ object.content_object.content_parsed }}</div>
 <h3>{{ _('Created:') }}</h3>
-<p class="created">{{ _('{date} by {user}')|fe(user=object.content_object.creator, date=datetimeformat(object.content_object.created, format='longdatetime')) }}</p>
+<p class="created">
+  {{ date_by_user(object.content_object.created, object.content_object.creator) }}
+</p>
 {% if object.content_object.updated_by %}
   <h3>{{ _('Updated:') }}</h3>
-  <p class="updated">{{ _('{date} by {user}')|fe(user=object.content_object.updated_by, date=datetimeformat(object.content_object.updated, format='longdatetime')) }}</p>
+  <p class="updated">
+    {{ date_by_user(object.content_object.updated, object.content_object.updated_by) }}
+  </p>
 {% endif %}
 <h3>{{ _('Flagged:') }}</h3>
-<p class="flagged">{{ _('{date} by {user}')|fe(user=object.creator, date=datetimeformat(object.created, format='longdatetime')) }}</p>
+<p class="flagged">
+  {{ date_by_user(object.created, object.creator) }}
+</p>
 <h3>{{ _('Take Action:') }}</h3>
 <div class="actions">
   <a href="{{ object.content_object.get_absolute_url() }}">View</a>
diff --git a/apps/flagit/templates/flagit/includes/macros.html b/apps/flagit/templates/flagit/includes/macros.html
new file mode 100644
index 00000000000..5d6a3416c31
--- /dev/null
+++ b/apps/flagit/templates/flagit/includes/macros.html
@@ -0,0 +1,5 @@
+{% macro date_by_user(date, user) -%}
+  {% trans date=datetimeformat(date, format='longdatetime'), user=user.username, url=profile_url(user) %}
+    {{date}} by <a href="{{url}}">{{user}}</a>
+  {% endtrans %}
+{%- endmacro %}