From 9b1888af889b8bbab7ecbf6e2dc38d40af67ca5f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 13 Jan 2017 13:14:58 +0100
Subject: [PATCH] base: show my account as active when we're showing this view.

Wrong an admin was selected before.
---
 rhodecode/templates/admin/my_account/my_account.mako | 2 +-
 rhodecode/templates/base/base.mako                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rhodecode/templates/admin/my_account/my_account.mako b/rhodecode/templates/admin/my_account/my_account.mako
index 2a6afa34..3231abe2 100644
--- a/rhodecode/templates/admin/my_account/my_account.mako
+++ b/rhodecode/templates/admin/my_account/my_account.mako
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="menu_bar_nav()">
-    ${self.menu_items(active='admin')}
+    ${self.menu_items(active='my_account')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index be93b9d4..cf4df7bd 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -275,9 +275,9 @@
 
 </%def>
 
-<%def name="usermenu()">
+<%def name="usermenu(active=False)">
     ## USER MENU
-    <li id="quick_login_li">
+    <li id="quick_login_li" class="${'active' if active else ''}">
       <a id="quick_login_link" class="menulink childs">
         ${gravatar(c.rhodecode_user.email, 20)}
         <span class="user">
@@ -425,7 +425,7 @@
       </li>
       % endif
       ## render extra user menu
-      ${usermenu()}
+      ${usermenu(active=(active=='my_account'))}
     </ul>
 
     <script type="text/javascript">