Merge branch 'master-nomake'

1 files changed, 7 insertions, 7 deletions

diff --git a/sitestatic/jquery.tablesorter-2.7.min.js b/sitestatic/jquery.tablesorter-2.7.min.js
index eafca402..01956458 100644
--- a/sitestatic/jquery.tablesorter-2.7.min.js
+++ b/sitestatic/jquery.tablesorter-2.7.min.js
@@ -45,15 +45,15 @@ a,b,d);b=c.replace(h[0],"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split(
 1:-1;typeof a!==typeof h&&(a+="",h+="");if(a<h)return-1;if(a>h)return 1}return 0};f.sortTextDesc=function(b,c,a,d){if(c===a)return 0;var e=b.config,m=e.string[e.empties[d]||e.emptyTo];return""===c&&0!==m?"boolean"===typeof m?m?-1:1:m||1:""===a&&0!==m?"boolean"===typeof m?m?1:-1:-m||-1:"function"===typeof e.textSorter?e.textSorter(a,c,b,d):f.sortText(b,a,c)};f.getTextValue=function(b,c,a){if(c){var d=b.length,e=c+a;for(c=0;c<d;c++)e+=b.charCodeAt(c);return a*e}return 0};f.sortNumeric=function(b,c,
 a,d,e,m){if(c===a)return 0;b=b.config;d=b.string[b.empties[d]||b.emptyTo];if(""===c&&0!==d)return"boolean"===typeof d?d?-1:1:-d||-1;if(""===a&&0!==d)return"boolean"===typeof d?d?1:-1:d||1;isNaN(c)&&(c=f.getTextValue(c,e,m));isNaN(a)&&(a=f.getTextValue(a,e,m));return c-a};f.sortNumericDesc=function(b,c,a,d,e,m){if(c===a)return 0;b=b.config;d=b.string[b.empties[d]||b.emptyTo];if(""===c&&0!==d)return"boolean"===typeof d?d?-1:1:d||1;if(""===a&&0!==d)return"boolean"===typeof d?d?1:-1:-d||-1;isNaN(c)&&
 (c=f.getTextValue(c,e,m));isNaN(a)&&(a=f.getTextValue(a,e,m));return a-c};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119",E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",
-U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(b){var c,a="[",d=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(c in d)"string"===typeof c&&(a+=d[c],f.characterRegexArray[c]=RegExp("["+d[c]+"]","g"));f.characterRegex=RegExp(a+"]")}if(f.characterRegex.test(b))for(c in d)"string"===typeof c&&(b=b.replace(f.characterRegexArray[c],c));return b};f.isValueInArray=function(b,c){var a,d=c.length;for(a=0;a<d;a++)if(c[a][0]===b)return!0;return!1};f.addParser=function(b){var c,
-a=f.parsers.length,d=!0;for(c=0;c<a;c++)f.parsers[c].id.toLowerCase()===b.id.toLowerCase()&&(d=!1);d&&f.parsers.push(b)};f.getParserById=function(b){var c,a=f.parsers.length;for(c=0;c<a;c++)if(f.parsers[c].id.toLowerCase()===b.toString().toLowerCase())return f.parsers[c];return!1};f.addWidget=function(b){f.widgets.push(b)};f.getWidgetById=function(b){var c,a,d=f.widgets.length;for(c=0;c<d;c++)if((a=f.widgets[c])&&a.hasOwnProperty("id")&&a.id.toLowerCase()===b.toLowerCase())return a};f.applyWidget=
-function(b,c){var a=b.config,d=a.widgetOptions,e=a.widgets.sort().reverse(),m,h,k,n=e.length;h=l.inArray("zebra",a.widgets);0<=h&&(a.widgets.splice(h,1),a.widgets.push("zebra"));a.debug&&(m=new Date);for(h=0;h<n;h++)(k=f.getWidgetById(e[h]))&&(!0===c&&k.hasOwnProperty("init")?k.init(b,k,a,d):!c&&k.hasOwnProperty("format")&&k.format(b,a,d));a.debug&&q("Completed "+(!0===c?"initializing":"applying")+" widgets",m)};f.refreshWidgets=function(b,c,a){var d,g=b.config,m=g.widgets,h=f.widgets,k=h.length;
-for(d=0;d<k;d++)h[d]&&h[d].id&&(c||0>l.inArray(h[d].id,m))&&(g.debug&&e("Refeshing widgets: Removing "+h[d].id),h[d].hasOwnProperty("remove")&&h[d].remove(b,g,g.widgetOptions));!0!==a&&f.applyWidget(b,c)};f.getData=function(b,c,a){var d="";b=l(b);var e,f;if(!b.length)return"";e=l.metadata?b.metadata():!1;f=" "+(b.attr("class")||"");"undefined"!==typeof b.data(a)||"undefined"!==typeof b.data(a.toLowerCase())?d+=b.data(a)||b.data(a.toLowerCase()):e&&"undefined"!==typeof e[a]?d+=e[a]:c&&"undefined"!==
-typeof c[a]?d+=c[a]:" "!==f&&f.match(" "+a+"-")&&(d=f.match(RegExp(" "+a+"-(\\w+)"))[1]||"");return l.trim(d)};f.formatFloat=function(b,c){if("string"!==typeof b||""===b)return b;var a;b=(c&&c.config?!1!==c.config.usNumberFormat:"undefined"!==typeof c?c:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(/,"-").replace(/\)/,""));a=parseFloat(b);return isNaN(a)?l.trim(b):a};f.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,
+U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(b){var c,a="[",d=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(c in d)"string"===typeof c&&(a+=d[c],f.characterRegexArray[c]=new RegExp("["+d[c]+"]","g"));f.characterRegex=new RegExp(a+"]")}if(f.characterRegex.test(b))for(c in d)"string"===typeof c&&(b=b.replace(f.characterRegexArray[c],c));return b};f.isValueInArray=function(b,c){var a,d=c.length;for(a=0;a<d;a++)if(c[a][0]===b)return!0;return!1};f.addParser=
+function(b){var c,a=f.parsers.length,d=!0;for(c=0;c<a;c++)f.parsers[c].id.toLowerCase()===b.id.toLowerCase()&&(d=!1);d&&f.parsers.push(b)};f.getParserById=function(b){var c,a=f.parsers.length;for(c=0;c<a;c++)if(f.parsers[c].id.toLowerCase()===b.toString().toLowerCase())return f.parsers[c];return!1};f.addWidget=function(b){f.widgets.push(b)};f.getWidgetById=function(b){var c,a,d=f.widgets.length;for(c=0;c<d;c++)if((a=f.widgets[c])&&a.hasOwnProperty("id")&&a.id.toLowerCase()===b.toLowerCase())return a};
+f.applyWidget=function(b,c){var a=b.config,d=a.widgetOptions,e=a.widgets.sort().reverse(),m,h,k,n=e.length;h=l.inArray("zebra",a.widgets);0<=h&&(a.widgets.splice(h,1),a.widgets.push("zebra"));a.debug&&(m=new Date);for(h=0;h<n;h++)(k=f.getWidgetById(e[h]))&&(!0===c&&k.hasOwnProperty("init")?k.init(b,k,a,d):!c&&k.hasOwnProperty("format")&&k.format(b,a,d));a.debug&&q("Completed "+(!0===c?"initializing":"applying")+" widgets",m)};f.refreshWidgets=function(b,c,a){var d,g=b.config,m=g.widgets,h=f.widgets,
+k=h.length;for(d=0;d<k;d++)h[d]&&h[d].id&&(c||0>l.inArray(h[d].id,m))&&(g.debug&&e("Refeshing widgets: Removing "+h[d].id),h[d].hasOwnProperty("remove")&&h[d].remove(b,g,g.widgetOptions));!0!==a&&f.applyWidget(b,c)};f.getData=function(b,c,a){var d="";b=l(b);var e,f;if(!b.length)return"";e=l.metadata?b.metadata():!1;f=" "+(b.attr("class")||"");"undefined"!==typeof b.data(a)||"undefined"!==typeof b.data(a.toLowerCase())?d+=b.data(a)||b.data(a.toLowerCase()):e&&"undefined"!==typeof e[a]?d+=e[a]:c&&"undefined"!==
+typeof c[a]?d+=c[a]:" "!==f&&f.match(" "+a+"-")&&(d=f.match(new RegExp(" "+a+"-(\\w+)"))[1]||"");return l.trim(d)};f.formatFloat=function(b,c){if("string"!==typeof b||""===b)return b;var a;b=(c&&c.config?!1!==c.config.usNumberFormat:"undefined"!==typeof c?c:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(/,"-").replace(/\)/,""));a=parseFloat(b);return isNaN(a)?l.trim(b):a};f.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,
 "")):!0}}});var k=l.tablesorter;l.fn.extend({tablesorter:k.construct});k.addParser({id:"text",is:function(e,k,l){return!0},format:function(e,q,s,r){q=q.config;e=l.trim(q.ignoreCase?e.toLocaleLowerCase():e);return q.sortLocaleCompare?k.replaceAccents(e):e},type:"text"});k.addParser({id:"currency",is:function(e){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test(e)},format:function(e,l){return k.formatFloat(e.replace(/[^\w,. \-()]/g,""),l)},type:"numeric"});
 k.addParser({id:"ipAddress",is:function(e){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(e)},format:function(e,l){var s,r=e.split("."),x="",y=r.length;for(s=0;s<y;s++)x+=("00"+r[s]).slice(-3);return k.formatFloat(x,l)},type:"numeric"});k.addParser({id:"url",is:function(e){return/^(https?|ftp|file):\/\//.test(e)},format:function(e){return l.trim(e.replace(/(https?|ftp|file):\/\//,""))},type:"text"});k.addParser({id:"isoDate",is:function(e){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(e)},
 format:function(e,l){return k.formatFloat(""!==e?(new Date(e.replace(/-/g,"/"))).getTime()||"":"",l)},type:"numeric"});k.addParser({id:"percent",is:function(e){return/(\d\s?%|%\s?\d)/.test(e)},format:function(e,l){return k.formatFloat(e.replace(/%/g,""),l)},type:"numeric"});k.addParser({id:"usLongDate",is:function(e){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(e)},format:function(e,l){return k.formatFloat((new Date(e.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||
 "",l)},type:"numeric"});k.addParser({id:"shortDate",is:function(e){return/^(\d{1,2}|\d{4})[\/\-\,\.\s+]\d{1,2}[\/\-\.\,\s+](\d{1,2}|\d{4})$/.test(e)},format:function(e,l,s,r){s=l.config;var x=s.headerList[r],y=x.shortDateFormat;"undefined"===typeof y&&(y=x.shortDateFormat=k.getData(x,s.headers[r],"dateFormat")||s.dateFormat);e=e.replace(/\s+/g," ").replace(/[\-|\.|\,]/g,"/");"mmddyyyy"===y?e=e.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===y?e=e.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,
 "$3/$2/$1"):"yyyymmdd"===y&&(e=e.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"));return k.formatFloat((new Date(e)).getTime()||"",l)},type:"numeric"});k.addParser({id:"time",is:function(e){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(e)},format:function(e,l){return k.formatFloat((new Date("2000/01/01 "+e.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",l)},type:"numeric"});k.addParser({id:"digit",is:function(e){return k.isDigit(e)},format:function(e,l){return k.formatFloat(e.replace(/[^\w,. \-()]/g,
-""),l)},type:"numeric"});k.addParser({id:"metadata",is:function(e){return!1},format:function(e,k,s){e=k.config;e=e.parserMetadataName?e.parserMetadataName:"sortValue";return l(s).metadata()[e]},type:"numeric"});k.addWidget({id:"zebra",format:function(e,q,s){var r,x,y,A,B,D,C=RegExp(q.cssChildRow,"i"),E=l(e).children("tbody:not(."+q.cssInfoBlock+")");q.debug&&(B=new Date);for(e=0;e<E.length;e++)r=l(E[e]),D=r.children("tr").length,1<D&&(y=0,r=r.children("tr:visible"),r.each(function(){x=l(this);C.test(this.className)||
-y++;A=0===y%2;x.removeClass(s.zebra[A?1:0]).addClass(s.zebra[A?0:1])}));q.debug&&k.benchmark("Applying Zebra widget",B)},remove:function(e,k,s){var r;s=l(e).children("tbody:not(."+k.cssInfoBlock+")");var x=(k.widgetOptions.zebra||["even","odd"]).join(" ");for(k=0;k<s.length;k++)r=l.tablesorter.processTbody(e,l(s[k]),!0),r.children().removeClass(x),l.tablesorter.processTbody(e,r,!1)}})}(jQuery);
+""),l)},type:"numeric"});k.addParser({id:"metadata",is:function(e){return!1},format:function(e,k,s){e=k.config;e=e.parserMetadataName?e.parserMetadataName:"sortValue";return l(s).metadata()[e]},type:"numeric"});k.addWidget({id:"zebra",format:function(e,q,s){var r,x,y,A,B,D,C=new RegExp(q.cssChildRow,"i"),E=l(e).children("tbody:not(."+q.cssInfoBlock+")");q.debug&&(B=new Date);for(e=0;e<E.length;e++)r=l(E[e]),D=r.children("tr").length,1<D&&(y=0,r=r.children("tr:visible"),r.each(function(){x=l(this);
+C.test(this.className)||y++;A=0===y%2;x.removeClass(s.zebra[A?1:0]).addClass(s.zebra[A?0:1])}));q.debug&&k.benchmark("Applying Zebra widget",B)},remove:function(e,k,s){var r;s=l(e).children("tbody:not(."+k.cssInfoBlock+")");var x=(k.widgetOptions.zebra||["even","odd"]).join(" ");for(k=0;k<s.length;k++)r=l.tablesorter.processTbody(e,l(s[k]),!0),r.children().removeClass(x),l.tablesorter.processTbody(e,r,!1)}})}(jQuery);