Merge tag 'release_2012-02-06'

Quick feature fixups and bugfixes

3 files changed, 31 insertions, 37 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index 3853243c..3f36f43e 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -16,6 +16,7 @@
             <tr>
                 <th>Name</th>
                 <th>Version</th>
+                <th>Testing Version</th>
                 <th>Repo</th>
                 <th>Arch</th>
                 <th>Flagged</th>
@@ -27,6 +28,10 @@
                 <tr class="{% cycle 'odd' 'even' %}">
                     <td>{% pkg_details_link pkg %}</td>
                     <td>{{ pkg.full_version }}</td>
+                    <td>{% with pkg.in_testing as tp %}{% if tp %}
+                        <a href="{{ tp.get_absolute_url }}"
+                            title="Testing package details for {{ tp.pkgname }}">{{ tp.full_version }}</a>
+                        {% endif %}{% endwith %}</td>
                     <td>{{ pkg.repo.name }}</td>
                     <td>{{ pkg.arch.name }}</td>
                     <td>{{ pkg.flag_date|date }}</td>
diff --git a/templates/packages/details.html b/templates/packages/details.html
index db6d3ebb..9372a231 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -66,7 +66,7 @@
         </div>
         {% endif %}{% endwith %}
 
-    </div><!-- #actionlist -->
+    </div>
 
     {% cache 300 package-details-pkginfo pkg.id %}
     <table id="pkginfo">
@@ -162,40 +162,19 @@
 
         {% with pkg.get_depends as deps %}
         <div id="pkgdeps" class="listing">
-
             <h3 title="{{ pkg.pkgname }} has the following dependencies">
                 Dependencies ({{deps|length}})</h3>
-
-            {% if deps %}
-            <ul>
-                {% for depend in deps %}
-                {% ifequal depend.pkg None %}
-                {% if depend.providers %}
-                <li>{{ depend.dep.depname }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span></li>
-                {% else %}<li>{{ depend.dep.depname }} <span class="virtual-dep">(virtual)</span></li>
-                {% endif %}
-                {% else %}
-                <li>{% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|default:"" }}
-                {% if depend.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
-                {% if depend.dep.optional %}<span class="opt-dep">(optional)</span>{% endif %}
-                {% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %}
-                </li>
-                {% endifequal %}
-                {% endfor %}
-            </ul>
-            {% endif %}
-
-        </div><!-- #pkgdeps -->
+            {% if deps %}<ul>
+                {% for depend in deps %}{% include "packages/details_depend.html" %}{% endfor %}
+            </ul>{% endif %}
+        </div>
         {% endwith %}
 
         {% with pkg.get_requiredby as rqdby %}
         <div id="pkgreqs" class="listing">
-
             <h3 title="Packages that require {{ pkg.pkgname }}">
                 Required By ({{rqdby|length}})</h3>
-
-            {% if rqdby %}
-            <ul>
+            {% if rqdby %}<ul>
                 {% for req in rqdby %}
                 <li>{% pkg_details_link req.pkg %}
                 {% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
@@ -203,29 +182,24 @@
                 {% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
                 </li>
                 {% endfor %}
-            </ul>
-            {% endif %}
-
-        </div><!-- #pkgreqs -->
+            </ul>{% endif %}
+        </div>
         {% endwith %}
 
         <div id="pkgfiles" class="listing">
-
             <h3 title="Complete list of files contained within this package">
                 Package Contents</h3>
-
             <div id="pkgfilelist">
                 <p><a id="filelink" href="files/"
                     title="Click to view the complete file list for {{ pkg.pkgname }}">
                     View the file list for {{ pkg.pkgname }}</a></p>
             </div>
+        </div>
 
-        </div><!-- #pkgfiles -->
-
-    </div><!-- #metadata -->
+    </div>
     {% endcache %}
 
-</div><!-- #pkgdetails -->
+</div>
 
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html
new file mode 100644
index 00000000..0226dd25
--- /dev/null
+++ b/templates/packages/details_depend.html
@@ -0,0 +1,15 @@
+{% load package_extras %}
+<li>
+{% ifequal depend.pkg None %}
+{% if depend.providers %}
+{{ depend.dep.depname }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span>
+{% else %}
+{{ depend.dep.depname }} <span class="virtual-dep">(virtual)</span>
+{% endif %}
+{% else %}
+{% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|default:"" }}
+{% if depend.pkg.repo.testing %} <span class="testing-dep">(testing)</span>{% endif %}
+{% endifequal %}
+{% if depend.dep.optional %} <span class="opt-dep">(optional)</span>{% endif %}
+{% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %}
+</li>