changeset 2644:80be9ab7c2ad

merge
author RogerHaase <haaserd@gmail.com>
date Sun, 29 Jun 2014 09:13:14 -0700
parents fee0bfbbed08 (current diff) 647ee04f863e (diff)
children 73106ad93096
files
diffstat 9 files changed, 41 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/js/tickets.js	Sun Jun 29 09:10:52 2014 -0700
+++ b/MoinMoin/static/js/tickets.js	Sun Jun 29 09:13:14 2014 -0700
@@ -25,7 +25,7 @@
             }
         };
     }
-    
+
     var table = document.getElementById('ticket-list');
     var cols = table.rows[0].cells.length;
     var columns = table.getElementsByTagName("td");
@@ -36,5 +36,6 @@
         }
     }
 
+    $("#ticket-list").tablesorter();
+
 });
-
--- a/MoinMoin/templates/tickets.html	Sun Jun 29 09:10:52 2014 -0700
+++ b/MoinMoin/templates/tickets.html	Sun Jun 29 09:13:14 2014 -0700
@@ -83,6 +83,6 @@
 {% endblock %}
 {% block body_scripts %}
 {{ super() }}
+    <script src="{{ url_for('serve.files', name='jquery_tablesorter', filename='jquery.tablesorter.js') }}"></script>
     <script src="{{ url_for('static', filename='js/tickets.js') }}"></script>
 {% endblock %}
-
--- a/MoinMoin/themes/basic/static/css/basic.css	Sun Jun 29 09:10:52 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/basic.css	Sun Jun 29 09:13:14 2014 -0700
@@ -6357,9 +6357,10 @@
   position: absolute;
 }
 #ticket-list thead th:hover {
-  background: #e8e8e8;
-}
-#ticket-list tr td {
+  background-color: #e8e8e8;
+}
+#ticket-list tr td,
+#ticket-list thead th {
   cursor: pointer;
 }
 #ticket-list tr td:first-child a {
@@ -6371,13 +6372,25 @@
   text-shadow: 0 1px 0 #fff;
   border: 1px solid transparent;
 }
-.ticket-query-button.active, .ticket-query-button:hover {
-  background: -webkit-linear-gradient(top,#ccc 0,#ddd 13%);
+.ticket-query-button.active,
+.ticket-query-button:hover {
+  background: -webkit-linear-gradient(top, #cccccc 0, #dddddd 13%);
   color: #333;
   box-sizing: border-box;
   border: 1px solid transparent;
   border-radius: 3px;
 }
 .moin-ticketsearch-form {
- display: inline;
-}
+  display: inline;
+}
+.tablesorter-header {
+  background-image: url('../img/bg.png');
+  background-repeat: no-repeat;
+  background-position: right center;
+}
+.tablesorter-headerAsc {
+  background-image: url('../img/asc.png');
+}
+.tablesorter-headerDesc {
+  background-image: url('../img/desc.png');
+}
--- a/MoinMoin/themes/basic/static/custom-less/basic.less	Sun Jun 29 09:10:52 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/basic.less	Sun Jun 29 09:13:14 2014 -0700
@@ -331,9 +331,9 @@
   position: absolute;
 }
 #ticket-list thead th:hover {
-  background: #e8e8e8;
+  background-color: #e8e8e8;
 }
-#ticket-list tr td {
+#ticket-list tr td, #ticket-list thead th {
   cursor: pointer;
 }
 #ticket-list tr td:first-child a {
@@ -346,12 +346,23 @@
   border: 1px solid transparent;
 }
 .ticket-query-button.active, .ticket-query-button:hover {
-  background: -webkit-linear-gradient(top,#ccc 0,#ddd 13%);
+  background: -webkit-linear-gradient(top, #cccccc 0, #dddddd 13%); 
   color: #333;
   box-sizing: border-box;
   border: 1px solid transparent;
   border-radius: 3px;
 }
 .moin-ticketsearch-form {
- display: inline;
+  display: inline;
 }
+.tablesorter-header {
+  background-image: url('../img/bg.png');
+  background-repeat: no-repeat;
+  background-position: right center;
+}
+.tablesorter-headerAsc {
+  background-image: url('../img/asc.png');
+}
+.tablesorter-headerDesc {
+  background-image: url('../img/desc.png');
+}
Binary file MoinMoin/themes/basic/static/img/asc.png has changed
Binary file MoinMoin/themes/basic/static/img/bg.png has changed
Binary file MoinMoin/themes/basic/static/img/desc.png has changed
--- a/setup.py	Sun Jun 29 09:10:52 2014 -0700
+++ b/setup.py	Sun Jun 29 09:13:14 2014 -0700
@@ -112,6 +112,7 @@
         'XStatic-TWikiDraw-moin>=2004.10.23.2',
         'XStatic-AnyWikiDraw>=0.14.2',
         'XStatic-svg-edit-moin>=2012.11.15.1',
+        'XStatic-JQuery.TableSorter>=2.14.5.1',
     ],
     # optional features and their list of requirements
     extras_require={
--- a/wikiconfig.py	Sun Jun 29 09:10:52 2014 -0700
+++ b/wikiconfig.py	Sun Jun 29 09:13:14 2014 -0700
@@ -68,6 +68,7 @@
         'ckeditor',
         'autosize',
         'svgedit_moin', 'twikidraw_moin', 'anywikidraw',
+        'jquery_tablesorter',
     ]
     pkg = __import__('xstatic.pkg', fromlist=mod_names)
     for mod_name in mod_names: