Merge branch '2883-job-log-viewer' of git.curoverse.com:arvados into origin-2883...

[arvados.git] / apps / workbench / app / views / layouts / application.html.erb

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index c42abfe11857c239a3b3d3700ac8aaf1655f76fd..778268ea5b0ad424a161768b51a9befce5ef556e 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -173,19 +173,21 @@
                 <% end %>
                 My projects
               </li>
-              <% my_projects.each do |p| %>
-                <li>
-                  <%= link_to(p.name, project_path(p.uuid)) %>
+              <% my_project_tree.each do |pnode| %>
+                <% next if pnode[:object].class != Group %>
+                <li style="padding-left: <%= pnode[:depth]-1 %>em">
+                  <%= link_to(pnode[:object].name, project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}) %>
                 </li>
               <% end %>
               <li class="divider">
               <li role="presentation" class="dropdown-header">
                 Projects shared with me
               </li>
-              <% projects_shared_with_me.each do |p| %>
-                <li>
-                  <%= link_to project_path(p.uuid) do %>
-                    <i class="fa fa-fw fa-share-alt"></i> <%= p.name %>
+              <% shared_project_tree.each do |pnode| %>
+                <% next if pnode[:object].class != Group %>
+                <li style="padding-left: <%= pnode[:depth]-1 %>em">
+                  <%= link_to project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'} do %>
+                    <i class="fa fa-fw fa-share-alt" style="color:#aaa"></i> <%= pnode[:object].name %>
                   <% end %>
                 </li>
               <% end %>
@@ -199,11 +201,6 @@
               <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
             </li>
           <% end %>
-          <% if current_project_uuid.andand != @object.andand.uuid %>
-            <li class="nav-separator">
-              <i class="fa fa-lg fa-angle-double-right"></i>
-            </li>
-          <% end %>
         </ul>
       </nav>
     <% end %>