[ARVADOS] updated: f5254bc8e4c0d6f0169ce2de4c9ba43ff6fe87a5
git at public.curoverse.com
git at public.curoverse.com
Thu Jun 19 09:16:33 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/log_viewer.js | 2 +-
apps/workbench/app/views/jobs/_show_log.html.erb | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
via f5254bc8e4c0d6f0169ce2de4c9ba43ff6fe87a5 (commit)
from 5a4863dc935ecccebebc9b166c3c9915121b14d1 (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 f5254bc8e4c0d6f0169ce2de4c9ba43ff6fe87a5
Author: peter <peter at swyman.shell.4xphq.arvadosapi.com>
Date: Thu Jun 19 13:16:30 2014 +0000
2883: Changed "task-output" category to "task-print" and "output" to
"diagnostic" in the UI text based on AWZ feedback.
diff --git a/apps/workbench/app/assets/javascripts/log_viewer.js b/apps/workbench/app/assets/javascripts/log_viewer.js
index 493975f..101b4a5 100644
--- a/apps/workbench/app/assets/javascripts/log_viewer.js
+++ b/apps/workbench/app/assets/javascripts/log_viewer.js
@@ -42,7 +42,7 @@ function addToLogViewer(logViewer, lines, taskState) {
} else if (/^srun: /.test(message) || /^slurmd/.test(message)) {
type = "task-dispatch";
} else {
- type = "task-output";
+ type = "task-print";
}
} else {
var m;
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 831d717..8f13213 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -90,7 +90,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 +106,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 +122,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 %>
@@ -164,13 +164,13 @@ $("#set-show-failed-only").on("click", function() {
<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>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list