diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css index 4425523..967ec05 100644 --- a/apimanager/base/static/css/base.css +++ b/apimanager/base/static/css/base.css @@ -108,3 +108,23 @@ footer a:hover, .footer a:focus { div.filter { display: inline; } + + +table.tablesorter td { + min-width: 40px; +} +table.tablesorter thead tr .header { + background-image: url(../img/tablesorter/bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.tablesorter thead tr .headerSortUp { + background-image: url(../img/tablesorter/asc.gif); +} +table.tablesorter thead tr .headerSortDown { + background-image: url(../img/tablesorter/desc.gif); +} +table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { + background-color: #e6e6e6; +} diff --git a/apimanager/base/static/img/tablesorter/asc.gif b/apimanager/base/static/img/tablesorter/asc.gif new file mode 100644 index 0000000..7415786 Binary files /dev/null and b/apimanager/base/static/img/tablesorter/asc.gif differ diff --git a/apimanager/base/static/img/tablesorter/bg.gif b/apimanager/base/static/img/tablesorter/bg.gif new file mode 100644 index 0000000..fac668f Binary files /dev/null and b/apimanager/base/static/img/tablesorter/bg.gif differ diff --git a/apimanager/base/static/img/tablesorter/desc.gif b/apimanager/base/static/img/tablesorter/desc.gif new file mode 100644 index 0000000..3b30b3c Binary files /dev/null and b/apimanager/base/static/img/tablesorter/desc.gif differ diff --git a/apimanager/base/static/js/base.js b/apimanager/base/static/js/base.js index 8da0463..265b22a 100644 --- a/apimanager/base/static/js/base.js +++ b/apimanager/base/static/js/base.js @@ -1,2 +1,3 @@ $(document).ready(function($) { + $('table.tablesorter').tablesorter(); }); diff --git a/apimanager/base/static/js/jquery.tablesorter.min.js b/apimanager/base/static/js/jquery.tablesorter.min.js new file mode 100644 index 0000000..b8605df --- /dev/null +++ b/apimanager/base/static/js/jquery.tablesorter.min.js @@ -0,0 +1,4 @@ + +(function($){$.extend({tablesorter:new +function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i - - + + + {% block extrajs %}{% endblock extrajs %} diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html index 588855c..c31c681 100644 --- a/apimanager/consumers/templates/consumers/index.html +++ b/apimanager/consumers/templates/consumers/index.html @@ -50,7 +50,7 @@
- +
@@ -92,6 +92,7 @@ {% endcomment %} + {% endblock extrajs %} diff --git a/apimanager/metrics/templates/metrics/index.html b/apimanager/metrics/templates/metrics/index.html index 7f22c62..9ab6a8d 100644 --- a/apimanager/metrics/templates/metrics/index.html +++ b/apimanager/metrics/templates/metrics/index.html @@ -130,7 +130,7 @@
-
ID Name
+
diff --git a/apimanager/users/templates/users/index.html b/apimanager/users/templates/users/index.html index c156b4f..7b27d5a 100644 --- a/apimanager/users/templates/users/index.html +++ b/apimanager/users/templates/users/index.html @@ -47,7 +47,7 @@
-
#
+
User Id Username