2872: Merge branch 'master' into 2872-folder-nav

[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..ec26409ca6a193125a7594a8f1808b1b5ea12487 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">
@@ -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">
@@ -203,15 +205,14 @@
             </li>
           <% end %>
         </ul>
-    </nav>
+      </nav>
+    <% end %>
 
     <div id="page-wrapper">
       <%= yield %>
     </div>
   </div>
 
-</div>
-
   <%= yield :footer_html %>
   <%= piwik_tracking_tag %>
   <%= javascript_tag do %>