3605: Rename "default_show" to "title_and_buttons". Revert capitalization

change to "curl".  Eliminate excess top margin on page title.  Restored
RunningOnClient to running list.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 2624115c6954c0ecf8ec22ebf26f9184f41d076f..d3abe4fcca92064812151a754393ee124bd543fd 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -256,4 +256,8 @@ span.editable-textile {
   font-size: 80%;
   min-width: 1em;
   padding: 0px 2px 0px 0px;
+}
+
+#page-wrapper > div > h2 {
+  margin-top: 0px;
 }
\ No newline at end of file

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d66dbd318b8e95147b5c1be6afb0adffcd3597ab..4b775c6036af8bd37c848c2dfc5bf227a41cbfb7 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -694,7 +694,7 @@ class ApplicationController < ActionController::Base
 
   helper_method :running_pipelines
   def running_pipelines
-    pi = PipelineInstance.order(["started_at asc", "created_at asc"]).filter([["state", "in", ["RunningOnServer"]]])
+    pi = PipelineInstance.order(["started_at asc", "created_at asc"]).filter([["state", "in", ["RunningOnServer", "RunningOnClient"]]])
     jobs = {}
     pi.each do |pl|
       pl.components.each do |k,v|

diff --git a/apps/workbench/app/views/application/_content_layout.html.erb b/apps/workbench/app/views/application/_content_layout.html.erb
index 3e50b6eb8c3a97e19fb485909a2dbaf2fcd819a9..4902332a0f75604ba02aed9a2633ba6d5c5bdda9 100644 (file)
--- a/apps/workbench/app/views/application/_content_layout.html.erb
+++ b/apps/workbench/app/views/application/_content_layout.html.erb
@@ -1,6 +1,8 @@
-<%= content_for :content_top %>
-<div class="pull-right">
-  <%= content_for :tab_line_buttons %>
+<div class="clearfix">
+  <%= content_for :content_top %>
+  <div class="pull-right">
+    <%= content_for :tab_line_buttons %>
+  </div>
 </div>
-<br clear="all" />
+
 <%= content_for :tab_panes %>

diff --git a/apps/workbench/app/views/application/_show_advanced.html.erb b/apps/workbench/app/views/application/_show_advanced.html.erb
index 1cde5c8cb03e0919e64dd15bd7ff253cb889db63..70dd96b0325ae7dbc3b84418060065234237dbe7 100644 (file)
--- a/apps/workbench/app/views/application/_show_advanced.html.erb
+++ b/apps/workbench/app/views/application/_show_advanced.html.erb
@@ -3,7 +3,7 @@
       'Metadata',
       'Python example',
       'CLI example',
-      'Curl example'].each do |section| %>
+      'curl example'].each do |section| %>
     <% section_id = section.gsub(" ","_").downcase %>
     <div class="panel panel-default">
       <div class="panel-heading">

diff --git a/apps/workbench/app/views/application/_default_show.html.erb b/apps/workbench/app/views/application/_title_and_buttons.html.erb
similarity index 79%
rename from apps/workbench/app/views/application/_default_show.html.erb
rename to apps/workbench/app/views/application/_title_and_buttons.html.erb
index 65574425d8e63c99b05e48a2619910a95c9d3958..e1ec160ec14bf96aa0701b43898d4d3132cf6d00 100644 (file)
--- a/apps/workbench/app/views/application/_default_show.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@ -8,6 +8,7 @@
   <% if !['Group','User', 'Collection'].include? @object.class.to_s # projects and collections handle it themselves %>
     <%= render partial: 'name_and_description' %>
   <% end %>
+<% end %>
 
 <% if @object.class.goes_in_projects? && @object.uuid != current_user.uuid # Not the "Home" project %>
   <% content_for :tab_line_buttons do %>
@@ -48,22 +49,3 @@
   <% end %>
 <% end %>
 
-<% if @object.respond_to? :properties and !@object.properties.nil? %>
-  <% if @object.properties[:page_content] %>
-    <% content_for :page_content do %>
-      <h1>
-        <%= render_markup(@object.properties[:page_title] || @object.uuid) %>
-      </h1>
-
-      <% if @object.properties[:page_subtitle] %>
-        <h4>
-          <%= render_markup @object.properties[:page_subtitle] %>
-        </h4>
-      <% end %>
-
-      <%= render_markup @object.properties[:page_content] %>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% end %>

diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb
index 86e212e2254f97896221c71ff9b7651ab4104189..9b1b002c7ddb0e1e9a66c157402bfac4acac54aa 100644 (file)
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -1,2 +1,2 @@
-<%= render partial: 'default_show' %>
+<%= render partial: 'title_and_buttons' %>
 <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%>

diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index abd1a4f01824c4f17ef706952a12d684f904643b..cec63403ef1063cb652c642ab7238ddf931c27da 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -1,8 +1,10 @@
+<div style="margin-top: 10px">
 <% pj = {} %>
 <% pj[:job] = @object %>
 <% pj[:name] = @object[:name] || "this job" %>
 <% tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results %>
 <%= render partial: 'pipeline_instances/running_component', locals: {tasks: tasks, pj: pj, i: 0, expanded: true} %>
+</div>
 
   <div class="panel panel-default">
     <div class="panel-heading">

diff --git a/apps/workbench/app/views/jobs/show.html.erb b/apps/workbench/app/views/jobs/show.html.erb
index d72fa3fa4238dd2f1e2172e6555e2a4438d717b4..d3047ce119b5dbaac80cf40ddd193e2fd4851515 100644 (file)
--- a/apps/workbench/app/views/jobs/show.html.erb
+++ b/apps/workbench/app/views/jobs/show.html.erb
@@ -28,5 +28,5 @@
 <% end %>
 <% end %>
 
-<%= render partial: 'default_show' %>
+<%= render partial: 'title_and_buttons' %>
 <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%>

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index c8f768b55a1df19d16b4ad684ca6c172056607b1..47315941a0f74037cedde55b55ba9ae6e95a2ed3 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -142,7 +142,7 @@
     </div>
 
     <div class="col-md-6">
-      <% nodes = Node.all.select { |n| (Time.now - n[:last_ping_at]) < 3600 } %>
+      <% nodes = Node.all %>
       <div class="panel panel-default" style="min-height: 10em">
         <div class="panel-heading"><span class="panel-title">Compute status</span></div>
         <div class="panel-body">