[ARVADOS] updated: 0c88e01029446c985d5882fc3f45aa0f8549642a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/stylesheets/log_viewer.scss | 2 +-
 apps/workbench/app/views/jobs/_show_log.html.erb      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

       via  0c88e01029446c985d5882fc3f45aa0f8549642a (commit)
      from  a91b4932e602f6534a326b8aa794b99454364776 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0c88e01029446c985d5882fc3f45aa0f8549642a
Author: peter <peter at swyman.shell.4xphq.arvadosapi.com>
Date:   Thu Jun 12 01:59:12 2014 +0000

    2883: Adjust timestamp display based on timezone and locale.

diff --git a/apps/workbench/app/assets/stylesheets/log_viewer.scss b/apps/workbench/app/assets/stylesheets/log_viewer.scss
index 57f187c..5c4a729 100644
--- a/apps/workbench/app/assets/stylesheets/log_viewer.scss
+++ b/apps/workbench/app/assets/stylesheets/log_viewer.scss
@@ -10,7 +10,7 @@
      display: none;
    }
    th.timestamp {
-     width: 13em;
+     width: 15em;
    }
    th.type {
      width: 9em;
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index a3e73fa..06d7df1 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -5,6 +5,9 @@ function addToLogViewer(logViewer, lines) {
   for (var a in lines) {
     var v = lines[a].match(re);
     if (v != null) {
+
+    var ts = new Date(Date.UTC(v[2], v[3], v[4], v[6], v[7], v[8]));
+
     v11 = v[11];
     if (typeof v[11] === 'undefined') {
       v11 = ' ';
@@ -30,7 +33,7 @@ function addToLogViewer(logViewer, lines) {
 
     logViewer.add({
       id: logViewer.items.length,
-      timestamp: v[1] + " " + v[5],
+      timestamp: ts.toLocaleDateString() + " " + ts.toLocaleTimeString(),
       taskid: v11,
       message: message,
       type: type

-----------------------------------------------------------------------


hooks/post-receive
--