Merged with archweb trunk

1 files changed, 26 insertions, 15 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 068d1f1a..ef501c83 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load cache %}
+{% load package_extras %}
 
 {% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} - Package Details{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
@@ -18,6 +19,7 @@
                 <li><a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
                 <li><a href="{% bug_report pkg %}" title="Report bug for {{ pkg.pkgname }}">Report a Bug</a></li>
                 <li><a href="{% flag_unfree pkg %}" title="Report {{ pkg.pkgname }} as unfree">Report as unfree</a></li>
+                <li><a href="{% get_wiki_link pkg %}" title="Search wiki for {{ pkg.pkgname }}">Search Wiki</a></li>
                 {% if pkg.flag_date %}
                 <li><span class="flagged">Flagged out-of-date on {{ pkg.flag_date|date }}</span></li>
                 {% with pkg.in_testing as tp %}{% if tp %}
@@ -37,6 +39,7 @@
                     onclick="return !window.open('/packages/flaghelp/','FlagHelp',
                     'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li>
                 {% endif %}
+                <li><a href="download/" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
             </ul>
 
             {% if perms.main.change_package %}
@@ -80,20 +83,14 @@
         {% with pkg.split_packages as splits %}{% if splits %}
         <tr>
             <th>Split Packages:</th>
-            <td>
-                {% for s in splits %}
-                <a href="{{ s.get_absolute_url }}"
-                    title="Package details for {{ s.pkgname }}">{{ s.pkgname }}</a><br/>
-                {% endfor %}
-            </td>
+            <td>{% for s in splits %}{% pkg_details_link s %}<br/>{% endfor %}</td>
         </tr>
         {% endif %}{% endwith %}
         {% else %}
         <tr>
             <th>Base Package:</th>
             {% if pkg.base_package %}
-            <td><a href="{{ pkg.base_package.get_absolute_url }}"
-                    title="Package details for {{ pkg.base_package.pkgname }}">{{ pkg.pkgbase }}</a></td>
+            <td>{% pkg_details_link pkg.base_package %}</td>
             {% else %}
             <td><a href="../{{ pkg.pkgbase }}/"
                     title="Split package details for {{ pkg.pkgbase }}">{{ pkg.pkgbase }}</a></td>
@@ -106,7 +103,7 @@
         </tr><tr>
             <th>Upstream URL:</th>
             <td>{% if pkg.url %}<a href="{{ pkg.url }}"
-                    title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url }}</a>{% endif %}</td>
+                    title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td>
         </tr><tr>
             <th>License(s):</th>
             <td>{{ pkg.licenses.all|join:", " }}</td>
@@ -121,7 +118,16 @@
                 {% else %}None{% endif %}
             </td>
             {% endwith %}
-         </tr><tr>
+        </tr>
+        {% with pkg.provides.all as provides %}
+        {% if provides %}
+        <tr>
+            <th>Provides:</th>
+            <td>{% for p in provides %}{{ p.name }}{% if p.version %}={{ p.version }}{% endif %}<br/>{% endfor %}</td>
+        </tr>
+        {% endif %}
+        {% endwith %}
+        <tr>
             <th>Maintainers:</th>
             {% with pkg.maintainers as maints %}
             <td>{% if maints %}
@@ -141,6 +147,9 @@
             <th>Last Packager:</th>
             <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% userpkgs pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td>
         </tr><tr>
+            <th>Signed:</th>
+            <td>{{ pkg.is_signed|yesno|capfirst }}</td>
+        </tr><tr>
             <th>Build Date:</th>
             <td>{{ pkg.build_date|date:"DATETIME_FORMAT" }} UTC</td>
         </tr><tr>
@@ -161,10 +170,12 @@
             <ul>
                 {% for depend in deps %}
                 {% ifequal depend.pkg None %}
-                <li>{{ depend.dep.depname }} <span class="virtual-dep">(virtual)</span></li>
+                {% 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><a href="{{ depend.pkg.get_absolute_url }}"
-                    title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}</a>{{ depend.dep.depvcmp|default:"" }}
+                <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 %}
@@ -186,8 +197,8 @@
             {% if rqdby %}
             <ul>
                 {% for req in rqdby %}
-                <li><a href="{{ req.pkg.get_absolute_url }}"
-                    title="View package details for {{ req.pkg.pkgname }}">{{ req.pkg.pkgname }}</a>
+                <li>{% pkg_details_link req.pkg %}
+                {% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
                 {% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
                 {% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
                 </li>