[ARVADOS] updated: c8bb1c582ef4d96f69f317c2b48d678f69e150a9

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/application/_choose.html.erb |  2 +-
 apps/workbench/app/views/projects/_choose.html.erb    |  2 +-
 apps/workbench/app/views/users/_setup_popup.html.erb  |  2 +-
 crunch_scripts/arvados-bcbio-nextgen.py               | 17 +++++++++--------
 4 files changed, 12 insertions(+), 11 deletions(-)

       via  c8bb1c582ef4d96f69f317c2b48d678f69e150a9 (commit)
       via  4eaefcfc0bf2def8e586e58b0282e6351a77f561 (commit)
       via  10543be10e5db9721a638d46e40bacc17d7599fe (commit)
      from  d28b1cebc8b799ea1e65a50826602392b446ea29 (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 c8bb1c582ef4d96f69f317c2b48d678f69e150a9
Merge: 4eaefcf 10543be
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 7 13:44:35 2014 -0400

    Merge branch 'master' into 3106-modal-loading-indicator


commit 4eaefcfc0bf2def8e586e58b0282e6351a77f561
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 7 13:43:41 2014 -0400

    3106: spinner to the left to avoid shifting down elements when it is visible

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 488863d..794fb2c 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -4,9 +4,9 @@
       <div class="modal-header">
         <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
         <h4 class="modal-title"><%= params[:title] || "Choose #{@objects.first.andand.class_for_display}" %></h4>
+        <div class="spinner spinner-32px spinner-h-center pull-left" hidden="true"></div>
       </div>
       <div class="modal-body">
-        <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
         <nav class="navbar navbar-default breadcrumbs" role="navigation">
           <ul class="nav navbar-nav navbar-left">
             <li class="dropdown">
diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index 3914624..37e3104 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -5,10 +5,10 @@
       <div class="modal-header">
         <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
         <h4 class="modal-title"><%= params[:title] || 'Choose project' %></h4>
+        <div class="spinner spinner-32px spinner-h-center pull-left" hidden="true"></div>
       </div>
 
       <div class="modal-body">
-        <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
         <div class="selectable-container" style="height: 15em; overflow-y: scroll">
           <% [my_project_tree, shared_project_tree].each do |tree| %>
             <% tree.each do |projectnode| %>
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 7757298..a533f01 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -7,10 +7,10 @@
     <div class="modal-header">
       <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
       <h4 class="modal-title">Setup User</h4>
+        <div class="spinner spinner-32px spinner-h-center pull-left" hidden="true"></div>
     </div>
 
     <div class="modal-body">
-      <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
       <% if @object%>
         <% uuid = @object.uuid %>
         <% email = @object.email %>

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


hooks/post-receive
--