summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-12-20 11:52:00 -0800
committerazul <azul@riseup.net>2013-12-20 11:52:00 -0800
commit3d9a6d11003a72d88b4d49c66584041275fa1dd4 (patch)
tree7b49f252d2229142084aaca95122a04554fb3350 /app
parent9d1fdcb1d5a18c74776b43cb78e3dc305fdddffc (diff)
parent5c9d2ba552537b8dba98d9fe98e05c38fa788a5e (diff)
Merge pull request #130 from azul/bugfix/4805-fix-overview-active
make sure overview link is active on Users#show - fixes #4805
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/_navigation.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index f90ed16..b81c43d 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,6 +1,6 @@
%ul.nav.sidenav
- = link_to_navigation t(:overview), @user, :active => controller?(:overviews)
- = link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users)
+ = link_to_navigation t(:overview), @user, :active => (controller?(:users) && action?(:show))
+ = link_to_navigation t(:account_settings), edit_user_path(@user), :active => (controller?(:users) && !action?(:show))
- # will want link for identity settings
= link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets)
= link_to_navigation t(:billing_settings), billing_top_link(@user), :active => controller?(:customer, :payments, :subscriptions, :credit_card_info) if APP_CONFIG[:billing]