From e430b912dc3516a19fffcad196057baacd7e3e1f Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 19 Sep 2013 19:24:06 +0200 Subject: [PATCH] Bug #1606: Changed Sunstone time functions to omply with dd/mm/yyyy --- src/sunstone/public/js/plugins/vms-tab.js | 6 ------ src/sunstone/public/js/sunstone-util.js | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 07e66a1e33..465041c417 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -945,12 +945,6 @@ var vm_buttons = { YOU NEED TO MANUALLY CHECK THE VM STATUS ON THE HOST, to decide if the operation \ was successful or not.") } - - //"VM.help" : { - // type: "action", - // text: '?', - // alwaysActive: true - //} } var vm_info_panel = { diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index d3f47dac04..24062c3a13 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -45,7 +45,7 @@ function pretty_time(time_seconds) var month = pad(d.getMonth()+1,2); //getMonths returns 0-11 var year = d.getFullYear(); - return hour + ":" + mins +":" + secs + " " + month + "/" + day + "/" + year; + return hour + ":" + mins +":" + secs + " " + day + "/" + month + "/" + year; } // Format time for plot axis @@ -62,7 +62,7 @@ function pretty_time_axis(time, show_date){ var year = d.getFullYear(); if (show_date) - return month + "/" + day; + return day + "/" + month; else return hour + ":" + mins; } @@ -78,7 +78,7 @@ function pretty_time_runtime(time){ var month = pad(d.getUTCMonth()+1,2); //getMonths returns 0-11 var year = d.getUTCFullYear(); - return day + "d " + hour + ":" + mins;// + ":" + secs;// + " " + month + "/" + day; + return day + "d " + hour + ":" + mins; } //returns a human readable size in Kilo, Mega, Giga or Tera bytes