Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	media/archweb.css
	public/views.py
	urls.py

1 files changed, 21 insertions, 17 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index b1b50d6e..4fae6c68 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -26,7 +26,7 @@
                         title="Testing package details for {{ tp.pkgname }}">{{ tp.pkgver }}-{{ tp.pkgrel }}</a>
                     in testing</span></li>
                 {% endif %}{% endwith %}
-                {% if user.is_authenticated %}
+                {% if perms.main.change_package %}
                 <li><a href="unflag/" title="Unflag this package">Click here to unflag</a></li>
                 <li><a href="unflag/all/" title="Unflag all matching pkgbase">Click here to unflag all split packages</a></li>
                 {% endif %}
@@ -40,7 +40,7 @@
                 <li><a href="download/" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
             </ul>
 
-            {% if user.is_authenticated %}
+            {% if perms.main.change_package %}
             <form id="pkg-action" method="post" action="/packages/update/">{% csrf_token %}
                 <div><input type="hidden" name="pkgid" value="{{ pkg.id }}" /></div>
                 <p>{% if user in pkg.maintainers %}
@@ -108,11 +108,11 @@
             <td>{% if pkg.url %}<a href="{{ pkg.url }}"
                     title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url }}</a>{% endif %}</td>
         </tr><tr>
-            <th>License:</th>
-            <td>{{ pkg.license }}</td>
+            <th>License(s):</th>
+            <td>{{ pkg.licenses.all|join:", " }}</td>
         </tr><tr>
             <th>Groups:</th>
-            {% with pkg.packagegroup_set.all as groups %}
+            {% with pkg.groups.all as groups %}
             <td>{% if groups %}
                 {% for g in groups %}
                 <a href="/groups/{{ pkg.arch.name }}/{{ g.name }}/"
@@ -159,16 +159,18 @@
 
             {% if deps %}
             <ul>
-            {% for depend in deps %}
-            {% ifequal depend.pkg None %}
-                <li>{{ depend.dep.depname }} (virtual)</li>
-            {% else %}
+                {% for depend in deps %}
+                {% ifequal depend.pkg None %}
+                <li>{{ depend.dep.depname }} <span class="virtual-dep">(virtual)</span></li>
+                {% else %}
                 <li><a href="{{ depend.pkg.get_absolute_url }}"
-                    title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}</a>
-                    {{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %}
-                    <span class="testing-dep">(testing)</span>{% endif %}</li>
-            {% endifequal %}
-            {% endfor %}
+                    title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}</a>{{ 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 %}
 
@@ -184,9 +186,11 @@
             {% if rqdby %}
             <ul>
                 {% for req in rqdby %}
-                <li><a href="{{req.get_absolute_url}}"
-                    title="View package details for {{ req.pkgname }}">{{ req.pkgname }}</a>
-                    {% if req.repo.testing %} (testing){% endif %}</li>
+                <li><a href="{{ req.pkg.get_absolute_url }}"
+                    title="View package details for {{ req.pkg.pkgname }}">{{ req.pkg.pkgname }}</a>
+                {% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
+                {% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
+                </li>
                 {% endfor %}
             </ul>
             {% endif %}