Merge tag 'release_2012-04-21'

Migrations, moving code around, random small improvements

1 files changed, 17 insertions, 6 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 00b2c70c..8e4b2bb0 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -81,7 +81,7 @@
         {% with pkg.split_packages as splits %}{% if splits %}
         <tr>
             <th>Split Packages:</th>
-            <td>{% for s in splits %}{% pkg_details_link s %}<br/>{% endfor %}</td>
+            <td class="wrap">{% for s in splits %}{% pkg_details_link s %}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
         </tr>
         {% endif %}{% endwith %}
         {% else %}
@@ -104,22 +104,33 @@
                     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>
+            <td class="wrap">{{ pkg.licenses.all|join:", " }}</td>
         </tr>
         {% with pkg.groups.all as groups %}{% if groups %}
         <tr>
             <th>Groups:</th>
-            <td>{% for g in groups %}
+            <td class="wrap">{% for g in groups %}
                 <a href="/groups/{{ pkg.arch.name }}/{{ g.name }}/"
-                    title="Group details for {{ g.name }}">{{ g.name }}</a><br/>
-                {% endfor %}
+                    title="Group details for {{ g.name }}">{{ g.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
             </td>
         </tr>
         {% endif %}{% endwith %}
         {% 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>
+            <td class="wrap">{{ provides|join:", " }}</td>
+        </tr>
+        {% endif %}{% endwith %}
+        {% with pkg.conflicts.all as conflicts %}{% if conflicts %}
+        <tr>
+            <th>Conflicts:</th>
+            <td class="wrap">{{ conflicts|join:", " }}</td>
+        </tr>
+        {% endif %}{% endwith %}
+        {% with pkg.replaces.all as replaces %}{% if replaces %}
+        <tr>
+            <th>Replaces:</th>
+            <td class="wrap">{{ replaces|join:", " }}</td>
         </tr>
         {% endif %}{% endwith %}
         <tr>