Merge branch '9857-cwl-acceptlist-re' refs #9857

[arvados.git] / apps / workbench / app / views / projects / _show_dashboard.html.erb

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index afca2468d7aa86193d349d1aefee9b6f82d1170f..c02577fcfd28ca3e9a2e552a14af22e12a183620 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -7,12 +7,12 @@
             <span class="pull-right recent-processes-actions">
               <span>
                 <%= link_to(
-                choose_pipeline_templates_path(
-                  title: 'Choose a pipeline to run:',
+                choose_work_unit_templates_path(
+                  title: 'Choose a pipeline or workflow to run:',
                   action_name: 'Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i>',
-                  action_href: pipeline_instances_path,
+                  action_href: work_units_path,
                   action_method: 'post',
-                  action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json),
+                  action_data: {'selection_param' => 'work_unit[template_uuid]', 'work_unit[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json),
                 { class: "btn btn-primary btn-xs", remote: true }) do %>
                   <i class="fa fa-fw fa-gear"></i> Run a pipeline...
                 <% end %>
@@ -60,13 +60,21 @@
             </div>
             <% else %>
             <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
-              <div class="clearfix">
-                <%= link_to_if_arvados_object p, {friendly_name: true} %>
-                <div class="pull-right" style="width: 40%">
+              <div class="row">
+                <div class="col-md-6">
+                  <%= link_to_if_arvados_object p, {friendly_name: true} %>
+                </div>
+                <% if wu.is_running? %>
+                <div class="col-md-6">
                   <div class="progress" style="margin-bottom: 0px">
                     <% wu.progress %>
                   </div>
                 </div>
+                <% else %>
+                <div class="col-md-2">
+                  <span class="label label-<%=wu.state_bootstrap_class%>"><%=wu.state_label%></span>
+                </div>
+                <% end %>
               </div>
 
               <%