[ARVADOS] updated: d3b84be954b1d899b6364ff6259144f37c42fafe

[git at public.curoverse.com]

Summary of changes:
 .../workbench/app/assets/javascripts/log_viewer.js | 13 ++++---------
 .../app/assets/stylesheets/log_viewer.scss         |  2 +-
 apps/workbench/app/views/jobs/_show_log.html.erb   | 22 ++++++++++++++++++----
 3 files changed, 23 insertions(+), 14 deletions(-)

       via  d3b84be954b1d899b6364ff6259144f37c42fafe (commit)
      from  91f0f06d8791cdb880a5ce8267e86d565b38aae3 (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 d3b84be954b1d899b6364ff6259144f37c42fafe
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 16 20:59:16 2014 +0000

    2883: Added big red "show failed tasks" button.

diff --git a/apps/workbench/app/assets/javascripts/log_viewer.js b/apps/workbench/app/assets/javascripts/log_viewer.js
index ac84327..e51b422 100644
--- a/apps/workbench/app/assets/javascripts/log_viewer.js
+++ b/apps/workbench/app/assets/javascripts/log_viewer.js
@@ -80,12 +80,7 @@ function addToLogViewer(logViewer, lines, taskState) {
                 node = taskState[v11].node;
                 slot = taskState[v11].slot;
             } else {
-                if (/^status: /.test(message)) {
-                    type = "job-status";
-                    message = message.substr(8);
-                } else {
-                    type = "crunch";
-                }
+                type = "crunch";
             }
 
             logViewer.add({
@@ -214,7 +209,7 @@ function generateJobOverview(id, logViewer, taskState) {
 
         var tcount = taskState.task_count;
 
-        html += ".  " + dumbPluralize(tcount, " task") + " run over ";
+        html += ".  Ran " + dumbPluralize(tcount, " task") + " over ";
         if (hours > 0) {
             html += dumbPluralize(hours, " hour");
         }
@@ -227,11 +222,11 @@ function generateJobOverview(id, logViewer, taskState) {
 
         html += " using " + dumbPluralize(taskState.nodes.length, " node");
 
-        html += ".  " + dumbPluralize(taskState.complete_count, "task") + " complete";
+        html += ".  " + dumbPluralize(taskState.complete_count, "task") + " completed";
         html += ",  " + dumbPluralize(taskState.incomplete_count, "task") +  " incomplete";
         html += " (" + dumbPluralize(taskState.failure_count, " failure") + ")";
 
-        html += ".  Finished at " + last.values().timestamp;
+        html += ".  Finished at " + last.values().timestamp + ".";
         html += "</div>";
     }
 
diff --git a/apps/workbench/app/assets/stylesheets/log_viewer.scss b/apps/workbench/app/assets/stylesheets/log_viewer.scss
index 427fafb..4a3b2e1 100644
--- a/apps/workbench/app/assets/stylesheets/log_viewer.scss
+++ b/apps/workbench/app/assets/stylesheets/log_viewer.scss
@@ -11,7 +11,7 @@
      display: none;
    }
    th.timestamp {
-     width: 14em;
+     width: 15em;
    }
    th.type {
      width: 8em;
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 6a6d27c..a3aac79 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -74,15 +74,32 @@ $("#sort-by-node").on("change", function() {
   logViewer.sort("node", {sortFunction: sortByNode});
 });
 
+$("#set-show-failed-only").on("click", function() {
+  $("#sort-by-task").prop("checked", true);
+  $("#show-failed-tasks").prop("checked", true);
+  $("#show-crunch").prop("checked", false);
+  $("#show-task-dispatch").prop("checked", true);
+  $("#show-task-output").prop("checked", true);
+  $("#show-crunchstat").prop("checked", false);
+  logViewer.filter(makeFilter());
+  logViewer.sort("taskid", {sortFunction: sortByTask});
+});
+
 })();
 
 </script>
 
 <div id="log-viewer">
 
-  <h3>Overview</h3>
+  <h3>Summary</h3>
   <div id="log-viewer-overview"></div>
 
+  <% if @object.tasks_summary[:failed] > 0 %>
+    <button id="set-show-failed-only" class="btn btn-danger" style="margin-top: 1em">
+      Show failed task output only
+    </button>
+ <% end %>
+
   <div class="h3">Log
 
 <span class="pull-right">
@@ -125,9 +142,6 @@ $("#sort-by-node").on("change", function() {
       <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch output</label>
     </div>
     <div class="checkbox-inline log-viewer-button">
-      <label><input id="show-job-status" type="checkbox" checked="true" class="toggle-filter"> Show job status</label>
-    </div>
-    <div class="checkbox-inline log-viewer-button">
       <label><input id="show-task-dispatch" type="checkbox" checked="true" class="toggle-filter"> Show task dispatch</label>
     </div>
     <div class="checkbox-inline log-viewer-button">

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


hooks/post-receive
--