Set current pages indication for search and journal

rhodecode/templates/base/base.html

@@ -144,7 +144,8 b''
             if selected == current:
                 return h.literal('class="current"')
         %>
-        %if current not in ['home','admin']:
+        ## we render this menu only not for those pages 
+        %if current not in ['home','admin', 'search', 'journal']:
             ##REGULAR MENU
             <ul id="quick">
                 <!-- repo switcher -->
@@ -326,7 +327,7 b''
                     </a>
                 </li>
                 %if c.rhodecode_user.username != 'default':
-                 <li>
+                 <li ${is_current('journal')}>
                     <a class="menu_link" title="${_('Journal')}"  href="${h.url('journal')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
@@ -335,7 +336,7 b''
                     </a>
                  </li>
                 %else:
-                 <li>
+                 <li ${is_current('journal')}>
                     <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/book.png')}" alt="${_('Public journal')}" />
@@ -344,7 +345,7 b''
                     </a>
                  </li>
                 %endif
-                <li>
+                <li ${is_current('search')}>
                     <a class="menu_link" title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />

rhodecode/templates/journal/journal.html

@@ -15,7 +15,7 b''
     </h5>
 </%def>
 <%def name="page_nav()">
-    ${self.menu('home')}
+    ${self.menu('journal')}
 </%def>
 <%def name="head_extra()">
 <link href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />

rhodecode/templates/journal/public_journal.html

@@ -7,7 +7,7 b''
     ${c.rhodecode_name}
 </%def>
 <%def name="page_nav()">
-    ${self.menu('home')}
+    ${self.menu('journal')}
 </%def>
 <%def name="head_extra()">
 <link href="${h.url('public_journal_atom')}" rel="alternate" title="${_('ATOM public journal feed')}" type="application/atom+xml" />

rhodecode/templates/search/search.html

@@ -20,7 +20,7 b''
     ${c.rhodecode_name}
 </%def>
 <%def name="page_nav()">
-    ${self.menu('home')}
+    ${self.menu('search')}
 </%def>
 <%def name="main()">