From 56e122f07de188b8d43c1e42a4da503444087de4 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 27 Mar 2019 14:37:46 +0100
Subject: [PATCH] nav: bring back quick filter and cleanup titles

---
 .../admin/admin_audit_log_entry.mako          | 15 ++++++++------
 .../templates/admin/admin_audit_logs.mako     | 20 ++++++++++---------
 .../templates/admin/auth/auth_settings.mako   |  6 +-----
 rhodecode/templates/admin/main.mako           |  6 +-----
 .../notifications/notifications_show_all.mako |  7 +++----
 .../admin/repo_groups/repo_groups.mako        | 18 ++++++++---------
 rhodecode/templates/admin/repos/repos.mako    | 19 +++++++++---------
 .../admin/user_groups/user_groups.mako        | 14 ++++++-------
 .../templates/admin/users/user_edit.mako      | 11 +++++-----
 rhodecode/templates/admin/users/users.mako    |  8 ++++----
 rhodecode/templates/bookmarks/bookmarks.mako  |  8 +++-----
 rhodecode/templates/branches/branches.mako    |  8 +++-----
 rhodecode/templates/compare/compare_diff.mako |  4 +---
 rhodecode/templates/forks/forks.mako          |  4 +---
 .../templates/pullrequests/pullrequest.mako   |  6 ++----
 .../templates/pullrequests/pullrequests.mako  |  4 +---
 rhodecode/templates/summary/summary_base.mako |  3 +--
 rhodecode/templates/tags/tags.mako            |  8 +++-----
 18 files changed, 75 insertions(+), 94 deletions(-)

diff --git a/rhodecode/templates/admin/admin_audit_log_entry.mako b/rhodecode/templates/admin/admin_audit_log_entry.mako
index 62989660..9a625b3f 100644
--- a/rhodecode/templates/admin/admin_audit_log_entry.mako
+++ b/rhodecode/templates/admin/admin_audit_log_entry.mako
@@ -9,20 +9,23 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='audit_logs')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-    <!-- box / title -->
+
     <div class="title">
-        ${self.breadcrumbs()}
+        ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
     </div>
-    <!-- end box / title -->
+
     <div class="table">
         <div id="user_log">
             <table class="rctable audit-log">
diff --git a/rhodecode/templates/admin/admin_audit_logs.mako b/rhodecode/templates/admin/admin_audit_logs.mako
index 39411a8e..dd10d708 100644
--- a/rhodecode/templates/admin/admin_audit_logs.mako
+++ b/rhodecode/templates/admin/admin_audit_logs.mako
@@ -8,15 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${h.form(None, id_="filter_form", method="get")}
-        <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('filter...')}"/>
-        <input type='submit' value="${_('filter')}" class="btn" />
-        ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
-    ${h.end_form()}
-    <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
-    <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
@@ -28,6 +20,16 @@
 
 <%def name="main()">
 <div class="box">
+    <div class="title">
+        ${h.form(None, id_="filter_form", method="get")}
+            <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('filter...')}"/>
+            <input type='submit' value="${_('filter')}" class="btn" />
+            ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
+        ${h.end_form()}
+        <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+        <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
+    </div>
+
     <div class="table">
         <div id="user_log">
             <%include file="/admin/admin_log_base.mako" />
diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
index 00df6087..b8e00d6d 100644
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -8,11 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
-    &raquo;
-    ${_('Authentication Plugins')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
diff --git a/rhodecode/templates/admin/main.mako b/rhodecode/templates/admin/main.mako
index 9a57210e..085ffb75 100644
--- a/rhodecode/templates/admin/main.mako
+++ b/rhodecode/templates/admin/main.mako
@@ -8,11 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
-    &raquo;
-    ${_('Settings')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
diff --git a/rhodecode/templates/admin/notifications/notifications_show_all.mako b/rhodecode/templates/admin/notifications/notifications_show_all.mako
index 9aa7cdee..d53e4e60 100644
--- a/rhodecode/templates/admin/notifications/notifications_show_all.mako
+++ b/rhodecode/templates/admin/notifications/notifications_show_all.mako
@@ -8,9 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('My Notifications')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='my_account')}
@@ -19,7 +17,8 @@
 <%def name="main()">
 <div class="box">
   <div class="title">
-      ${self.breadcrumbs()}
+      ${_('My Notifications')}
+
       <div class="notifications_buttons">
       %if c.notifications:
           <button id='mark_all_read' class="btn btn-default" type="submit">
diff --git a/rhodecode/templates/admin/repo_groups/repo_groups.mako b/rhodecode/templates/admin/repo_groups/repo_groups.mako
index cdcb6bb1..6347745e 100644
--- a/rhodecode/templates/admin/repo_groups/repo_groups.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_groups.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_group_count">0</span> ${_('repository groups')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
@@ -23,14 +20,17 @@
 
 <%def name="main()">
 <div class="box">
+
     <div class="title">
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="repo_group_count">0</span> ${_('repository groups')}
 
         <ul class="links">
-            %if c.can_create_repo_group:
-             <li>
-               <a href="${h.route_path('repo_group_new')}" class="btn btn-small btn-success">${_(u'Add Repository Group')}</a>
-             </li>
-            %endif
+        %if c.can_create_repo_group:
+            <li>
+              <a href="${h.route_path('repo_group_new')}" class="btn btn-small btn-success">${_(u'Add Repository Group')}</a>
+            </li>
+        %endif
         </ul>
     </div>
     <div id="repos_list_wrap">
diff --git a/rhodecode/templates/admin/repos/repos.mako b/rhodecode/templates/admin/repos/repos.mako
index 38c05517..1ebd1f08 100644
--- a/rhodecode/templates/admin/repos/repos.mako
+++ b/rhodecode/templates/admin/repos/repos.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_count">0</span> ${_('repositories')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
@@ -23,13 +20,17 @@
 
 <%def name="main()">
 <div class="box">
+
     <div class="title">
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="repo_count">0</span> ${_('repositories')}
+
         <ul class="links">
-            %if c.can_create_repo:
-             <li>
-               <a href="${h.route_path('repo_new')}" class="btn btn-small btn-success">${_(u'Add Repository')}</a>
-             </li>
-            %endif
+        %if c.can_create_repo:
+            <li>
+              <a href="${h.route_path('repo_new')}" class="btn btn-small btn-success">${_(u'Add Repository')}</a>
+            </li>
+        %endif
         </ul>
     </div>
     <div id="repos_list_wrap">
diff --git a/rhodecode/templates/admin/user_groups/user_groups.mako b/rhodecode/templates/admin/user_groups/user_groups.mako
index 25bf22b5..44c0c87b 100644
--- a/rhodecode/templates/admin/user_groups/user_groups.mako
+++ b/rhodecode/templates/admin/user_groups/user_groups.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span>
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
@@ -25,11 +22,14 @@
 <div class="box">
 
     <div class="title">
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="user_group_count">0</span>
+
         <ul class="links">
         %if c.can_create_user_group:
-          <li>
-            <a href="${h.route_path('user_groups_new')}" class="btn btn-small btn-success">${_(u'Add User Group')}</a>
-          </li>
+            <li>
+              <a href="${h.route_path('user_groups_new')}" class="btn btn-small btn-success">${_(u'Add User Group')}</a>
+            </li>
         %endif
         </ul>
     </div>
diff --git a/rhodecode/templates/admin/users/user_edit.mako b/rhodecode/templates/admin/users/user_edit.mako
index 0d849209..804c7fbb 100644
--- a/rhodecode/templates/admin/users/user_edit.mako
+++ b/rhodecode/templates/admin/users/user_edit.mako
@@ -13,12 +13,6 @@
     &raquo;
     ${h.link_to(_('Users'),h.route_path('users'))}
     &raquo;
-    % if c.user.active:
-    ${c.user.username}
-    % else:
-    <strike title="${_('This user is set as disabled')}">${c.user.username}</strike>
-    % endif
-
 </%def>
 
 <%def name="menu_bar_nav()">
@@ -32,6 +26,11 @@
 
 <%def name="main()">
 <div class="box user_settings">
+  % if not c.user.active:
+    <div class="alert alert-warning text-center">
+        <strong>${_('This user is set as disabled')}</strong>
+    </div>
+  % endif
 
   ##main
   <div class="sidebar-col-wrapper">
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index 20bac143..146cd066 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_count">0</span>
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
@@ -26,6 +23,9 @@
 <div class="box">
 
     <div class="title">
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="user_count">0</span>
+
         <ul class="links">
           <li>
             <a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>
diff --git a/rhodecode/templates/bookmarks/bookmarks.mako b/rhodecode/templates/bookmarks/bookmarks.mako
index c270fe34..9942e571 100644
--- a/rhodecode/templates/bookmarks/bookmarks.mako
+++ b/rhodecode/templates/bookmarks/bookmarks.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    <span id="obj_count">0</span> ${_('bookmarks')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -33,7 +30,8 @@
           </ul>
         %endif
         %if c.has_references:
-          ${self.breadcrumbs()}
+            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            <span id="obj_count">0</span> ${_('bookmarks')}
         %endif
       </div>
       <table id="obj_list_table" class="display"></table>
diff --git a/rhodecode/templates/branches/branches.mako b/rhodecode/templates/branches/branches.mako
index 8338753f..49a62111 100644
--- a/rhodecode/templates/branches/branches.mako
+++ b/rhodecode/templates/branches/branches.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    <span id="obj_count">0</span> ${_('branches')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -33,7 +30,8 @@
           </ul>
         %endif
         %if c.has_references:
-          ${self.breadcrumbs()}
+            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            <span id="obj_count">0</span> ${_('branches')}
         %endif
       </div>
       <table id="obj_list_table" class="display"></table>
diff --git a/rhodecode/templates/compare/compare_diff.mako b/rhodecode/templates/compare/compare_diff.mako
index 6580d026..cce07720 100644
--- a/rhodecode/templates/compare/compare_diff.mako
+++ b/rhodecode/templates/compare/compare_diff.mako
@@ -13,9 +13,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-  ${_ungettext('%s commit','%s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
diff --git a/rhodecode/templates/forks/forks.mako b/rhodecode/templates/forks/forks.mako
index 5c5b5749..99ab41d0 100644
--- a/rhodecode/templates/forks/forks.mako
+++ b/rhodecode/templates/forks/forks.mako
@@ -8,9 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Forks')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako
index 07bc678e..e85a952b 100644
--- a/rhodecode/templates/pullrequests/pullrequest.mako
+++ b/rhodecode/templates/pullrequests/pullrequest.mako
@@ -5,9 +5,7 @@
     ${c.repo_name} ${_('New pull request')}
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('New pull request')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -21,7 +19,7 @@
 <div class="box">
     ${h.secure_form(h.route_path('pullrequest_create', repo_name=c.repo_name, _query=request.GET.mixed()), id='pull_request_form', request=request)}
 
-        ${self.breadcrumbs()}
+        ${_('New pull request')}
 
         <div class="box pr-summary">
 
diff --git a/rhodecode/templates/pullrequests/pullrequests.mako b/rhodecode/templates/pullrequests/pullrequests.mako
index 8c405e0d..0ad6ca3b 100644
--- a/rhodecode/templates/pullrequests/pullrequests.mako
+++ b/rhodecode/templates/pullrequests/pullrequests.mako
@@ -7,9 +7,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
diff --git a/rhodecode/templates/summary/summary_base.mako b/rhodecode/templates/summary/summary_base.mako
index 6ee3b860..593dc675 100644
--- a/rhodecode/templates/summary/summary_base.mako
+++ b/rhodecode/templates/summary/summary_base.mako
@@ -20,8 +20,7 @@
 </%def>
 
 
-<%def name="breadcrumbs_links()">
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 
 <%def name="main()">
diff --git a/rhodecode/templates/tags/tags.mako b/rhodecode/templates/tags/tags.mako
index 14091efe..ae2c9e05 100644
--- a/rhodecode/templates/tags/tags.mako
+++ b/rhodecode/templates/tags/tags.mako
@@ -8,10 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    <span id="obj_count">0</span> ${_('tags')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -33,7 +30,8 @@
           </ul>
         %endif
         %if c.has_references:
-          ${self.breadcrumbs()}
+            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            <span id="obj_count">0</span> ${_('tags')}
         %endif
       </div>
       <table id="obj_list_table" class="display"></table>