3286: Split Home/Projects thing into Home button and Projects dropdown.

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index ee8690e61c02097fb1ad4dcba32d615071912fb0..3c1aaadf7d5746d34b612a208195a9ec583da726 100644 (file)
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -10,6 +10,11 @@
         <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">
+              Projects
+              <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu" role="menu">
             <%= render partial: "projects_tree_menu", locals: {
                   :project_link_to => Proc.new do |pnode, &block|
                     link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
@@ -19,7 +24,8 @@
                       All <%= controller.model_class.class_for_display.pluralize.downcase %>
                     <% end %>
                   <% end %>
-             <% } %>
+            <% } %>
+            </ul>
             </li>
             <li class="nav-separator">
               <i class="fa fa-lg fa-angle-double-right"></i>

diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 33349129923ca5df8c26b41f226e12977befb642..876b0be65c8120e9d64a16b5d2cf03f73017c944 100644 (file)
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,9 +1,3 @@
-            <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">
                 <%= top_button.call %>
                 My projects
@@ -28,4 +22,3 @@
                   <% end %>
                 </li>
               <% end %>
-            </ul>

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index ec2c98bdcb181d10f189c500e3e5972d96a6c773..d0b27c375823cfdf3d7142c1124075a279f3e523 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -169,7 +169,21 @@
     <% if current_user.andand.is_active %>
       <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
+          <li>
+            <a href="/">
+              <i class="fa fa-lg fa-fw fa-home"></i>
+              Home
+            </a>
+          </li>
+          <li class="nav-separator">
+            <i class="fa fa-lg fa-angle-double-right"></i>
+          </li>
           <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
+              Projects
+              <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu" role="menu">
             <%= 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)
@@ -180,6 +194,7 @@
                     <% end %>
                   <% end %>
             <% } %>
+            </ul>
           </li>
           <% project_breadcrumbs.each do |p| %>
             <li class="nav-separator">