From 756cdc15ac2ced15c207bf9f4224cf088cfd75e1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 13 May 2008 07:41:31 -0500 Subject: [PATCH] Swapping tablesorter version. GZipped version may have been responsible for errors in Internet Explorer. Change to usermenu.inc is whitespace only, for proper display in IE. Signed-off-by: Joshua Ferraro --- .../prog/en/includes/members-toolbar.inc | 4 +- .../jquery/plugins/jquery.tablesorter.min.js | 2 + .../jquery/plugins/jquery.tablesorter.pack.js | 1 - .../prog/en/modules/admin/branches.tmpl | 2 +- .../en/modules/admin/systempreferences.tmpl | 2 +- .../prog/en/modules/admin/z3950servers.tmpl | 2 +- .../en/modules/cataloguing/z3950_search.tmpl | 2 +- .../prog/en/modules/circ/circulation.tmpl | 2 +- .../prog/en/modules/circ/pendingreserves.tmpl | 2 +- .../prog/en/modules/circ/reserveratios.tmpl | 2 +- .../prog/en/modules/circ/transferstodo.tmpl | 2 +- .../en/modules/circ/transferstoreceive.tmpl | 2 +- .../prog/en/modules/circ/waitingreserves.tmpl | 2 +- .../prog/en/modules/members/moremember.tmpl | 2 +- .../en/modules/reviews/reviewswaiting.tmpl | 2 +- .../en/modules/suggestion/acceptorreject.tmpl | 2 +- .../prog/en/modules/tools/koha-news.tmpl | 2 +- .../prog/en/modules/tools/letter.tmpl | 2 +- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 7 +- .../prog/en/includes/doc-head-close.inc | 2 +- .../opac-tmpl/prog/en/includes/usermenu.inc | 11 +-- .../jquery/plugins/jquery.tablesorter.min.js | 2 +- .../jquery/plugins/jquery.tablesorter.pack.js | 1 - .../prog/en/modules/opac-shelves.tmpl | 2 +- .../prog/en/modules/opac-suggestions.tmpl | 6 +- .../prog/en/modules/opac-topissues.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-user.tmpl | 82 ++++++++----------- 27 files changed, 62 insertions(+), 90 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.min.js delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.pack.js delete mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.pack.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 81fe1d5438..7a8256a968 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -55,9 +55,9 @@ function update_child() { var moremenu = [ { text: _("Renew Patron"), onclick: { fn: confirm_reregistration } }, - { text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=",disabled: true, }, + { text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=", disabled: true}, { text: _("Delete"), onclick: { fn: confirm_deletion } }, - { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }, disabled: true, }, + { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }, disabled: true} ] new YAHOO.widget.Button({ diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.min.js new file mode 100644 index 0000000000..64c7007129 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.min.js @@ -0,0 +1,2 @@ + +(function($){$.extend({tablesorter:new function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'.',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="";}var rows=table.tBodies[0].rows;if(table.tBodies[0].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 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;ib)?1:0));};function sortTextDesc(a,b){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);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$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){var $cell=$(this);var i=this.column;this.order=this.count++%2;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;i35?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($){$.1V({I:D 8(){7 C=[],1d=[];k.2v={28:"3Z",2b:"48",29:"49",2P:"4a",2D:"4b",1I:1E,1w:"25",C:{},1d:[],1m:{S:["2c","2L"]},x:{},2u:K,2Q:13,u:[],1y:[],1l:"2O",J:K};8 17(s,d){1h(s+","+(D T().1e()-d.1e())+"4c")}k.17=17;8 1h(s){q(1u 1P!="2S"&&1u 1P.J!="2S"){1P.1h(s)}N{2V(s)}}8 1T(6,$x){q(6.f.J){7 1O=""}7 G=6.L[0].G;q(6.L[0].G[0]){7 Z=[],12=G[0].12,l=12.w;y(7 i=0;i1){1k=1k.3b(2K(6,3c,1c++))}N{q(6.1t.w==1||(11.3e>1||!r[1c+1])){1k.R(11)}}}m 1k};8 2d(11){q(($.1o)&&($(11).16().1g===K)){m 13};m K}8 2e(6,i){q((6.f.x[i])&&(6.f.x[i].1g===K)){m 13};m K}8 1z(6){7 c=6.f.1d;7 l=c.w;y(7 i=0;i\');$("2j:3l 3H",6.L[0]).1s(8(){1v.3G($(\'<3o>\').S(\'2l\',$(k).2l()))});$(6).3r(1v)}}8 2M(6,u){7 c=6.f,l=u.w;y(7 i=0;ib)?1:0))};8 2o(a,b){m((ba)?1:0))};8 2p(a,b){m a-b};8 2q(a,b){m b-a};8 2s(C,i){m C[i].Q};k.2f=8(2w){m k.1s(8(){q(!k.1t||!k.L)m;7 $k,$3E,$x,F,f,3F=0,3I;k.f={};f=$.1V(k.f,$.I.2v,2w);$k=$(k);$x=2x(k);k.f.C=1T(k,$x);F=1U(k);7 1X=[f.29,f.2b];2z(k);$x.3K(8(e){7 19=($k[0].L[0]&&$k[0].L[0].G.w)||0;q(!k.1C&&19>0){7 $11=$(k);7 i=k.1D;k.18=k.1a++%2;q(!e[f.2D]){f.u=[];q(f.1I!=1E){7 a=f.1I;y(7 j=0;j0){$k.1R("2J",[f.u])}1z(k)})};k.P=8(1B){7 l=C.w,a=13;y(7 i=0;iKoha › Administration › Libraries, branches, & Groups › Edit Group Libraries, branches, & Groups › New GroupLibraries, branches, & Groups › Confirm Deletion of Group New libraryLibraries, branches, & Groups › Modify library Libraries, branches, & Groups › Confirm deletion of library ''Libraries, branches, & Groups - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl index 31221af485..6cf6c8d23b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl @@ -215,7 +215,7 @@
- + + - + + - + - + + + + + + + + + - + - + + +