Merge tag 'release_2013-11-30' into archweb-generic

End of month release, perf fixes

4 files changed, 13 insertions, 18 deletions

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 5138f3b9..7eb7ad1b 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -110,9 +110,9 @@
                 <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
                 <td>{{ m_url.completion_pct|percentage:1 }}</td>
                 <td>{{ m_url.delay|duration|default:'unknown' }}</td>
-                <td>{{ m_url.duration_avg|floatformat:2 }}</td>
-                <td>{{ m_url.duration_stddev|floatformat:2 }}</td>
-                <td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
+                <td>{{ m_url.duration_avg|floatvalue:2 }}</td>
+                <td>{{ m_url.duration_stddev|floatvalue:2 }}</td>
+                <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td>
             </tr>
             {% endfor %}
         </tbody>
diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt
index cdbc7adb..746aae76 100644
--- a/templates/mirrors/mirrorlist_status.txt
+++ b/templates/mirrors/mirrorlist_status.txt
@@ -1,4 +1,4 @@
-{% comment %}
+{% load mirror_status %}{% comment %}
 Yes, ugly templates are ugly, but in order to keep line breaks where we want
 them, sacrifices have to be made. If editing this template, it is easiest to
 forget about where line breaks are happening until you are done getting the
@@ -9,6 +9,6 @@ content right, and then go back later to fix it all up.
 ## Generated on {% now "Y-m-d" %}
 ##
 {% for mirror_url in mirror_urls %}
-## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.country.name|default:'Worldwide' }}
+## Score: {{ mirror_url.score|floatvalue:1|default:'unknown' }}, {{ mirror_url.country.name|default:'Worldwide' }}
 #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %}
 {% endautoescape %}
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 6fc07a31..00b9c1df 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -20,9 +20,9 @@
             <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td>
             <td>{{ m_url.completion_pct|percentage:1 }}</td>
             <td>{{ m_url.delay|duration|default:'unknown' }}</td>
-            <td>{{ m_url.duration_avg|floatformat:2 }}</td>
-            <td>{{ m_url.duration_stddev|floatformat:2 }}</td>
-            <td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
+            <td>{{ m_url.duration_avg|floatvalue:2 }}</td>
+            <td>{{ m_url.duration_stddev|floatvalue:2 }}</td>
+            <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td>
         </tr>{% endfor %}
     </tbody>
 </table>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index d70b4209..bde05a50 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 %}{{ BRANDING_DISTRONAME }} - Package Differences Reports{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
@@ -45,14 +46,10 @@
                 <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 %}
@@ -78,12 +75,10 @@
         <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>