Reformat filtering and introduce filtering shortcuts

diff --git a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js b/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
index c5944332d45384c6537a3631ab4f7f614b307db0..1fd5d04ad2e005306eae8d69fc9c802856b96a1c 100644 (file)
--- a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
+++ b/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
@@ -116,3 +116,8 @@ function sortpatches(sortby) {
 
    return false;
 }
+
+function toggleButtonCollapse(buttonId, collapseId) {
+   $('#' + buttonId).button('toggle');
+   $('#' + collapseId).toggleClass('in')
+}

diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index 6010b81c2bd729c6dac37a38b66e474f933bbf81..5d6f4058b327f5248387e3eb5d1ec5977cdcb1ac 100644 (file)
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -37,6 +37,7 @@
 <script src="/static/commitfest/js/bootstrap-collapse.js"></script>
 <script src="/static/commitfest/js/jquery-ui.js"></script>
 <script type="text/javascript" src="/static/selectable/js/jquery.dj.selectable.js"></script>
+<script src="/static/commitfest/js/bootstrap-button.js"></script>
 <script src="/static/commitfest/js/commitfest.js"></script>
 {%block morescript%}{%endblock%}
 </html>

diff --git a/pgcommitfest/commitfest/templates/commitfest.html b/pgcommitfest/commitfest/templates/commitfest.html
index f9868b08a1e178c7f3f03bc1eddd104e06a35807..995069c2c93bd67094a13803f19afbb3b245b1fc 100644 (file)
--- a/pgcommitfest/commitfest/templates/commitfest.html
+++ b/pgcommitfest/commitfest/templates/commitfest.html
@@ -2,14 +2,16 @@
 {%load commitfest %}
 {%block contents%}
 
-<div class="accordion" id="filteraccordion">
- <div class="accordion-group">
-  <div class="accordion-heading">
-    <div class="accordion-toggle" data-toggle="collapse" data-parent="#filteraccordion" href="#collapseFilters" style="padding: 4px;">
-      <div class="btn">Filter/search</div>
-    </div>
-  </div>
-  <div id="collapseFilters" class="accordion-body collapse {%if has_filter%}in{%endif%}">
+<button type="button" class="btn{%if has_filter%} active{%endif%}" id="filterButton" onClick="toggleButtonCollapse('filterButton', 'collapseFilters')">Search/filter</button>
+<div class="btn-group">
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Shortcuts <span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <li><a href="?reviewer=-2">Patches with no reviewers</a></li>
+    <li><a href="?author=-3">Patches where you are author</a></li>
+    <li><a href="?reviewer=-3">Patches where you are reviwer</a></li>
+  </ul>
+</div>
+<div id="collapseFilters" class="collapse {%if has_filter%}in{%endif%}">
     <form id="filterform" method="GET" action="." style="margin-bottom: 0px">
       <table class="table table-condensed" style="margin-bottom: 0px">
        <thead>
@@ -33,7 +35,6 @@
        </tbody>
       </table>
     </form>
-  </div>
 </div>
 
 {%for p in patches %}