Merge tag 'release_2014-10-19' into archweb-generic

Jinja2 switch for some templates, exact matches in package search

# Conflicts:
#	templates/packages/search.html

1 files changed, 6 insertions, 6 deletions

diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index 91ea033e..949b563e 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -37,7 +37,7 @@
                 <td>{{ relation.created }}</td>
             </tr>
             {% empty %}
-                <tr class="empty"><td colspan="5"><em>No inactive user relations.</em></td></tr>
+                <tr class="empty"><td colspan="6"><em>No inactive user relations.</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -66,7 +66,7 @@
                 <td>{{ relation.last_update.created }}</td>
             </tr>
             {% empty %}
-                <tr class="empty"><td colspan="4"><em>No non-existent pkgbase relations.</em></td></tr>
+                <tr class="empty"><td colspan="6"><em>No non-existent pkgbase relations.</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -100,7 +100,7 @@
                 <td class="wrap">{{ relation.repositories|join:", " }}</td>
             </tr>
             {% empty %}
-                <tr class="empty"><td colspan="6"><em>No relations with wrong permissions.</em></td></tr>
+                <tr class="empty"><td colspan="7"><em>No relations with wrong permissions.</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -117,13 +117,13 @@
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $('#inactive-user:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false } }, sortList: [[3,0]]});
+    $('#inactive-user:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false }, 2: { sorter: false } }, sortList: [[1,0]]});
     $('#missing-pkgbase:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false } }, sortList: [[1,0]]});
-});
-    $('#wrong-permissions:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false } }, sortList: [[3,0]]});
+    $('#wrong-permissions:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false }, 2: { sorter: false } }, sortList: [[1,0]]});
     $('table.results').bind('sortEnd', function() {
         $('input.relation-checkbox').enableCheckboxRangeSelection();
     });
     $('input.relation-checkbox').enableCheckboxRangeSelection();
+});
 </script>
 {% endblock %}