[ARVADOS] updated: e20040092b47f79365637dd8e26156d95ab5c6ee

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb | 2 +-
 apps/workbench/app/views/pipeline_instances/show.html.erb            | 4 ++--
 apps/workbench/app/views/users/_add_ssh_key_popup.html.erb           | 2 +-
 apps/workbench/app/views/users/_setup_popup.html.erb                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

       via  e20040092b47f79365637dd8e26156d95ab5c6ee (commit)
      from  1e2e0e4f14a730ba1bbea6a4ced5d87ea2766c35 (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 e20040092b47f79365637dd8e26156d95ab5c6ee
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Feb 5 16:43:29 2015 -0500

    5135: Workbench consistently orders modal buttons.
    
    Primary buttons should be first from the right, following Bootstrap
    conventions and Tom's edict.  Closes #5135.

diff --git a/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb b/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
index 931b8da..f908663 100644
--- a/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
+++ b/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
@@ -39,8 +39,8 @@
         </div>
 
         <div class="modal-footer">
-          <%= f.submit(value: "Run now", class: "btn btn-primary") %>
           <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+          <%= f.submit(value: "Run now", class: "btn btn-primary") %>
         </div>
       <% end %>
     </div>
diff --git a/apps/workbench/app/views/pipeline_instances/show.html.erb b/apps/workbench/app/views/pipeline_instances/show.html.erb
index 860e809..e23e49c 100644
--- a/apps/workbench/app/views/pipeline_instances/show.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/show.html.erb
@@ -62,9 +62,9 @@
       </div>
 
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary" name="pipeline_instance[state]" value="New">Copy and edit inputs</button>
-        <button type="submit" class="btn btn-primary" name="pipeline_instance[state]" value="RunningOnServer">Run now</button>
         <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+        <button type="submit" class="btn btn-primary" name="pipeline_instance[state]" value="RunningOnServer">Run now</button>
+        <button type="submit" class="btn btn-primary" name="pipeline_instance[state]" value="New">Copy and edit inputs</button>
       </div>
 
     </div>
diff --git a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
index 98f54ef..25f4d75 100644
--- a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
+++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
@@ -29,8 +29,8 @@
       </div>
 
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary" autofocus>Submit</button>
         <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+        <button type="submit" class="btn btn-primary" autofocus>Submit</button>
       </div>
 
     <% end #form %>
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index e9429cf..a1a664c 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -64,8 +64,8 @@
     </div>
 
     <div class="modal-footer">
-      <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
       <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+      <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
     </div>
 
     <% end #form %>

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


hooks/post-receive
--