From e557545ca803fa215b3a7f43f4c421dff1259fe3 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 27 Nov 2013 16:00:49 -0500
Subject: Use pkg_details_link tag on differences report page

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/differences.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'templates/packages/differences.html')

diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index f137126d..f4d93151 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load cycle from future %}
 {% load static from staticfiles %}
+{% load package_extras %}
 
 {% block title %}Arch Linux - Package Differences Reports{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
@@ -78,12 +79,10 @@ <h2>Multilib Differences to Main Packages</h2>
         <tbody>
             {% for pkg1, pkg2 in multilib_differences %}
             <tr class="{% cycle 'odd' 'even' %}">
-                <td><a href="{{ pkg1.get_absolute_url }}"
-                        title="View package details for {{ pkg1.pkgname }}">{{ pkg1.pkgname }}</a></td>
+                <td>{% pkg_details_link pkg1 %}</td>
                 <td><span{% if pkg1.flag_date %} class="flagged"{% endif %}>{{ pkg1.full_version }}</span></td>
                 <td><span{% if pkg2.flag_date %} class="flagged"{% endif %}>{{ pkg2.full_version }}</span></td>
-                <td><a href="{{ pkg2.get_absolute_url }}"
-                        title="View package details for {{ pkg2.pkgname }}">{{ pkg2.pkgname }}</a></td>
+                <td>{% pkg_details_link pkg2 %}</td>
                 <td>{{ pkg2.repo }}</td>
                 <td>{{ pkg1.last_update|date }}</td>
                 <td>{{ pkg2.last_update|date }}</td>
-- 
cgit v1.2.3-54-g00ecf


From 58356ec5b38c71204895eb77856a45ffd7ac1725 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 27 Nov 2013 16:07:49 -0500
Subject: Allow pkg_details_link to honor package flag state

This allows the tag to be used in a few more places we weren't already
able to use it, and hopefully speeds up rendering a tad on the package
differences page.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/templatetags/package_extras.py | 7 +++++--
 templates/packages/differences.html     | 8 ++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'templates/packages/differences.html')

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index f7392a96..3ce64748 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -67,13 +67,16 @@ def do_buildsortqs(parser, token):
 
 
 @register.simple_tag
-def pkg_details_link(pkg, link_title=None):
+def pkg_details_link(pkg, link_title=None, honor_flagged=False):
     if not pkg:
         return link_title or ''
     if link_title is None:
         link_title = pkg.pkgname
+    link_content = link_title
+    if honor_flagged and pkg.flag_date:
+        link_content = '<span class="flagged">%s</span>' % link_title
     link = '<a href="%s" title="View package details for %s">%s</a>'
-    return link % (pkg.get_absolute_url(), pkg.pkgname, link_title)
+    return link % (pkg.get_absolute_url(), pkg.pkgname, link_content)
 
 
 @register.simple_tag
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index f4d93151..5ebe18e2 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -46,14 +46,10 @@ <h3>Filter Differences View</h3>
                 <td>{{ diff.pkgname }}</td>
                 <td>{{ diff.repo.name }}</td>
                 {% if diff.pkg_a %}
-                <td><a href="{{ diff.pkg_a.get_absolute_url }}"
-                        title="View package details for {{ diff.pkg_a.pkgname }}">
-                        <span{% if diff.pkg_a.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_a.full_version }}</span></a></td>
+                <td>{% pkg_details_link diff.pkg_a diff.pkg_a.full_version True %}</td>
                 {% else %}<td>-</td>{% endif %}
                 {% if diff.pkg_b %}
-                <td><a href="{{ diff.pkg_b.get_absolute_url }}"
-                        title="View package details for {{ diff.pkg_b.pkgname }}">
-                        <span{% if diff.pkg_b.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_b.full_version }}</span></a></td>
+                <td>{% pkg_details_link diff.pkg_b diff.pkg_b.full_version True %}</td>
                 {% else %}<td>-</td>{% endif %}
             </tr>
             {% endfor %}
-- 
cgit v1.2.3-54-g00ecf