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 4287115ba0e9beed74d61c94369977a6ed442592..778268ea5b0ad424a161768b51a9befce5ef556e 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -14,7 +14,7 @@
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
   <meta name="description" content="">
   <meta name="author" content="">
-  <% if current_user %>
+  <% if current_user and $arvados_api_client.discovery[:websocketUrl] %>
   <meta name="arv-websocket-url" content="<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>">
   <% end %>
   <meta name="robots" content="NOINDEX, NOFOLLOW">
@@ -99,8 +99,8 @@
           </li>
           <% end %>
 
-          <li class="dropdown notification-menu">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="collections-menu">
+          <li class="dropdown selection-menu">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
               <span class="fa fa-lg fa-paperclip"></span>
               <span class="badge" id="persistent-selection-count"></span>
             </a>
@@ -156,7 +156,9 @@
         </ul>
       </div><!-- /.navbar-collapse -->
     </nav>
-    <nav class="navbar navbar-default breadcrumbs" role="navigation">
+
+    <% if current_user.andand.is_active %>
+      <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
@@ -171,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 %>
@@ -197,21 +201,15 @@
               <%= 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>
+      </nav>
+    <% end %>
 
     <div id="page-wrapper">
       <%= yield %>
     </div>
   </div>
 
-</div>
-
   <%= yield :footer_html %>
   <%= piwik_tracking_tag %>
   <%= javascript_tag do %>