projects / arvados.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
3138: update page-wrapper for each refresh.
[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 ec26409ca6a193125a7594a8f1808b1b5ea12487..0bd1126d9d8d165d263605292cc31b126d7bff9b 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -43,7 +43,7 @@
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
 </head>
 <body>
-  <div id="wrapper" class="container-fluid">
+  <div class="container-fluid">
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -52,7 +52,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
+        <a class="navbar-brand" data-push="true" data-target="#page-wrapper" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
       </div>
 
       <div class="collapse navbar-collapse">
@@ -74,7 +74,6 @@
           </li>
           -->
 
-          <% if current_user %>
           <li class="dropdown notification-menu">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-menu">
               <span class="badge badge-alert notification-count"><%= @notification_count %></span>
@@ -97,10 +96,9 @@
               <% end %>
             </ul>
           </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>
@@ -119,7 +117,7 @@
               </a>
               <ul class="dropdown-menu" role="menu">
                 <li role="presentation" class="dropdown-header">
-                  System tools
+                  Settings
                 </li>
                 <li role="presentation"><a href="/repositories">
                     <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
@@ -153,6 +151,17 @@
           <% else %>
             <li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
           <% end %>
+
+          <li class="dropdown help-menu">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="arv-help">
+              <span class="fa fa-lg fa-question-circle"></span>
+            </a>
+            <ul class="dropdown-menu">
+              <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> Tutorials and User guide'), "#{Rails.configuration.arvados_docsite}/user", target: "_blank" %></li>
+              <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> API Reference'), "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
+              <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
+            </ul>
+          </li>
         </ul>
       </div><!-- /.navbar-collapse -->
     </nav>
@@ -161,35 +170,16 @@
       <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">
-              <i class="fa fa-lg fa-fw fa-home"></i>
-              Projects
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu" role="menu">
-              <li role="presentation" class="dropdown-header">
-                <%= link_to projects_path('project[owner_uuid]' => current_project_uuid), method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
-                  <i class="fa fa-plus"></i> New project
-                <% end %>
-                My projects
-              </li>
-              <% my_projects.each do |p| %>
-                <li>
-                  <%= link_to(p.name, project_path(p.uuid)) %>
-                </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 %>
+            <%= render partial: "projects_tree_menu", locals: {
+                  :project_link_to => Proc.new do |pnode, &block|
+                    link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
+                  end,
+                  :top_button => Proc.new do %>
+                    <% link_to projects_path('project[owner_uuid]' => current_project_uuid), method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
+                      <i class="fa fa-plus"></i> New project
+                    <% end %>
                   <% end %>
-                </li>
-              <% end %>
-            </ul>
+            <% } %>
           </li>
           <% project_breadcrumbs.each do |p| %>
             <li class="nav-separator">
@@ -199,11 +189,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 %>