X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/420949e37a2903ab87f64f57278dfdc6a261a7f3..7fb83a3380e62721801a4980c48ba78208c7b2e2:/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 094cbc9224..2b5ec88fc6 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -60,8 +60,8 @@
       </div>
 
       <div class="collapse navbar-collapse">
+        <% if current_user.andand.is_active %>
           <ul class="nav navbar-nav side-nav">
-            <% if current_user.andand.is_active %>
 
             <li class="<%= 'arvados-nav-active' if params[:action] == 'home' %>">
               <a href="/"><i class="fa fa-lg fa-dashboard fa-fw"></i> Dashboard</a>
@@ -70,12 +70,24 @@
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-lg fa-hand-o-up fa-fw"></i> Help <b class="caret"></b></a>
               <ul class="dropdown-menu">
-                <li><%= link_to raw('<i class="fa fa-lg 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-lg fa-book fa-fw"></i> API Reference'), "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
-                <li><%= link_to raw('<i class="fa fa-lg fa-book fa-fw"></i> SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
+                <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>
 
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-lg fa-folder-o fa-fw"></i> Folders <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><%= link_to raw('<i class="fa fa-plus fa-fw"></i> Create new folder'), folders_path, method: :post %></li>
+                <% @my_top_level_folders.call[0..7].each do |folder| %>
+                <li><%= link_to raw('<i class="fa fa-folder-open fa-fw"></i> ') + folder.name, folder_path(folder) %></li>
+                <% end %>
+                <li><a href="/folders">
+                    <i class="fa fa-ellipsis-h fa-fw"></i> Show all folders
+                </a></li>
+              </ul>
+            </li>
             <li><a href="/collections">
                 <i class="fa fa-lg fa-briefcase fa-fw"></i> Collections (data files)
             </a></li>
@@ -85,50 +97,41 @@
             <li><a href="/pipeline_templates">
                 <i class="fa fa-lg fa-gears fa-fw"></i> Pipeline templates
             </a></li>
-            <li><a href="/folders">
-                <i class="fa fa-lg fa-folder-o fa-fw"></i> Folders
+            <li>&nbsp;</li>
+            <li><a href="/repositories">
+                <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
             </a></li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-lg fa-ellipsis-h fa-fw"></i> More <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="/humans">
-                    <i class="fa fa-lg fa-male fa-fw"></i> Humans
-                </a></li>
-                <li><a href="/specimens">
-                    <i class="fa fa-lg fa-flask fa-fw"></i> Specimens
-                </a></li>
-                <li><a href="/traits">
-                    <i class="fa fa-lg fa-clipboard fa-fw"></i> Traits
-                </a></li>
-                <li><a href="/links">
-                    <i class="fa fa-lg fa-arrows-h fa-fw"></i> Links
-                </a></li>
-                <li><a href="/repositories">
-                    <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
-                </a></li>
-                <li><a href="/virtual_machines">
-                    <i class="fa fa-lg fa-ellipsis-h fa-fw"></i> Virtual machines
-                </a></li>
-                <% if current_user.andand.is_admin %>
-                  <li><a href="/users">
-                      <i class="fa fa-lg fa-user fa-fw"></i> Users
-                  </a></li>
-                <% end %>
-                <li><a href="/groups">
-                    <i class="fa fa-lg fa-users fa-fw"></i> Groups
-                </a></li>
-                <li><a href="/nodes">
-                    <i class="fa fa-lg fa-cogs fa-fw"></i> Compute nodes
-                </a></li>
-                <li><a href="/keep_disks">
-                    <i class="fa fa-lg fa-hdd-o fa-fw"></i> Keep disks
-                </a></li>
-              </ul>
-            </li>
+            <li><a href="/virtual_machines">
+                <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
+            </a></li>
+            <li><a href="/humans">
+                <i class="fa fa-lg fa-male fa-fw"></i> Humans
+            </a></li>
+            <li><a href="/specimens">
+                <i class="fa fa-lg fa-flask fa-fw"></i> Specimens
+            </a></li>
+            <li><a href="/traits">
+                <i class="fa fa-lg fa-clipboard fa-fw"></i> Traits
+            </a></li>
+            <li><a href="/links">
+                <i class="fa fa-lg fa-arrows-h fa-fw"></i> Links
+            </a></li>
+            <% if current_user.andand.is_admin %>
+              <li><a href="/users">
+                  <i class="fa fa-lg fa-user fa-fw"></i> Users
+              </a></li>
             <% end %>
+            <li><a href="/groups">
+                <i class="fa fa-lg fa-users fa-fw"></i> Groups
+            </a></li>
+            <li><a href="/nodes">
+                <i class="fa fa-lg fa-cogs fa-fw"></i> Compute nodes
+            </a></li>
+            <li><a href="/keep_disks">
+                <i class="fa fa-lg fa-hdd-o fa-fw"></i> Keep disks
+            </a></li>
           </ul>
-
-
+        <% end %>
 
         <ul class="nav navbar-nav navbar-left breadcrumbs">
           <% if current_user %>
@@ -138,7 +141,7 @@
               <li class="nav-separator"><span class="glyphicon glyphicon-arrow-right"></span></li>
               <li>
                 <%= link_to(
-                            controller.model_class_for_display.pluralize.underscore.gsub('_', ' '),
+                            controller.controller_name.humanize.downcase,
                             url_for({controller: params[:controller]})) %>
               </li>
               <% if params[:action] != 'index' %>
@@ -146,7 +149,7 @@
                   <span class="glyphicon glyphicon-arrow-right"></span>
                 </li>
                 <li>
-                  <%= link_to_if_arvados_object @object %>
+                  <%= link_to_if_arvados_object @object, {friendly_name: true}, {data: {object_uuid: @object.andand.uuid, name: 'name'}} %>
                 </li>
                 <li style="padding: 14px 0 14px">
                   <%= form_tag do |f| %>
@@ -184,6 +187,7 @@
             </a>
               <ul class="dropdown-menu" role="menu" id="persistent-selection-list">
                 <%= form_tag '/actions' do %>
+                <%= hidden_field_tag 'uuid', @object.andand.uuid %>
                 <div id="selection-form-content"></div>
                 <% end %>
             </ul>