[ARVADOS] updated: d61f27791aa739dfc93c2f953236fffd4f0fcf6c

[git at public.curoverse.com]

Summary of changes:
 .../app/views/pipeline_instances/_show_inputs.html.erb  | 17 ++++++++---------
 services/api/test/fixtures/pipeline_templates.yml       |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

       via  d61f27791aa739dfc93c2f953236fffd4f0fcf6c (commit)
      from  89096c06922b406f7157082de410e40960f5c73e (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 d61f27791aa739dfc93c2f953236fffd4f0fcf6c
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu May 22 19:19:03 2014 -0400

    2754: Allow template to specify form label, fix up wording and formatting.

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 a1b90ec..5ef8444 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
@@ -1,7 +1,7 @@
 <% 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 %>
@@ -10,7 +10,10 @@
           <% if (pvalue_spec[:description] or
                  (pvalue_spec[:required] and not pvalue_spec[:value])) %>
             <% n_inputs += 1 %>
-            <label for="<% "#{cname}-#{pname}" %>"><%= pname.to_s.humanize %> for <%= cname %> component:</label>
+            <label for="<% "#{cname}-#{pname}" %>">
+              <%= pvalue_spec[:title] ||
+                  "#{pname.to_s.humanize} for #{cname} component" %>
+            </label>
             <div>
               <p class="form-control-static">
                 <%= render_pipeline_component_attribute @object, :components, [cname, :script_parameters, pname.to_sym], pvalue_spec %>
@@ -28,13 +31,9 @@
 <% end %>
 
 <% if n_inputs == 0 %>
-  <div class="alert alert-info">
-    <p>This pipeline does not need any further inputs specified. You can start it by clicking the "Run" button.</p>
-  </div>
+  <p>This pipeline does not need any further inputs specified. You can start it by clicking the "Run" button.</p>
 <% else %>
-  <div class="alert alert-info">
-    <p>Provide <%= n_inputs > 1 ? 'values' : 'a value' %> for the following <%= n_inputs > 1 ? 'parameters' : 'parameter' %>, then click the "Run" button to start the pipeline.</p>
-  </div>
+  <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>
   <%= content_for :pi_input_form %>
 
   <%= form_tag @object, :method => :put do |f| %>
@@ -47,5 +46,5 @@
 <% end %>
 
 <div style="margin-top: 1em;">
-  <p>For a full list of pipeline components and parameters, click the "Components" tab above.</p>
+  <p>Click the "Components" tab above to see a full list of pipeline components and parameters.</p>
 </div>
diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml
index 41005a4..74cb1e8 100644
--- a/services/api/test/fixtures/pipeline_templates.yml
+++ b/services/api/test/fixtures/pipeline_templates.yml
@@ -15,6 +15,7 @@ two_part:
         input:
           required: true
           dataclass: Collection
+          title: "Foo/bar pair"
           description: "Provide a collection containing at least two files."
     part-two:
       script: bar

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


hooks/post-receive
--