[ARVADOS] updated: 10c9634fe7a37377a01b8d49f56fb6ceb919fb10

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/stylesheets/log_viewer.scss         | 27 +++++++++++++++++++++
 apps/workbench/app/views/jobs/_show_log.html.erb   | 28 ++++++++++++----------
 2 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 apps/workbench/app/assets/stylesheets/log_viewer.scss

       via  10c9634fe7a37377a01b8d49f56fb6ceb919fb10 (commit)
      from  417862967878f36338aa97c14e75501cbdcbdf16 (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 10c9634fe7a37377a01b8d49f56fb6ceb919fb10
Author: Peter Amstutz <tetron at swyman.shell.4xphq.arvadosapi.com>
Date:   Wed Jun 11 20:02:12 2014 +0000

    2883: Moved hardcoded styles out into a stylesheet.

diff --git a/apps/workbench/app/assets/stylesheets/log_viewer.scss b/apps/workbench/app/assets/stylesheets/log_viewer.scss
new file mode 100644
index 0000000..eccf539
--- /dev/null
+++ b/apps/workbench/app/assets/stylesheets/log_viewer.scss
@@ -0,0 +1,27 @@
+.log-viewer-table {
+ width: 100%;
+ font-family: "Lucida Console", Monaco, monospace;
+ font-size: 11px;
+ thead tr th.id {
+   display: none;
+ }
+ tbody tr {
+   vertical-align: top;
+   td {
+     padding-right: 1em;
+   }
+   td.id {
+     display: none;
+   }
+   td.timestamp {
+     width: 13em;
+   }
+   td.type {
+     width: 8em;
+   }
+   td.taskid {
+     width: 3xoem;
+     text-align: right;
+   }
+ }
+}
\ No newline at end of file
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 175b280..a9e81d9 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -15,12 +15,14 @@ function addToLogViewer(logViewer, lines) {
   if (v11 != ' ') {
     if (/^stderr /.test(message)) {
         type = "task-output";
+        message = message.substr(7);
     } else {
         type = "task-dispatch";
     }
   } else {
     if (/^status: /.test(message)) {
-        type = "job-progress";
+        type = "job-status";
+        message = message.substr(8);
     } else {
         type = "crunch";
     }
@@ -107,16 +109,16 @@ $("#sort-by-task").on("change", function() {
     </div>
 <br>
   <div class="checkbox-inline">
-    <label><input id="show-task-output" type="checkbox" checked="true" class="toggle-filter"> Show task output</label>
+    <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch output</label>
   </div>
   <div class="checkbox-inline">
-    <label><input id="show-task-dispatch" type="checkbox" checked="true" class="toggle-filter"> Show task dispatch</label>
+    <label><input id="show-job-status" type="checkbox" checked="true" class="toggle-filter"> Show job status</label>
   </div>
   <div class="checkbox-inline">
-    <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch output</label>
+    <label><input id="show-task-dispatch" type="checkbox" checked="true" class="toggle-filter"> Show task dispatch</label>
   </div>
   <div class="checkbox-inline">
-    <label><input id="show-job-progress" type="checkbox" checked="true" class="toggle-filter"> Show job progress</label>
+    <label><input id="show-task-output" type="checkbox" checked="true" class="toggle-filter"> Show task output</label>
   </div>
 
 <div class="pull-right">
@@ -128,22 +130,22 @@ $("#sort-by-task").on("change", function() {
     </button>
 </div>
 
-  <table style='width: 100%; font-family:"Lucida Console", Monaco, monospace; font-size: 11px'>
+  <table class="log-viewer-table">
     <thead>
       <tr>
-        <th class="sort" data-sort="id" style="display:none;"></th>
-        <th class="sort" data-sort="timestamp" style="width: 12em">Timestamp</th>
-        <th class="sort" data-sort="type" style="width: 8em">Log type</th>
-        <th class="sort" data-sort="taskid" style="width: 4em">Task</th>
-        <th class="sort" data-sort="message" >Message</th>
+        <th class="sort" data-sort="id"></th>
+        <th class="sort" data-sort="timestamp">Timestamp</th>
+        <th class="sort" data-sort="type">Log type</th>
+        <th class="sort" data-sort="taskid">Task</th>
+        <th class="sort" data-sort="message">Message</th>
       </tr>
     </thead>
     <tbody class="list">
       <tr>
-        <td class="id" style="display:none;">0</td>
+        <td class="id"></td>
         <td class="timestamp"></td>
         <td class="type"></td>
-        <td class="taskid" style="text-align: center"></td>
+        <td class="taskid"></td>
         <td class="message"></td>
       </tr>
     </tbody>

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


hooks/post-receive
--