=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-01-12 08:57:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-01-17 14:26:28 +0000
@@ -914,7 +914,7 @@
{
if(sortList==undefined) sortList = [[0,0]];
- jQuery("#" + tableId ).tablesorter({dateFormat:dateFormat});
+ jQuery("#" + tableId ).tablesorter();
if($("#" + tableId ).find("tbody").children().size() > 0 )
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.ext.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.ext.js 2011-01-10 06:17:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.ext.js 2011-01-17 14:26:28 +0000
@@ -2,25 +2,4 @@
postJSON: function( url, data, callback ) {
return jQuery.post(url, data, callback, "json");
}
-});
-
-$.tablesorter.addParser({
- id: "period",
- is: function (s) {
- return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);
- }, format: function (s, table, cell) {
- var v = $(cell).attr('value');
- var c = table.config;
- v = v.replace(/\-/g, "/");
- if (c.dateFormat == "us") {
- // reformat the string in ISO format
- v = v.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2");
- } else if (c.dateFormat == "uk") {
- // reformat the string in ISO format
- v = v.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1");
- } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
- v = v.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3");
- }
- return $.tablesorter.formatFloat(new Date(v).getTime());
- }, type: "numeric"
});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-01-10 06:17:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-01-17 14:26:28 +0000
@@ -20,7 +20,8 @@
-
+
+
@@ -30,7 +31,6 @@
-