[ARVADOS] updated: f9a218aa75b9b88632d19d3c33c9c88c5fe39496

git at public.curoverse.com git at public.curoverse.com
Thu Nov 6 10:54:57 EST 2014


Summary of changes:
 .../workbench/app/views/jobs/_show_status.html.erb | 69 ++++++++++------------
 .../app/views/pipeline_instances/show.html.erb     |  7 +--
 2 files changed, 33 insertions(+), 43 deletions(-)

       via  f9a218aa75b9b88632d19d3c33c9c88c5fe39496 (commit)
      from  52083e6a73c6b9e46b5e4e176aec6b23bcec74e8 (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 f9a218aa75b9b88632d19d3c33c9c88c5fe39496
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 6 10:53:13 2014 -0500

    4084: Update views that were still using pane-anchor.

diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index cfff0da..8075209 100644
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -1,43 +1,36 @@
-<div style="margin-top: 10px">
+<div class="arv-log-refresh-control"
+     data-load-throttle="15000"
+     ></div>
+<%=
+   pj = {}
+   pj[:job] = @object
+   pj[:name] = @object[:name] || "this job"
+   pj[:progress_bar] = render(partial: "job_progress",
+                              locals: {:j => @object })
+   tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results
+   render(partial: 'pipeline_instances/running_component',
+          locals: { tasks: tasks, pj: pj, i: 0, expanded: true})
+%>
 
-<div id="job-status"
-     class="pane-anchor arv-log-event-listener arv-refresh-on-log-event"
-     href="#job-status-pane"
-     data-pane-content-url="<%= url_for(params.merge(tab_pane: "job_component")) %>"
-     data-object-uuid="<%= @object.uuid %>"
-     data-load-throttle="5000"
-     >
-  <div id="job-status-pane">
-    <%=
-       pj = {}
-       pj[:job] = @object
-       pj[:name] = @object[:name] || "this job"
-       pj[:progress_bar] = render(partial: "job_progress",
-                                  locals: {:j => @object })
-       tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results
-       render(partial: 'pipeline_instances/running_component',
-              locals: { tasks: tasks, pj: pj, i: 0, expanded: true})
-    %>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <span class="panel-title">Used in pipelines</span>
   </div>
-</div>
-</div>
-
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <span class="panel-title">Used in pipelines</span>
-    </div>
-    <div class="panel-body">
-<% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %>
+  <div class="panel-body">
+    <% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %>
 
-<% pi.each do |pipeline| %>
-  <% pipeline.components.each do |k, v| %>
-    <% if v[:job] and v[:job][:uuid] == @object.uuid %>
-      <div>
-      <b><%= k %></b> component of <%= link_to_if_arvados_object pipeline, friendly_name: true %>
-      created at <%= render_localized_date(pipeline.created_at) %>.
-      </div>
+    <% pi.each do |pipeline| %>
+      <% pipeline.components.each do |k, v| %>
+        <% if v[:job] and v[:job][:uuid] == @object.uuid %>
+          <div>
+            <b><%= k %></b>
+            component of
+            <%= link_to_if_arvados_object pipeline, friendly_name: true %>
+            created at
+            <%= render_localized_date(pipeline.created_at) %>.
+          </div>
+        <% end %>
+      <% end %>
     <% end %>
-  <% end %>
-<% end %>
-</div>
+  </div>
 </div>
diff --git a/apps/workbench/app/views/pipeline_instances/show.html.erb b/apps/workbench/app/views/pipeline_instances/show.html.erb
index 2b07352..860e809 100644
--- a/apps/workbench/app/views/pipeline_instances/show.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/show.html.erb
@@ -18,14 +18,11 @@
 <% content_for :tab_line_buttons do %>
 
   <div id="pipeline-instance-tab-buttons"
-       class="pane-anchor active arv-log-event-listener arv-refresh-on-state-change"
-       href="#pipeline-instance-tab-buttons-pane"
+       class="pane-loaded arv-log-event-listener arv-refresh-on-state-change"
        data-pane-content-url="<%= url_for(params.merge(tab_pane: "tab_buttons")) %>"
        data-object-uuid="<%= @object.uuid %>"
        >
-    <div id="pipeline-instance-tab-buttons-pane" class="active">
-      <%= render partial: 'show_tab_buttons', locals: {object: @object}%>
-    </div>
+    <%= render partial: 'show_tab_buttons', locals: {object: @object}%>
   </div>
 
 <% end %>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list