ass settings link on toolbar and tooltip

it3s · Sep 9, 2014 · c34a1d6 · c34a1d6 · LuizArmesto · Sep 9, 2014
1 parent 2ab1e6f
commit c34a1d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/presenters/toolbar_presenter.rb b/app/presenters/toolbar_presenter.rb
@@ -78,7 +78,9 @@ def _history_tool
     end
 
     def _settings_tool
-      { icon: :'cog', title: t('toolbar.settings'), url: "" }
+      settings_url = ctx.settings_path
+      { icon: :'cog', title: t('toolbar.settings'), url: settings_url,
+        active?: ctx.request.path == settings_url }
     end
 
     def _flag_tool

diff --git a/app/views/shared/header/_settings_tooltip.html.erb b/app/views/shared/header/_settings_tooltip.html.erb
@@ -4,7 +4,7 @@
   <ul class="settings-tooltip">
 
     <% if current_user %>
-      <li><%= link_to icon('cog', t('header.settings_menu.settings')), '#', class: 'settings-item' %></li>
+      <li><%= link_to icon('cog', t('header.settings_menu.settings')), settings_path(current_user), class: 'settings-item' %></li>
     <% end %>
 
     <li><%= link_to_modal icon('flag-o', t('header.settings_menu.language')), "#language-selector", :html => {:class => 'settings-item'} %></li>