Index: lams_admin/web/organisation/list.jsp =================================================================== diff -u -r13bc942355539f574640851768c5e156d386380d -r4ac1dc68acff3fc63471b4729b66d25245d82ec3 --- lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 13bc942355539f574640851768c5e156d386380d) +++ lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 4ac1dc68acff3fc63471b4729b66d25245d82ec3) @@ -1,14 +1,18 @@ <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %> - + Index: lams_admin/web/userlist.jsp =================================================================== diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r4ac1dc68acff3fc63471b4729b66d25245d82ec3 --- lams_admin/web/userlist.jsp (.../userlist.jsp) (revision ce3e782fd6844641f7298e09104f8d7554f073ff) +++ lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 4ac1dc68acff3fc63471b4729b66d25245d82ec3) @@ -6,8 +6,12 @@ Index: lams_admin/web/userorg.jsp =================================================================== diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r4ac1dc68acff3fc63471b4729b66d25245d82ec3 --- lams_admin/web/userorg.jsp (.../userorg.jsp) (revision ce3e782fd6844641f7298e09104f8d7554f073ff) +++ lams_admin/web/userorg.jsp (.../userorg.jsp) (revision 4ac1dc68acff3fc63471b4729b66d25245d82ec3) @@ -1,6 +1,6 @@ <%@ include file="/taglibs.jsp"%> - + + @@ -54,14 +59,13 @@ - - + @@ -84,15 +88,14 @@   [">]   - [">] + [">] [">] - Index: lams_central/web/includes/javascript/jquery.tablesorter.pack.js =================================================================== diff -u -ra5c169485427ad83d9af77b91580640e02723a79 -r4ac1dc68acff3fc63471b4729b66d25245d82ec3 --- lams_central/web/includes/javascript/jquery.tablesorter.pack.js (.../jquery.tablesorter.pack.js) (revision a5c169485427ad83d9af77b91580640e02723a79) +++ lams_central/web/includes/javascript/jquery.tablesorter.pack.js (.../jquery.tablesorter.pack.js) (revision 4ac1dc68acff3fc63471b4729b66d25245d82ec3) @@ -1 +1,852 @@ -eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(8($){$.1L({L:D 8(){7 C=[],1a=[];k.2z={2e:"45",2F:"3Y",2D:"2W",2d:"2X",2I:"2Y",1S:1t,1s:"2q",C:{},1a:[],1p:{Y:["2y","2O"]},x:{},2l:K,2N:Z,u:[],1D:[],1m:"2R",I:K};8 19(s,d){1l(s+","+(D X().1f()-d.1f())+"2Z")}k.19=19;8 1l(s){q(1B 1R!="24"&&1B 1R.I!="24"){1R.1l(s)}M{30(s)}}8 1T(6,$x){q(6.f.I){7 1P=""}7 F=6.J[0].F;q(6.J[0].F[0]){7 13=[],14=F[0].14,l=14.w;y(7 i=0;i1){1j=1j.3e(1V(6,1r,W+S.2h))}M{q(6.1i.w==1||(S.2h>1||!r[W+1])){1j.R(S)}1r[W]=(i+W)}}m 1j};8 2C(S){q(($.1q)&&($(S).17().1e===K)){m Z};m K}8 2i(6,i){q((6.f.x[i])&&(6.f.x[i].1e===K)){m Z};m K}8 1F(6){7 c=6.f.1a;7 l=c.w;y(7 i=0;i\');$("2o:3D 3C",6.J[0]).1x(8(){1z.3q($(\'<3r>\').Y(\'2n\',$(k).2n()))});$(6).3s(1z)}}8 2Q(6,u){7 c=6.f,l=u.w;y(7 i=0;ib)?1:0))};8 2u(a,b){m((ba)?1:0))};8 2v(a,b){m a-b};8 2w(a,b){m b-a};8 2x(C,i){m C[i].O};k.2j=8(2A){m k.1x(8(){7 $k,$3J,$x,G,f,3K=0,3L;k.f={};f=$.1L(k.f,$.L.2z,2A);q(!k.1i||!k.J)m Z;$k=$(k);$x=2a(k);k.f.C=1T(k,$x);G=1U(k);7 1Z=[f.2D,f.2F];2G(k);$x.3P(8(e){7 1b=($k[0].J[0]&&$k[0].J[0].F.w)||0;q(!k.1C&&1b>0){7 $S=$(k);7 i=k.1I;k.18=k.1c++%2;q(!e[f.2I]){f.u=[];q(f.1S!=1t){7 a=f.1S;y(7 j=0;j0){$k.46("2K",[f.u])}1F(k)})};k.P=8(1G){7 l=C.w,a=Z;y(7 i=0;i 1) { + arr = arr.concat(checkCellColSpan(table, headerArr,row++)); + } else { + if(table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row+1])) { + arr.push(cell); + } + //headerArr[row] = (i+row); + } + } + 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 applyWidget(table) { + var c = table.config.widgets; + var l = c.length; + for(var i=0; i < l; i++) { + + getWidgetById(c[i]).format(table); + } + + } + + function getWidgetById(name) { + var l = widgets.length; + for(var i=0; i < l; i++) { + if(widgets[i].id.toLowerCase() == name.toLowerCase() ) { + return widgets[i]; + } + } + }; + + function formatSortingOrder(v) { + + if(typeof(v) != "Number") { + i = (v.toLowerCase() == "desc") ? 1 : 0; + } else { + i = (v == (0 || 1)) ? v : 0; + } + return i; + } + + function isValueInArray(v, a) { + var l = a.length; + for(var i=0; i < l; i++) { + if(a[i][0] == v) { + return true; + } + } + return false; + } + + function setHeadersCss(table,$headers, list, css) { + // remove all header information + $headers.removeClass(css[0]).removeClass(css[1]); + + var h = []; + $headers.each(function(offset) { + if(!this.sortDisabled) { + h[this.column] = $(this); + } + }); + + var l = list.length; + for(var i=0; i < l; i++) { + h[list[i][0]].addClass(css[list[i][1]]); + } + } + + function fixColumnWidth(table,$headers) { + var c = table.config; + if(c.widthFixed) { + var colgroup = $(''); + $("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 < l; i++) { + var s = sortList[i], o = c.headerList[s[0]]; + o.count = s[1]; + o.count++; + } + } + + /* sorting methods */ + function multisort(table,sortList,cache) { + + if(table.config.debug) { var sortTime = new Date(); } + + var dynamicExp = "var sortWrapper = function(a,b) {", l = sortList.length; + + for(var i=0; i < l; i++) { + + var c = sortList[i][0]; + var order = sortList[i][1]; + var s = (getCachedSortType(table.config.parsers,c) == "text") ? ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ? "sortNumeric" : "sortNumericDesc"); + + var e = "e" + i; + + dynamicExp += "var " + e + " = " + s + "(a[" + c + "],b[" + c + "]); "; + dynamicExp += "if(" + e + ") { return " + e + "; } "; + dynamicExp += "else { "; + } + + // if value is the same keep orignal order + var orgOrderCol = cache.normalized[0].length - 1; + dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];"; + + for(var i=0; i < l; i++) { + dynamicExp += "}; "; + } + + dynamicExp += "return 0; "; + dynamicExp += "}; "; + + eval(dynamicExp); + + cache.normalized.sort(sortWrapper); + + if(table.config.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order+ " time:", sortTime); } + + return cache; + }; + + function sortText(a,b) { + return ((a < b) ? -1 : ((a > b) ? 1 : 0)); + }; + + function sortTextDesc(a,b) { + return ((b < a) ? -1 : ((b > a) ? 1 : 0)); + }; + + function sortNumeric(a,b) { + return a-b; + }; + + function sortNumericDesc(a,b) { + return b-a; + }; + + function getCachedSortType(parsers,i) { + return parsers[i].type; + }; + + /* public methods */ + 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); + + // store common expression for speed + $this = $(this); + + // build headers + $headers = buildHeaders(this); + + // try to auto detect column type, and store in tables config + this.config.parsers = buildParserCache(this,$headers); + + + // build the cache for the tbody cells + cache = buildCache(this); + + // get the css class names, could be done else where. + var sortCSS = [config.cssDesc,config.cssAsc]; + + // fixate columns if the users supplies the fixedWidth option + fixColumnWidth(this); + + // apply event handling to headers + // this is to big, perhaps break it out? + $headers.click(function(e) { + + $this.trigger("sortStart"); + + var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0; + + if(!this.sortDisabled && totalRows > 0) { + + + // store exp, for speed + var $cell = $(this); + + // get current column index + var i = this.column; + + // get current column sort order + this.order = this.count++ % 2; + + // user only whants to sort on one column + if(!e[config.sortMultiSortKey]) { + + // flush the sort list + config.sortList = []; + + if(config.sortForce != null) { + var a = config.sortForce; + for(var j=0; j < a.length; j++) { + if(a[j][0] != i) { + config.sortList.push(a[j]); + } + } + } + + // add column to sort list + config.sortList.push([i,this.order]); + + // multi column sorting + } else { + // the user has clicked on an all ready sortet column. + if(isValueInArray(i,config.sortList)) { + + // revers the sorting direction for all tables. + for(var j=0; j < config.sortList.length; j++) { + var s = config.sortList[j], o = config.headerList[s[0]]; + if(s[0] == i) { + o.count = s[1]; + o.count++; + s[1] = o.count % 2; + } + } + } else { + // add column to sort list array + config.sortList.push([i,this.order]); + } + }; + setTimeout(function() { + //set css for headers + setHeadersCss($this[0],$headers,config.sortList,sortCSS); + appendToTable($this[0],multisort($this[0],config.sortList,cache)); + },1); + // stop normal event by returning false + return false; + } + // cancel selection + }).mousedown(function() { + if(config.cancelSelection) { + this.onselectstart = function() {return false}; + return false; + } + }); + + // apply easy methods that trigger binded events + $this.bind("update",function() { + + // rebuild parsers. + this.config.parsers = buildParserCache(this,$headers); + + // rebuild the cache map + cache = buildCache(this); + + }).bind("sorton",function(e,list) { + + $(this).trigger("sortStart"); + + config.sortList = list; + + // update and store the sortlist + var sortList = config.sortList; + + // update header count index + updateHeaderSortCount(this,sortList); + + //set css for headers + setHeadersCss(this,$headers,sortList,sortCSS); + + + // sort the table and append it to the dom + appendToTable(this,multisort(this,sortList,cache)); + + }).bind("appendCache",function() { + + appendToTable(this,cache); + + }).bind("applyWidgetId",function(e,id) { + + getWidgetById(id).format(this); + + }).bind("applyWidgets",function() { + // apply widgets + applyWidget(this); + }); + + if($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) { + config.sortList = $(this).metadata().sortlist; + } + // if user has supplied a sort list to constructor. + if(config.sortList.length > 0) { + $this.trigger("sorton",[config.sortList]); + } + + // apply widgets + applyWidget(this); + }); + }; + + this.addParser = function(parser) { + var l = parsers.length, a = true; + for(var i=0; i < l; i++) { + if(parsers[i].id.toLowerCase() == parser.id.toLowerCase()) { + a = false; + } + } + if(a) { parsers.push(parser); }; + }; + + this.addWidget = function(widget) { + widgets.push(widget); + }; + + this.formatFloat = function(s) { + var i = parseFloat(s); + return (isNaN(i)) ? 0 : i; + }; + this.formatInt = function(s) { + var i = parseInt(s); + return (isNaN(i)) ? 0 : i; + }; + + this.isDigit = function(s,config) { + var DECIMAL = '\\' + config.decimal; + var exp = '/(^[+]?0(' + DECIMAL +'0+)?$)|(^([-+]?[1-9][0-9]*)$)|(^([-+]?((0?|[1-9][0-9]*)' + DECIMAL +'(0*[1-9][0-9]*)))$)|(^[-+]?[1-9]+[0-9]*' + DECIMAL +'0+$)/'; + return RegExp(exp).test($.trim(s)); + }; + + this.clearTableBody = function(table) { + if($.browser.msie) { + function empty() { + while ( this.firstChild ) this.removeChild( this.firstChild ); + } + empty.apply(table.tBodies[0]); + } else { + table.tBodies[0].innerHTML = ""; + } + }; + } + }); + + // extend plugin scope + $.fn.extend({ + tablesorter: $.tablesorter.construct + }); + + var ts = $.tablesorter; + + // add default parsers + ts.addParser({ + id: "text", + is: function(s) { + return true; + }, + format: function(s) { + return $.trim(s.toLowerCase()); + }, + type: "text" + }); + + ts.addParser({ + id: "digit", + is: function(s,table) { + var c = table.config; + return $.tablesorter.isDigit(s,c); + }, + format: function(s) { + return $.tablesorter.formatFloat(s); + }, + type: "numeric" + }); + + ts.addParser({ + id: "currency", + is: function(s) { + return /^[ВЈ$€?.]/.test(s); + }, + format: function(s) { + return $.tablesorter.formatFloat(s.replace(new RegExp(/[^0-9.]/g),"")); + }, + type: "numeric" + }); + + ts.addParser({ + id: "ipAddress", + is: function(s) { + return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s); + }, + format: function(s) { + var a = s.split("."), r = "", l = a.length; + for(var i = 0; i < l; i++) { + var item = a[i]; + if(item.length == 2) { + r += "0" + item; + } else { + r += item; + } + } + return $.tablesorter.formatFloat(r); + }, + type: "numeric" + }); + + ts.addParser({ + id: "url", + is: function(s) { + return /^(https?|ftp|file):\/\/$/.test(s); + }, + format: function(s) { + return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),'')); + }, + type: "text" + }); + + ts.addParser({ + id: "isoDate", + is: function(s) { + return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s); + }, + format: function(s) { + return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(new RegExp(/-/g),"/")).getTime() : "0"); + }, + type: "numeric" + }); + + ts.addParser({ + id: "percent", + is: function(s) { + return /\%$/.test($.trim(s)); + }, + format: function(s) { + return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),"")); + }, + type: "numeric" + }); + + ts.addParser({ + id: "usLongDate", + is: function(s) { + return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)); + }, + format: function(s) { + return $.tablesorter.formatFloat(new Date(s).getTime()); + }, + type: "numeric" + }); + + ts.addParser({ + id: "shortDate", + is: function(s) { + return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s); + }, + format: function(s,table) { + var c = table.config; + s = s.replace(/\-/g,"/"); + if(c.dateFormat == "us") { + // reformat the string in ISO format + s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2"); + } else if(c.dateFormat == "uk") { + //reformat the string in ISO format + s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1"); + } else if(c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") { + s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3"); + } + return $.tablesorter.formatFloat(new Date(s).getTime()); + }, + type: "numeric" + }); + + ts.addParser({ + id: "time", + is: function(s) { + return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s); + }, + format: function(s) { + return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime()); + }, + type: "numeric" + }); + + + ts.addParser({ + id: "metadata", + is: function(s) { + return false; + }, + format: function(s,table,cell) { + var c = table.config, p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName; + return $(cell).metadata()[p]; + }, + type: "numeric" + }); + + // add default widgets + ts.addWidget({ + id: "zebra", + format: function(table) { + if(table.config.debug) { var time = new Date(); } + $("tr:visible",table.tBodies[0]) + .filter(':even') + .removeClass(table.config.widgetZebra.css[1]).addClass(table.config.widgetZebra.css[0]) + .end().filter(':odd') + .removeClass(table.config.widgetZebra.css[0]).addClass(table.config.widgetZebra.css[1]); + if(table.config.debug) { $.tablesorter.benchmark("Applying Zebra widget", time); } + } + }); +})(jQuery); \ No newline at end of file Index: lams_central/web/includes/javascript/jquery.tablesorter.pager.js =================================================================== diff -u -r72b80f6befe04cb189ab1e682082671d109a90b9 -r4ac1dc68acff3fc63471b4729b66d25245d82ec3 --- lams_central/web/includes/javascript/jquery.tablesorter.pager.js (.../jquery.tablesorter.pager.js) (revision 72b80f6befe04cb189ab1e682082671d109a90b9) +++ lams_central/web/includes/javascript/jquery.tablesorter.pager.js (.../jquery.tablesorter.pager.js) (revision 4ac1dc68acff3fc63471b4729b66d25245d82ec3) @@ -1,199 +1,184 @@ -(function($) { - $.extend({ - tablesorterPager: new function() { - - function updatePageDisplay(c) { - var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages); - } - - function setPageSize(table,size) { - var c = table.config; - c.size = size; - c.totalPages = Math.ceil(c.totalRows / c.size); - moveToPage(table); - fixPosition(table); - } - - function fixPosition(table) { - var c = table.config; - if(!c.pagerPositionSet && c.positionFixed) { - var c = table.config, o = $(table); - if(o.offset) { - c.container.css({ - top: o.offset().top + o.height() + 'px', - position: 'absolute' - }); - } - c.pagerPositionSet = true; - } - } - - function moveToFirstPage(table) { - var c = table.config; - c.page = 0; - moveToPage(table); - } - - function moveToLastPage(table) { - var c = table.config; - c.page = (c.totalPages-1); - moveToPage(table); - } - - function moveToNextPage(table) { - var c = table.config; - c.page++; - if(c.page >= (c.totalPages-1)) { - c.page = (c.totalPages-1); - } - moveToPage(table); - } - - function moveToPrevPage(table) { - var c = table.config; - c.page--; - if(c.page <= 0) { - c.page = 0; - } - moveToPage(table); - } - - - function moveToPage(table) { - var c = table.config; - if(c.page < 0 || c.page > (c.totalPages-1)) { - c.page = 0; - } - - renderTable(table,c.rowsCopy); - } - - function renderTable(table,rows) { - - var c = table.config; - // following 2 lines use value of pagesize for initial display - // instead of default - c.size = parseInt($(".pagesize").val()); - c.totalPages = Math.ceil(c.totalRows / c.size); - var l = rows.length; - var s = (c.page * c.size); - var e = (s + c.size); - if(e > rows.length ) { - e = rows.length; - } - - - var tableBody = $(table.tBodies[0]); - - // clear the table body - - $.tablesorter.clearTableBody(table); - - for(var i = s; i < e; i++) { - - //tableBody.append(rows[i]); - - var o = rows[i]; - var l = o.length; - for(var j=0; j < l; j++) { - - tableBody[0].appendChild(o[j]); - - } - } - - fixPosition(table,tableBody); - - $(table).trigger("applyWidgets"); - - if( c.page >= c.totalPages ) { - moveToLastPage(table); - } - - updatePageDisplay(c); - } - - this.appender = function(table,rows) { - - var c = table.config; - - c.rowsCopy = rows; - c.totalRows = rows.length; - c.totalPages = Math.ceil(c.totalRows / c.size); - - renderTable(table,rows); - }; - - this.defaults = { - size: 10, - offset: 0, - page: 0, - totalRows: 0, - totalPages: 0, - container: null, - cssNext: '.next', - cssPrev: '.prev', - cssFirst: '.first', - cssLast: '.last', - cssPageDisplay: '.pagedisplay', - cssPageSize: '.pagesize', - seperator: "/", - positionFixed: true, - appender: this.appender - }; - - this.construct = function(settings) { - - return this.each(function() { - - config = $.extend(this.config, $.tablesorterPager.defaults, settings); - - var table = this, pager = config.container; - - $(this).trigger("appendCache"); - - config.size = parseInt($(".pagesize",pager).val()); - - $(config.cssFirst,pager).click(function() { - moveToFirstPage(table); - return false; - }); - $(config.cssNext,pager).click(function() { - moveToNextPage(table); - return false; - }); - $(config.cssPrev,pager).click(function() { - moveToPrevPage(table); - return false; - }); - $(config.cssLast,pager).click(function() { - moveToLastPage(table); - return false; - }); - $(config.cssPageSize,pager).change(function() { - setPageSize(table,parseInt($(this).val())); - return false; - }); - // allow navigation to custom page - $(config.cssPageDisplay,pager).change(function() { - var inputPage = $(this).val(); - inputPage = inputPage.substr(0, inputPage.indexOf(config.seperator)); - if(isNaN(inputPage)) { - config.page = 0; - } else { - config.page = inputPage-1; - } - moveToPage(table); - return false; - }); - }); - }; - - } - }); - // extend plugin scope - $.fn.extend({ - tablesorterPager: $.tablesorterPager.construct - }); - +(function($) { + $.extend({ + tablesorterPager: new function() { + + function updatePageDisplay(c) { + var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages); + } + + function setPageSize(table,size) { + var c = table.config; + c.size = size; + c.totalPages = Math.ceil(c.totalRows / c.size); + c.pagerPositionSet = false; + moveToPage(table); + fixPosition(table); + } + + function fixPosition(table) { + var c = table.config; + if(!c.pagerPositionSet && c.positionFixed) { + var c = table.config, o = $(table); + if(o.offset) { + c.container.css({ + top: o.offset().top + o.height() + 'px', + //position: 'absolute' + }); + } + c.pagerPositionSet = true; + } + } + + function moveToFirstPage(table) { + var c = table.config; + c.page = 0; + moveToPage(table); + } + + function moveToLastPage(table) { + var c = table.config; + c.page = (c.totalPages-1); + moveToPage(table); + } + + function moveToNextPage(table) { + var c = table.config; + c.page++; + if(c.page >= (c.totalPages-1)) { + c.page = (c.totalPages-1); + } + moveToPage(table); + } + + function moveToPrevPage(table) { + var c = table.config; + c.page--; + if(c.page <= 0) { + c.page = 0; + } + moveToPage(table); + } + + + function moveToPage(table) { + var c = table.config; + if(c.page < 0 || c.page > (c.totalPages-1)) { + c.page = 0; + } + + renderTable(table,c.rowsCopy); + } + + function renderTable(table,rows) { + + var c = table.config; + var l = rows.length; + var s = (c.page * c.size); + var e = (s + c.size); + if(e > rows.length ) { + e = rows.length; + } + + + var tableBody = $(table.tBodies[0]); + + // clear the table body + + $.tablesorter.clearTableBody(table); + + for(var i = s; i < e; i++) { + + //tableBody.append(rows[i]); + + var o = rows[i]; + var l = o.length; + for(var j=0; j < l; j++) { + + tableBody[0].appendChild(o[j]); + + } + } + + fixPosition(table,tableBody); + + $(table).trigger("applyWidgets"); + + if( c.page >= c.totalPages ) { + moveToLastPage(table); + } + + updatePageDisplay(c); + } + + this.appender = function(table,rows) { + + var c = table.config; + + c.rowsCopy = rows; + c.totalRows = rows.length; + c.totalPages = Math.ceil(c.totalRows / c.size); + + renderTable(table,rows); + }; + + this.defaults = { + size: 10, + offset: 0, + page: 0, + totalRows: 0, + totalPages: 0, + container: null, + cssNext: '.next', + cssPrev: '.prev', + cssFirst: '.first', + cssLast: '.last', + cssPageDisplay: '.pagedisplay', + cssPageSize: '.pagesize', + seperator: "/", + positionFixed: true, + appender: this.appender + }; + + this.construct = function(settings) { + + return this.each(function() { + + config = $.extend(this.config, $.tablesorterPager.defaults, settings); + + var table = this, pager = config.container; + + $(this).trigger("appendCache"); + + config.size = parseInt($(".pagesize",pager).val()); + + $(config.cssFirst,pager).click(function() { + moveToFirstPage(table); + return false; + }); + $(config.cssNext,pager).click(function() { + moveToNextPage(table); + return false; + }); + $(config.cssPrev,pager).click(function() { + moveToPrevPage(table); + return false; + }); + $(config.cssLast,pager).click(function() { + moveToLastPage(table); + return false; + }); + $(config.cssPageSize,pager).change(function() { + setPageSize(table,parseInt($(this).val())); + return false; + }); + }); + }; + + } + }); + // extend plugin scope + $.fn.extend({ + tablesorterPager: $.tablesorterPager.construct + }); + })(jQuery); \ No newline at end of file Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp =================================================================== diff -u -r1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8 -r4ac1dc68acff3fc63471b4729b66d25245d82ec3 --- lams_tool_larsrc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) +++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision 4ac1dc68acff3fc63471b4729b66d25245d82ec3) @@ -14,7 +14,7 @@ - + @@ -23,8 +23,11 @@