X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d28b1cebc8b799ea1e65a50826602392b446ea29..ea2fecde7e80f9d6c493bcb1bf2b7ee25fd96b12:/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 3914624e96..82b9485450 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -4,11 +4,14 @@
 
       <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">
-        <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| %>
@@ -17,15 +20,19 @@
                   <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"
+              <% else
+                 row_selectable = !params[:editable] || projectnode[:object].editable?
+                 folder_class = "fa-folder-o"
+                 if projectnode[:object].uuid == current_user.uuid
+                   row_name = "My Projects"
+                   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'
+                 end %>
+                <div class="<%= 'selectable project' if row_selectable %> 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
-                  <% else %>
-                    <%= projectnode[:object].friendly_link_name || 'New project' %>
-                  <% end %>
+                  <i class="fa fa-fw <%= folder_class %>"></i> <%= row_name %>
                 </div>
               <% end %>
             <% end %>
@@ -35,7 +42,7 @@
 
       <div class="modal-footer">
         <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
-        <button class="btn btn-primary" aria-hidden="true"><%= params[:action_name] || 'Select' %></button>
+        <button class="btn btn-primary" aria-hidden="true" data-enable-if-selection disabled><%= params[:action_name] || 'Select' %></button>
         <div class="modal-error hide" style="text-align: left; margin-top: 1em;">
         </div>
       </div>