engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nav: bring back quick filter and cleanup titles

Browse source
This commit is contained in:
Marcin Kuzminski 2019-03-27 14:37:46 +01:00
parent 88056f6f71
commit 56e122f07d
18 changed files with 75 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rhodecode/templates/admin/admin_audit_log_entry.mako
View file

@ -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">

20
rhodecode/templates/admin/admin_audit_logs.mako
View file

@ -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" />

6
rhodecode/templates/admin/auth/auth_settings.mako
View file

@ -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')}

6
rhodecode/templates/admin/main.mako
View file

@ -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')}

7
rhodecode/templates/admin/notifications/notifications_show_all.mako
View file

@ -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">

18
rhodecode/templates/admin/repo_groups/repo_groups.mako
View file

@ -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">

19
rhodecode/templates/admin/repos/repos.mako
View file

@ -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">

14
rhodecode/templates/admin/user_groups/user_groups.mako
View file

@ -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>

11
rhodecode/templates/admin/users/user_edit.mako
View file

@ -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">

8
rhodecode/templates/admin/users/users.mako
View file

@ -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>

8
rhodecode/templates/bookmarks/bookmarks.mako
View file

@ -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>

8
rhodecode/templates/branches/branches.mako
View file

@ -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>

4
rhodecode/templates/compare/compare_diff.mako
View file

@ -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')}

4
rhodecode/templates/forks/forks.mako
View file

@ -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')}

6
rhodecode/templates/pullrequests/pullrequest.mako
View file

@ -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">

4
rhodecode/templates/pullrequests/pullrequests.mako
View file

@ -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')}

3
rhodecode/templates/summary/summary_base.mako
View file

@ -20,8 +20,7 @@
</%def>
<%def name="breadcrumbs_links()">
</%def>
<%def name="breadcrumbs_links()"></%def>
<%def name="main()">

8
rhodecode/templates/tags/tags.mako
View file

@ -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>