Merge branch 'master' into 8286-fav-projects

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

diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 10a951a66da8fcb09a24c22396f1673af279ff87..ad2620d3443f5dadb9b1ae9266e1d8d4c5e95d0d 100644 (file)
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,3 +1,18 @@
+<% starred_projects = my_starred_projects current_user%>
+<% if starred_projects.andand.any? %>
+  <li role="presentation" class="dropdown-header">
+    My favorite projects
+  </li>
+  <% (starred_projects).each do |pnode| %>
+    <li>
+      <%= project_link_to.call({object: pnode, depth: 0}) do%>
+        <span style="padding-left: 0em"></span><%= pnode[:name] %>
+      <% end %>
+    </li>
+  <% end %>
+  <li role="presentation" class="divider"></li>
+<% end %>
+
 <li role="presentation" class="dropdown-header">
   My projects
 </li>
@@ -15,8 +30,12 @@
     <% end %>
   </li>
 <% end %>
-<% if my_tree[1] and my_tree[1] > my_tree[0].size %>
+<% if my_tree[1] or my_tree[0].size > 200 %>
+<li role="presentation" class="dropdown-header">
+  Some projects have been omitted.
+</li>
+<% elsif my_tree[2] %>
 <li role="presentation" class="dropdown-header">
-  Showing <%= my_tree[0].size %> of your projects out of <%= my_tree[1] %> total projects.
+  Showing top three levels of your projects.
 </li>
 <% end %>