X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1797ee0dea063ff59361740ee512c84d086dacaf..fcd19228447a2983c7aba8a0f09984eba06ded48:/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb

diff --git a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
index a24aaa23aa..e6b7ef2034 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
@@ -1,16 +1,18 @@
 <% n_inputs = 0 %>
 
 <% content_for :pi_input_form do %>
-<form role="form">
+<form role="form" style="width:60%">
   <div class="form-group">
     <% @object.components.each do |cname, component| %>
       <% next if !component %>
       <% component[:script_parameters].andand.each do |pname, pvalue_spec| %>
         <% if pvalue_spec.is_a? Hash %>
-          <% if (pvalue_spec[:description] or
-                 (pvalue_spec[:required] and not pvalue_spec[:value])) %>
+          <% if pvalue_spec[:description] or
+                pvalue_spec[:required] or pvalue_spec[:optional] == false %>
             <% n_inputs += 1 %>
-            <label for="<% "#{cname}-#{pname}" %>"><%= pname.to_s.humanize %> for <%= cname %> component:</label>
+            <label for="<% "#{cname}-#{pname}" %>">
+              <%= @object.component_input_title(cname, pname) %>
+            </label>
             <div>
               <p class="form-control-static">
                 <%= render_pipeline_component_attribute @object, :components, [cname, :script_parameters, pname.to_sym], pvalue_spec %>
@@ -28,16 +30,21 @@
 <% end %>
 
 <% if n_inputs == 0 %>
-  <p>This pipeline does not need any further inputs specified. You can start it by clicking the "Run" button.</p>
+  <p>This pipeline does not need any further inputs specified. You can start it by clicking the "Run" button whenever you're ready. (It's not too late to change existing settings, though.)</p>
 <% else %>
-  <p>Please choose values for the following <%= n_inputs > 1 ? 'inputs' : 'input' %> before starting the pipeline.</p>
-  <%= content_for :pi_input_form %>
-
-  <%= form_tag @object, :method => :put do |f| %>
-    <%= hidden_field @object.class.to_s.underscore.singularize.to_sym, :state, :value => 'RunningOnServer' %>
-    <%= button_tag({class: 'btn btn-primary run-pipeline-button'}) do %>
-     Run <i class="fa fa-fw fa-play"></i>
+  <p><i>Provide <%= n_inputs > 1 ? 'values' : 'a value' %> for the following <%= n_inputs > 1 ? 'parameters' : 'parameter' %>, then click the "Run" button to start the pipeline.</i></p>
+  <% if @object.editable? %>
+    <%= content_for :pi_input_form %>
+      <%= link_to(url_for('pipeline_instance[state]' => 'RunningOnServer'),
+          class: 'btn btn-primary run-pipeline-button',
+          method: :patch
+          ) do %>
+        Run <i class="fa fa-fw fa-play"></i>
     <% end %>
   <% end %>
 
 <% end %>
+
+<div style="margin-top: 1em;">
+  <p>Click the "Components" tab above to see a full list of pipeline settings.</p>
+</div>