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

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

diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index 93c0c49c84c7d9bbbc3309962331261a6a0de7f7..3914624e96857bf174475d23e6726968dd501768 100644 (file)
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -1,4 +1,4 @@
-<div class="modal">
+<div class="modal modal-with-loading-spinner">
   <div class="modal-dialog">
     <div class="modal-content">
 
@@ -8,16 +8,18 @@
       </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| %>
               <% if projectnode[:object].is_a? String %>
-                <div class="row" style="padding-left: <%= 1 + projectnode[:depth] %>em;">
+                <div class="row" style="padding-left: <%= 1 + projectnode[:depth] %>em; margin-right: 0px">
                   <i class="fa fa-fw fa-folder-open-o"></i>
                   <%= projectnode[:object] %>
                 </div>
               <% else %>
-                <div class="<%= 'selectable project' if !params[:editable] || projectnode[:object].editable? %> row" style="padding-left: <%= 1 + projectnode[:depth] %>em;" data-object-uuid="<%= projectnode[:object].uuid %>">
+                <div class="<%= 'selectable project' if !params[:editable] || projectnode[:object].editable? %> row"
+                     style="padding-left: <%= 1 + projectnode[:depth] %>em; margin-right: 0px" data-object-uuid="<%= projectnode[:object].uuid %>">
                   <i class="fa fa-fw fa-folder-o"></i>
                   <% if projectnode[:object].uuid == current_user.uuid %>
                     My Projects