Merge tag 'release_2012-04-21'

Migrations, moving code around, random small improvements

4 files changed, 25 insertions, 8 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index cda510e4..9f897317 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -148,7 +148,7 @@
     <h3>Developer Reports</h3>
     <ul>
         <li><a href="reports/old/">Old</a>:
-        Packages last built more than two years ago
+        Packages last built more than one year ago
         (<a href="reports/old/{{ user.username }}/">yours only</a>)</li>
         <li><a href="reports/long-out-of-date/">Long Out-of-date</a>:
         Packages marked out-of-date more than 90 days ago
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>
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index ca5a8c08..447ba487 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -6,6 +6,12 @@
 <div class="box">
     <h2>Failures and Successes for Testing ISOs</h2>
 
+    <p>This is an overview showing all current or tested release engineering
+    produced ISOs. Past but now unavailable ISOs are ommitted if there were
+    never any testing results submitted. To help improve ISO quality, you are
+    encouraged to <a href="{% url 'releng-test-submit' %}">give feedback</a>
+    if you have tested and used any ISOs. Both successful and failed results
+    are encouraged and welcome.</p>
     <p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
 
     <table id="releng-result" class="results">
diff --git a/templates/releng/results.html b/templates/releng/results.html
index fa694cc6..49d81ec4 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -7,7 +7,7 @@
 <div class="box">
     <h2>Release Engineering Testbuild Results</h2>
 
-    <p>This is an overview screen showing a test results matrix of release
+    <p>This is an overview showing a test results matrix of release
     engineering produced ISOs. Various options and configurations are shown
     with last success and last failure results, if known. To help improve ISO
     quality, you are encouraged to <a href="{% url 'releng-test-submit' %}">give feedback</a>