diff --git a/spa/templatetags/spa_extras.py b/spa/templatetags/spa_extras.py index 91b0040..6da769d 100644 --- a/spa/templatetags/spa_extras.py +++ b/spa/templatetags/spa_extras.py @@ -85,9 +85,9 @@ def googleanalyticsjs(parser, token): @register.filter def truncmixlist(value): + value = trunc_lines(value, 5) if len(value) > 0: if not is_number(value[0]): value = linenumbers(value) - value = trunc_lines(value, 5) return value \ No newline at end of file diff --git a/static/js/app/views/release.js b/static/js/app/views/release.js index 438796c..427f03c 100644 --- a/static/js/app/views/release.js +++ b/static/js/app/views/release.js @@ -33,10 +33,46 @@ var ReleaseListView = Backbone.View.extend({ }); $("#release-table", this.el).tablesorter({ sortList:[ - [0, 0], - [1, 0] - ] + [1, 1], + [0, 0] + ], + headers:{ + 1:{ + sorter:'humanDates' + } + } }); + // + $.tablesorter.addParser({ + id:'humanDates', + is:function (s) { + return false; + }, + format:function (s) { + var date = s.match(/^(\w{3})[ ](\d{1,2}),[ ](\d{4})$/); + var m = monthNames[date[1]]; + var d = String(date[2]); + if (d.length == 1) {d = "0" + d;} + var y = date[3]; + return '' + y + m + d; + }, + type:'Numeric' + }); + var monthNames = {}; + monthNames["Jan"] = "01"; + monthNames["Feb"] = "02"; + monthNames["Mar"] = "03"; + monthNames["Apr"] = "04"; + monthNames["May"] = "05"; + monthNames["Jun"] = "06"; + monthNames["Jul"] = "07"; + monthNames["Aug"] = "08"; + monthNames["Sep"] = "09"; + monthNames["Oct"] = "10"; + monthNames["Nov"] = "11"; + monthNames["Dec"] = "12"; + // + $('tr.rowlink', this.el).rowlink(); $('#tablesorter-fix', this.el).hide(); return this; diff --git a/static/js/app/views/sidebar.js b/static/js/app/views/sidebar.js index 84eebb2..6649c7e 100644 --- a/static/js/app/views/sidebar.js +++ b/static/js/app/views/sidebar.js @@ -64,7 +64,8 @@ window.SidebarView = Backbone.View.extend({ _eventAggregator.trigger("track_changed", data); liveButton.button('reset'); liveButton.removeClass('btn-success').addClass('btn-danger').text('Stop listening'); - }); + } + ); } }); }