Merge branch 'master' into 3373-improve-gatk3-snv-pipeline

[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 4bae8aab8fd894b6073439a8f9da8df05c449ff7..3d55041cb8ca834db93f954406e3e5801e8a5c87 100644 (file)
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -1,10 +1,14 @@
-<div class="modal">
+<div class="modal modal-with-loading-spinner">
   <div class="modal-dialog">
     <div class="modal-content">
 
       <div class="modal-header">
         <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title"><%= params[:title] || 'Choose project' %></h4>
+        <div>
+          <div class="col-sm-6"> <h4 class="modal-title"><%= params[:title] || 'Choose project' %></h4> </div>
+          <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
+        </div>
+        <br/>
       </div>
 
       <div class="modal-body">
@@ -21,7 +25,7 @@
                  folder_class = "fa-folder-o"
                  if projectnode[:object].uuid == current_user.uuid
                    row_name = "My Projects"
-                   row_selectable &&= (resource_class_for_uuid(params[:action_href].split("/").last) == Group) rescue false
+                   row_selectable &&= params[:my_root_selectable]
                    folder_class = "fa-folder-open-o" if not row_selectable
                  else
                    row_name = projectnode[:object].friendly_link_name || 'New project'