X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c72375f74e8a251e9f09c8a16dbed9174417292..86f3157d2fa86e6b36c2d112bf2e6598e4c06b6d:/apps/workbench/app/views/jobs/_show_log.html.erb

diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 831d71777b..f1466aab7d 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -15,7 +15,7 @@ var taskState = newTaskState();
 
 var makeFilter = function() {
   var pass = [];
-  $(".toggle-filter").each(function(i, e) {
+  $(".toggle-filter, .radio-filter").each(function(i, e) {
     if (e.checked) {
       pass.push(e.id.substr(5));
     }
@@ -43,22 +43,22 @@ var makeFilter = function() {
   <% logcollection = Collection.find @object.log %>
   <% if logcollection %>
     $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
-    done(function(data, status, jqxhr) {
-    logViewer.filter();
-    addToLogViewer(logViewer, data.split("\n"), taskState);
-    logViewer.filter(makeFilter());
-    generateJobOverview("#log-viewer-overview", logViewer, taskState);
-    $("#logloadspinner").detach();
-    }).
-    fail(function(jqxhr, status, error) {
-    $("#logloadspinner").detach();
-    });
+	done(function(data, status, jqxhr) {
+	    logViewer.filter();
+	    addToLogViewer(logViewer, data.split("\n"), taskState);
+	    logViewer.filter(makeFilter());
+	    generateJobOverview("#log-viewer-overview", logViewer, taskState);
+	    $("#log-viewer .spinner").detach();
+	}).
+	fail(function(jqxhr, status, error) {
+	    $("#log-viewer .spinner").detach();
+	});
   <% end %>
 <% else %>
   <%# Live log loading not implemented yet. %>
 <% end %>
 
-$(".toggle-filter").on("change", function() {
+$(".toggle-filter, .radio-filter").on("change", function() {
   logViewer.filter(makeFilter());
 });
 
@@ -69,7 +69,6 @@ $("#filter-all").on("click", function() {
 
 $("#filter-none").on("click", function() {
   $(".toggle-filter").each(function(i, f) { f.checked = false; console.log(f); });
-  $("#show-all-tasks").prop("checked", true);
   logViewer.filter(makeFilter());
 });
 
@@ -90,7 +89,7 @@ $("#set-show-failed-only").on("click", function() {
   $("#show-failed-tasks").prop("checked", true);
   $("#show-crunch").prop("checked", false);
   $("#show-task-dispatch").prop("checked", true);
-  $("#show-task-output").prop("checked", true);
+  $("#show-script-print").prop("checked", true);
   $("#show-crunchstat").prop("checked", false);
   logViewer.filter(makeFilter());
   logViewer.sort("taskid", {sortFunction: sortByTask});
@@ -106,7 +105,7 @@ $("#set-show-failed-only").on("click", function() {
   <p id="log-viewer-overview">
     <% if !@object.log %>
       <% if @object.finished_at %>
-        This job did not produce an output log.
+        This job did not produce an diagnostic log.
       <% else %>
         This job is still running.  The job log will be available when the job is complete.
       <% end %>
@@ -122,7 +121,7 @@ $("#set-show-failed-only").on("click", function() {
     <span class="pull-right">
       <% if @object.andand.tasks_summary.andand[:failed] and @object.tasks_summary[:failed] > 0 %>
         <button id="set-show-failed-only" class="btn btn-danger">
-          Show failed task output only
+          Show failed task diagnostics only
         </button>
       <% end %>
 
@@ -152,25 +151,25 @@ $("#set-show-failed-only").on("click", function() {
 
   <div>
     <div class="radio-inline log-viewer-button" style="margin-left: 10px">
-      <label><input id="show-all-tasks" type="radio" name="show-tasks-group" checked="true" class="toggle-filter"> Show all tasks</label>
+      <label><input id="show-all-tasks" type="radio" name="show-tasks-group" checked="true" class="radio-filter"> Show all tasks</label>
     </div>
     <div class="radio-inline log-viewer-button">
-      <label><input id="show-successful-tasks" type="radio" name="show-tasks-group" class="toggle-filter"> Only successful tasks</label>
+      <label><input id="show-successful-tasks" type="radio" name="show-tasks-group" class="radio-filter"> Only successful tasks</label>
     </div>
     <div class="radio-inline log-viewer-button">
-      <label><input id="show-failed-tasks" type="radio" name="show-tasks-group" class="toggle-filter"> Only failed tasks</label>
+      <label><input id="show-failed-tasks" type="radio" name="show-tasks-group" class="radio-filter"> Only failed tasks</label>
     </div>
   </div>
 
   <div>
     <div class="checkbox-inline log-viewer-button" style="margin-left: 10px">
-      <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch output</label>
+      <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch diagnostics</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">
-      <label><input id="show-task-output" type="checkbox" checked="true" class="toggle-filter"> Show task output</label>
+      <label><input id="show-task-print" type="checkbox" checked="true" class="toggle-filter"> Show task diagnostics</label>
     </div>
     <div class="checkbox-inline log-viewer-button">
       <label><input id="show-crunchstat" type="checkbox" checked="true" class="toggle-filter"> Show compute usage</label>
@@ -205,7 +204,7 @@ $("#set-show-failed-only").on("click", function() {
     </table>
 
     <% if @object.log and logcollection %>
-      <%= image_tag 'ajax-loader.gif', id: "logloadspinner" %>
+      <div class="spinner spinner-32px"></div>
     <% end %>
 
   </div>