diff --git a/rhodecode/templates/admin/admin_audit_log_entry.mako b/rhodecode/templates/admin/admin_audit_log_entry.mako --- a/rhodecode/templates/admin/admin_audit_log_entry.mako +++ b/rhodecode/templates/admin/admin_audit_log_entry.mako @@ -9,20 +9,23 @@ %endif -<%def name="breadcrumbs_links()"> - ${_('Audit long entry')} ${c.audit_log_entry.entry_id} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='admin')} + +<%def name="menu_bar_subnav()"> + ${self.admin_menu(active='audit_logs')} + + <%def name="main()">
- +
- ${self.breadcrumbs()} + ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
- +
diff --git a/rhodecode/templates/admin/admin_audit_logs.mako b/rhodecode/templates/admin/admin_audit_logs.mako --- a/rhodecode/templates/admin/admin_audit_logs.mako +++ b/rhodecode/templates/admin/admin_audit_logs.mako @@ -8,15 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - ${h.form(None, id_="filter_form", method="get")} - - - ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)} - ${h.end_form()} -

${_('Example Queries')}

- - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='admin')} @@ -28,6 +20,16 @@ <%def name="main()">
+
+ ${h.form(None, id_="filter_form", method="get")} + + + ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)} + ${h.end_form()} +

${_('Example Queries')}

+ +
+
<%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 --- a/rhodecode/templates/admin/auth/auth_settings.mako +++ b/rhodecode/templates/admin/auth/auth_settings.mako @@ -8,11 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.route_path('admin_home'))} - » - ${_('Authentication Plugins')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='admin')} diff --git a/rhodecode/templates/admin/main.mako b/rhodecode/templates/admin/main.mako --- a/rhodecode/templates/admin/main.mako +++ b/rhodecode/templates/admin/main.mako @@ -8,11 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.route_path('admin_home'))} - » - ${_('Settings')} - +<%def name="breadcrumbs_links()"> <%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 --- a/rhodecode/templates/admin/notifications/notifications_show_all.mako +++ b/rhodecode/templates/admin/notifications/notifications_show_all.mako @@ -8,9 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - ${_('My Notifications')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='my_account')} @@ -19,7 +17,8 @@ <%def name="main()">
- ${self.breadcrumbs()} + ${_('My Notifications')} +
%if c.notifications:
diff --git a/rhodecode/templates/branches/branches.mako b/rhodecode/templates/branches/branches.mako --- a/rhodecode/templates/branches/branches.mako +++ b/rhodecode/templates/branches/branches.mako @@ -8,10 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - - 0 ${_('branches')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='repositories')} @@ -33,7 +30,8 @@ %endif %if c.has_references: - ${self.breadcrumbs()} + + 0 ${_('branches')} %endif
diff --git a/rhodecode/templates/compare/compare_diff.mako b/rhodecode/templates/compare/compare_diff.mako --- a/rhodecode/templates/compare/compare_diff.mako +++ b/rhodecode/templates/compare/compare_diff.mako @@ -13,9 +13,7 @@ %endif -<%def name="breadcrumbs_links()"> - ${_ungettext('%s commit','%s commits', len(c.commit_ranges)) % len(c.commit_ranges)} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='repositories')} diff --git a/rhodecode/templates/forks/forks.mako b/rhodecode/templates/forks/forks.mako --- a/rhodecode/templates/forks/forks.mako +++ b/rhodecode/templates/forks/forks.mako @@ -8,9 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - ${_('Forks')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='repositories')} diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako --- a/rhodecode/templates/pullrequests/pullrequest.mako +++ b/rhodecode/templates/pullrequests/pullrequest.mako @@ -5,9 +5,7 @@ ${c.repo_name} ${_('New pull request')} -<%def name="breadcrumbs_links()"> - ${_('New pull request')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='repositories')} @@ -21,7 +19,7 @@
${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')}
diff --git a/rhodecode/templates/pullrequests/pullrequests.mako b/rhodecode/templates/pullrequests/pullrequests.mako --- a/rhodecode/templates/pullrequests/pullrequests.mako +++ b/rhodecode/templates/pullrequests/pullrequests.mako @@ -7,9 +7,7 @@ %endif -<%def name="breadcrumbs_links()"> - - +<%def name="breadcrumbs_links()"> <%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 --- a/rhodecode/templates/summary/summary_base.mako +++ b/rhodecode/templates/summary/summary_base.mako @@ -20,8 +20,7 @@ -<%def name="breadcrumbs_links()"> - +<%def name="breadcrumbs_links()"> <%def name="main()"> diff --git a/rhodecode/templates/tags/tags.mako b/rhodecode/templates/tags/tags.mako --- a/rhodecode/templates/tags/tags.mako +++ b/rhodecode/templates/tags/tags.mako @@ -8,10 +8,7 @@ %endif -<%def name="breadcrumbs_links()"> - - 0 ${_('tags')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='repositories')} @@ -33,7 +30,8 @@ %endif %if c.has_references: - ${self.breadcrumbs()} + + 0 ${_('tags')} %endif