Merge tag 'release_2012-01-11'

Pkgbase view in todos, other changes related to caching

Conflicts:
	public/views.py

3 files changed, 15 insertions, 6 deletions

diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index 3e635f56..4e814450 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -23,7 +23,7 @@
         <tbody>
             {% for relation in inactive_user %}
             <tr class="{% cycle 'odd' 'even' %}">
-                <td><input type="checkbox" name="relation_id" value="{{ relation.id }}" /></td>
+                <td><input type="checkbox" class="relation-checkbox" name="relation_id" value="{{ relation.id }}" /></td>
                 <td>{{ relation.pkgbase }}</td>
                 <td class="wrap">{% for pkg in relation.get_associated_packages %}
                     <a href="{{ pkg.get_absolute_url }}"
@@ -54,7 +54,7 @@
         <tbody>
             {% for relation in missing_pkgbase %}
             <tr class="{% cycle 'odd' 'even' %}">
-                <td><input type="checkbox" name="relation_id" value="{{ relation.id }}" /></td>
+                <td><input type="checkbox" class="relation-checkbox" name="relation_id" value="{{ relation.id }}" /></td>
                 <td>{{ relation.pkgbase }}</td>
                 <td>{{ relation.user.get_full_name }}</td>
                 <td>{{ relation.get_type_display }}</td>
@@ -83,7 +83,7 @@
         <tbody>
             {% for relation in wrong_permissions %}
             <tr class="{% cycle 'odd' 'even' %}">
-                <td><input type="checkbox" name="relation_id" value="{{ relation.id }}" /></td>
+                <td><input type="checkbox" class="relation-checkbox" name="relation_id" value="{{ relation.id }}" /></td>
                 <td>{{ relation.pkgbase }}</td>
                 <td class="wrap">{% for pkg in relation.get_associated_packages %}
                     <a href="{{ pkg.get_absolute_url }}"
@@ -114,5 +114,9 @@ $(document).ready(function() {
     $('#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]]});
+    $('table.results').bind('sortEnd', function() {
+        $('input.relation-checkbox').enableCheckboxRangeSelection();
+    });
+    $('input.relation-checkbox').enableCheckboxRangeSelection();
 </script>
 {% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index 81c03090..971b5298 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -152,10 +152,10 @@
 
     <ul>
         <li><a href="{% url page-keys %}"
-            title="Package/Database signing master keys">Master Keys</a></li>
-        <li><a href="/packages/"
-            title="View/search the package repository database">Packages</a>
+            title="Package/Database signing master keys">Master Keys</a>
         <img src="{% cdnprefix %}/media/new.png" alt="New"/></li>
+        <li><a href="/packages/"
+            title="View/search the package repository database">Packages</a></li>
         <li><a href="/groups/"
             title="View the available package groups">Package Groups</a></li>
         <li><a href="{% url visualize-index %}"
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 14db4357..612f2902 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -23,6 +23,11 @@
 
     <div>{{list.description|urlize|linebreaks}}</div>
 
+    <p>Link to lists of pkgbase values:</p>
+    <ul>{% for svn_root in svn_roots %}
+        <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
+    {% endfor %}</ul>
+
     <table id="dev-todo-pkglist" class="results todo-table">
         <thead>
             <tr>