Index: lams_admin/web/orglist.jsp =================================================================== diff -u -r6a5aa12efcb6d92212fb963ce661675a1236c881 -ra5c169485427ad83d9af77b91580640e02723a79 --- lams_admin/web/orglist.jsp (.../orglist.jsp) (revision 6a5aa12efcb6d92212fb963ce661675a1236c881) +++ lams_admin/web/orglist.jsp (.../orglist.jsp) (revision a5c169485427ad83d9af77b91580640e02723a79) @@ -1,5 +1,17 @@ <%@ include file="/taglibs.jsp"%> + + + + +

@@ -41,6 +53,7 @@

+ @@ -49,6 +62,8 @@ + + @@ -74,5 +89,22 @@ +
Id
- \ No newline at end of file + + +
+
+ + + + + + +
+
Index: lams_admin/web/userlist.jsp =================================================================== diff -u -rd32ad084559609b1bf57bfe096a7e8634bf0f265 -ra5c169485427ad83d9af77b91580640e02723a79 --- lams_admin/web/userlist.jsp (.../userlist.jsp) (revision d32ad084559609b1bf57bfe096a7e8634bf0f265) +++ lams_admin/web/userlist.jsp (.../userlist.jsp) (revision a5c169485427ad83d9af77b91580640e02723a79) @@ -1,5 +1,16 @@ <%@ include file="/taglibs.jsp"%> + + + + +

@@ -30,21 +41,28 @@

+ - + + + + + +
- + + + role.  @@ -59,5 +77,22 @@
- \ No newline at end of file + + +
+
+ + + + + + +
+
Index: lams_central/web/css/defaultHTML_learner.css =================================================================== diff -u -reb863d9f6c947b3b4578e757ea9a2abd99dbf09b -ra5c169485427ad83d9af77b91580640e02723a79 --- lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision eb863d9f6c947b3b4578e757ea9a2abd99dbf09b) +++ lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision a5c169485427ad83d9af77b91580640e02723a79) @@ -124,13 +124,30 @@ background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 0px } - - table.alternative-color td.first, table.alternative-color th.first { border-left: none; padding-left: 20px; } +/* jquery tablesorter pager plugin */ +table.alternative-color thead tr .header { + background-color: #e6eeee; + background-image: url(../images/css/bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; + width: auto; + padding-right: 15px; +} + +table.alternative-color thead tr .headerSortUp { + background-image: url(../images/css/asc.gif); +} + +table.alternative-color thead tr .headerSortDown { + background-image: url(../images/css/desc.gif); +} + /*layout of the forum tables with the colored table heading cell */ table.forum { width:100%; Index: lams_central/web/images/css/asc.gif =================================================================== diff -u Binary files differ Index: lams_central/web/images/css/bg.gif =================================================================== diff -u Binary files differ Index: lams_central/web/images/css/desc.gif =================================================================== diff -u Binary files differ Index: lams_central/web/images/first.png =================================================================== diff -u Binary files differ Index: lams_central/web/images/last.png =================================================================== diff -u Binary files differ Index: lams_central/web/images/next.png =================================================================== diff -u Binary files differ Index: lams_central/web/images/prev.png =================================================================== diff -u Binary files differ Index: lams_central/web/includes/javascript/jquery.tablesorter.pack.js =================================================================== diff -u --- lams_central/web/includes/javascript/jquery.tablesorter.pack.js (revision 0) +++ lams_central/web/includes/javascript/jquery.tablesorter.pack.js (revision a5c169485427ad83d9af77b91580640e02723a79) @@ -0,0 +1 @@ +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= (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; + }); + }); + }; + + } + }); + // extend plugin scope + $.fn.extend({ + tablesorterPager: $.tablesorterPager.construct + }); + +})(jQuery); \ No newline at end of file