2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809

[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 0923f8f53339123a2d3f177abc2a7b865137729b..2d3c4c0de0239881cfe5404679dfd076634f97ca 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -77,10 +77,10 @@
             </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>
+              <a href="/folders" 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.each do |folder| %>
+                <% @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">
@@ -91,6 +91,9 @@
             <li><a href="/collections">
                 <i class="fa fa-lg fa-briefcase fa-fw"></i> Collections (data files)
             </a></li>
+            <li><a href="/jobs">
+                <i class="fa fa-lg fa-tasks fa-fw"></i> Jobs
+            </a></li>
             <li><a href="/pipeline_instances">
                 <i class="fa fa-lg fa-tasks fa-fw"></i> Pipeline instances
             </a></li>
@@ -102,7 +105,7 @@
                 <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-cloud fa-fw"></i> 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
@@ -149,7 +152,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| %>
@@ -229,7 +232,7 @@
             </ul>
           </li>
           <% else %>
-            <li><a href="<%= $arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
+            <li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
           <% end %>
         </ul>
       </div><!-- /.navbar-collapse -->