X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d0930bfe4226ba361a5b1087b01946130f8282fd..c6378b0e7da030652334366c8459ff3853811529:/apps/workbench/app/views/layouts/body.html.erb

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 1d081640cb..3f95be35de 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -40,7 +40,7 @@
           <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>
-              <%= current_user.email %>
+              <%= current_user.email %> <span class="caret"></span>
             </a>
             <ul class="dropdown-menu" role="menu">
               <li role="presentation" class="dropdown-header">
@@ -49,7 +49,7 @@
               <% if current_user.is_active %>
               <li role="presentation"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
               <% if Rails.configuration.user_profile_form_fields %>
-                <li role="presentation"><a href="/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage my profile</a></li>
+                <li role="presentation"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
               <% end %>
               <li role="presentation" class="divider"></li>
               <% end %>
@@ -136,6 +136,17 @@
               <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>
+              <li role="presentation" class="divider"></li>
+              <li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.url, current_path: request.fullpath, action_method: 'post'),
+                      {class: 'report-issue-modal-window',  :remote => true, return_to: request.url} do %>
+                       <i class="fa fa-fw fa-support"></i> Show version / debugging info ...
+                      <% end %>
+              </li>
+              <li> <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post'),
+                      {class: 'report-issue-modal-window', :remote => true, return_to: request.url} do %>
+                       <i class="fa fa-fw fa-support"></i> Report a problem ...
+                      <% end %>
+              </li>
             </ul>
           </li>
         </ul>
@@ -147,13 +158,10 @@
         <ul class="nav navbar-nav navbar-left">
           <li>
             <a href="/">
-              <i class="fa fa-lg fa-fw fa-home"></i>
-              Home
+              <i class="fa fa-lg fa-fw fa-dashboard"></i>
+              Dashboard
             </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
@@ -175,13 +183,23 @@
             <% } %>
             </ul>
           </li>
-          <% project_breadcrumbs.each do |p| %>
+          <% if @name_link or @object %>
             <li class="nav-separator">
               <i class="fa fa-lg fa-angle-double-right"></i>
             </li>
             <li>
-              <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
+              <%= link_to project_path(current_user.uuid) do %>
+                Home
+              <% end %>
             </li>
+            <% project_breadcrumbs.each do |p| %>
+              <li class="nav-separator">
+                <i class="fa fa-lg fa-angle-double-right"></i>
+              </li>
+              <li>
+                <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
+              </li>
+            <% end %>
           <% end %>
         </ul>
       </nav>
@@ -195,3 +213,4 @@
   <%= yield :footer_html %>
 
 <div class="modal-container"></div>
+<div id="report-issue-modal-window"></div>