Merge branch '3112-report-bug' into 3620-admin-only-gear-menu

[arvados.git] / 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 bedcf8846ef1fe2edca3b757601e2030cfaa7cb5..0f4c5fe4037258d20ed5d88320fbecc4061451e8 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -78,7 +78,7 @@
             </ul>
           </li>
 
-          <% if current_user.is_active %>
+          <% if current_user.is_admin %>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="system-menu">
                 <span class="fa fa-lg fa-gear"></span>
@@ -87,28 +87,24 @@
                 <li role="presentation" class="dropdown-header">
                   Settings
                 </li>
-                <% if current_user.andand.is_admin %>
-                  <li role="presentation"><a href="/repositories">
-                      <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
-                  </a></li>
-                  <li role="presentation"><a href="/virtual_machines">
-                      <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
-                  </a></li>
-                  <li role="presentation"><a href="/authorized_keys">
-                      <i class="fa fa-lg fa-key fa-fw"></i> SSH keys
-                  </a></li>
-                  <li role="presentation"><a href="/api_client_authorizations">
-                      <i class="fa fa-lg fa-ticket fa-fw"></i> API tokens
-                  </a></li>
-                <% end %>
+                <li role="presentation"><a href="/repositories">
+                    <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
+                </a></li>
+                <li role="presentation"><a href="/virtual_machines">
+                    <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
+                </a></li>
+                <li role="presentation"><a href="/authorized_keys">
+                    <i class="fa fa-lg fa-key fa-fw"></i> SSH keys
+                </a></li>
+                <li role="presentation"><a href="/api_client_authorizations">
+                    <i class="fa fa-lg fa-ticket fa-fw"></i> API tokens
+                </a></li>
                 <li role="presentation"><a href="/links">
                     <i class="fa fa-lg fa-arrows-h fa-fw"></i> Links
                 </a></li>
-                <% if current_user.andand.is_admin %>
-                  <li role="presentation"><a href="/users">
-                      <i class="fa fa-lg fa-user fa-fw"></i> Users
-                  </a></li>
-                <% end %>
+                <li role="presentation"><a href="/users">
+                    <i class="fa fa-lg fa-user fa-fw"></i> Users
+                </a></li>
                 <li role="presentation"><a href="/groups">
                     <i class="fa fa-lg fa-users fa-fw"></i> Groups
                 </a></li>
@@ -137,14 +133,14 @@
               <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.fullpath, action_method: 'post'),
-                      {class: 'report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
-                       <i class="fa fa-fw fa-support"></i> Show version / debugging info
+              <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.fullpath, action_method: 'post'),
-                      {class: 'report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
-                       <i class="fa fa-fw fa-support"></i> Report a problem
+              <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>
@@ -213,4 +209,4 @@
   <%= yield :footer_html %>
 
 <div class="modal-container"></div>
-<div id="report-issue-modal-window" class="modal fade" role="dialog" aria-labelledby="report-issue-modal" aria-hidden="true"></div>
+<div id="report-issue-modal-window"></div>