##// END OF EJS Templates
nav: bring back quick filter and cleanup titles
marcink -
r3589:aac6b163 new-ui
parent child Browse files
Show More
@@ -9,20 +9,23 b''
9 %endif
9 %endif
10 </%def>
10 </%def>
11
11
12 <%def name="breadcrumbs_links()">
12 <%def name="breadcrumbs_links()"></%def>
13 ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
14 </%def>
15
13
16 <%def name="menu_bar_nav()">
14 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='admin')}
15 ${self.menu_items(active='admin')}
18 </%def>
16 </%def>
17
18 <%def name="menu_bar_subnav()">
19 ${self.admin_menu(active='audit_logs')}
20 </%def>
21
19 <%def name="main()">
22 <%def name="main()">
20 <div class="box">
23 <div class="box">
21 <!-- box / title -->
24
22 <div class="title">
25 <div class="title">
23 ${self.breadcrumbs()}
26 ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
24 </div>
27 </div>
25 <!-- end box / title -->
28
26 <div class="table">
29 <div class="table">
27 <div id="user_log">
30 <div id="user_log">
28 <table class="rctable audit-log">
31 <table class="rctable audit-log">
@@ -8,15 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 ${h.form(None, id_="filter_form", method="get")}
13 <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...')}"/>
14 <input type='submit' value="${_('filter')}" class="btn" />
15 ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
16 ${h.end_form()}
17 <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
18 <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
19 </%def>
20
12
21 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
22 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -28,6 +20,16 b''
28
20
29 <%def name="main()">
21 <%def name="main()">
30 <div class="box">
22 <div class="box">
23 <div class="title">
24 ${h.form(None, id_="filter_form", method="get")}
25 <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...')}"/>
26 <input type='submit' value="${_('filter')}" class="btn" />
27 ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
28 ${h.end_form()}
29 <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
30 <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
31 </div>
32
31 <div class="table">
33 <div class="table">
32 <div id="user_log">
34 <div id="user_log">
33 <%include file="/admin/admin_log_base.mako" />
35 <%include file="/admin/admin_log_base.mako" />
@@ -8,11 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 ${h.link_to(_('Admin'),h.route_path('admin_home'))}
13 &raquo;
14 ${_('Authentication Plugins')}
15 </%def>
16
12
17 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
18 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -8,11 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 ${h.link_to(_('Admin'),h.route_path('admin_home'))}
13 &raquo;
14 ${_('Settings')}
15 </%def>
16
12
17 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
18 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -8,9 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 ${_('My Notifications')}
13 </%def>
14
12
15 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
16 ${self.menu_items(active='my_account')}
14 ${self.menu_items(active='my_account')}
@@ -19,7 +17,8 b''
19 <%def name="main()">
17 <%def name="main()">
20 <div class="box">
18 <div class="box">
21 <div class="title">
19 <div class="title">
22 ${self.breadcrumbs()}
20 ${_('My Notifications')}
21
23 <div class="notifications_buttons">
22 <div class="notifications_buttons">
24 %if c.notifications:
23 %if c.notifications:
25 <button id='mark_all_read' class="btn btn-default" type="submit">
24 <button id='mark_all_read' class="btn btn-default" type="submit">
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_group_count">0</span> ${_('repository groups')}
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -23,7 +20,10 b''
23
20
24 <%def name="main()">
21 <%def name="main()">
25 <div class="box">
22 <div class="box">
23
26 <div class="title">
24 <div class="title">
25 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
26 <span id="repo_group_count">0</span> ${_('repository groups')}
27
27
28 <ul class="links">
28 <ul class="links">
29 %if c.can_create_repo_group:
29 %if c.can_create_repo_group:
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_count">0</span> ${_('repositories')}
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -23,7 +20,11 b''
23
20
24 <%def name="main()">
21 <%def name="main()">
25 <div class="box">
22 <div class="box">
23
26 <div class="title">
24 <div class="title">
25 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
26 <span id="repo_count">0</span> ${_('repositories')}
27
27 <ul class="links">
28 <ul class="links">
28 %if c.can_create_repo:
29 %if c.can_create_repo:
29 <li>
30 <li>
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span>
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -25,6 +22,9 b''
25 <div class="box">
22 <div class="box">
26
23
27 <div class="title">
24 <div class="title">
25 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
26 <span id="user_group_count">0</span>
27
28 <ul class="links">
28 <ul class="links">
29 %if c.can_create_user_group:
29 %if c.can_create_user_group:
30 <li>
30 <li>
@@ -13,12 +13,6 b''
13 &raquo;
13 &raquo;
14 ${h.link_to(_('Users'),h.route_path('users'))}
14 ${h.link_to(_('Users'),h.route_path('users'))}
15 &raquo;
15 &raquo;
16 % if c.user.active:
17 ${c.user.username}
18 % else:
19 <strike title="${_('This user is set as disabled')}">${c.user.username}</strike>
20 % endif
21
22 </%def>
16 </%def>
23
17
24 <%def name="menu_bar_nav()">
18 <%def name="menu_bar_nav()">
@@ -32,6 +26,11 b''
32
26
33 <%def name="main()">
27 <%def name="main()">
34 <div class="box user_settings">
28 <div class="box user_settings">
29 % if not c.user.active:
30 <div class="alert alert-warning text-center">
31 <strong>${_('This user is set as disabled')}</strong>
32 </div>
33 % endif
35
34
36 ##main
35 ##main
37 <div class="sidebar-col-wrapper">
36 <div class="sidebar-col-wrapper">
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_count">0</span>
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='admin')}
14 ${self.menu_items(active='admin')}
@@ -26,6 +23,9 b''
26 <div class="box">
23 <div class="box">
27
24
28 <div class="title">
25 <div class="title">
26 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
27 <span id="user_count">0</span>
28
29 <ul class="links">
29 <ul class="links">
30 <li>
30 <li>
31 <a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>
31 <a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 <span id="obj_count">0</span> ${_('bookmarks')}
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='repositories')}
14 ${self.menu_items(active='repositories')}
@@ -33,7 +30,8 b''
33 </ul>
30 </ul>
34 %endif
31 %endif
35 %if c.has_references:
32 %if c.has_references:
36 ${self.breadcrumbs()}
33 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
34 <span id="obj_count">0</span> ${_('bookmarks')}
37 %endif
35 %endif
38 </div>
36 </div>
39 <table id="obj_list_table" class="display"></table>
37 <table id="obj_list_table" class="display"></table>
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 <span id="obj_count">0</span> ${_('branches')}
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='repositories')}
14 ${self.menu_items(active='repositories')}
@@ -33,7 +30,8 b''
33 </ul>
30 </ul>
34 %endif
31 %endif
35 %if c.has_references:
32 %if c.has_references:
36 ${self.breadcrumbs()}
33 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
34 <span id="obj_count">0</span> ${_('branches')}
37 %endif
35 %endif
38 </div>
36 </div>
39 <table id="obj_list_table" class="display"></table>
37 <table id="obj_list_table" class="display"></table>
@@ -13,9 +13,7 b''
13 %endif
13 %endif
14 </%def>
14 </%def>
15
15
16 <%def name="breadcrumbs_links()">
16 <%def name="breadcrumbs_links()"></%def>
17 ${_ungettext('%s commit','%s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
18 </%def>
19
17
20 <%def name="menu_bar_nav()">
18 <%def name="menu_bar_nav()">
21 ${self.menu_items(active='repositories')}
19 ${self.menu_items(active='repositories')}
@@ -8,9 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 ${_('Forks')}
13 </%def>
14
12
15 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
16 ${self.menu_items(active='repositories')}
14 ${self.menu_items(active='repositories')}
@@ -5,9 +5,7 b''
5 ${c.repo_name} ${_('New pull request')}
5 ${c.repo_name} ${_('New pull request')}
6 </%def>
6 </%def>
7
7
8 <%def name="breadcrumbs_links()">
8 <%def name="breadcrumbs_links()"></%def>
9 ${_('New pull request')}
10 </%def>
11
9
12 <%def name="menu_bar_nav()">
10 <%def name="menu_bar_nav()">
13 ${self.menu_items(active='repositories')}
11 ${self.menu_items(active='repositories')}
@@ -21,7 +19,7 b''
21 <div class="box">
19 <div class="box">
22 ${h.secure_form(h.route_path('pullrequest_create', repo_name=c.repo_name, _query=request.GET.mixed()), id='pull_request_form', request=request)}
20 ${h.secure_form(h.route_path('pullrequest_create', repo_name=c.repo_name, _query=request.GET.mixed()), id='pull_request_form', request=request)}
23
21
24 ${self.breadcrumbs()}
22 ${_('New pull request')}
25
23
26 <div class="box pr-summary">
24 <div class="box pr-summary">
27
25
@@ -7,9 +7,7 b''
7 %endif
7 %endif
8 </%def>
8 </%def>
9
9
10 <%def name="breadcrumbs_links()">
10 <%def name="breadcrumbs_links()"></%def>
11
12 </%def>
13
11
14 <%def name="menu_bar_nav()">
12 <%def name="menu_bar_nav()">
15 ${self.menu_items(active='repositories')}
13 ${self.menu_items(active='repositories')}
@@ -20,8 +20,7 b''
20 </%def>
20 </%def>
21
21
22
22
23 <%def name="breadcrumbs_links()">
23 <%def name="breadcrumbs_links()"></%def>
24 </%def>
25
24
26
25
27 <%def name="main()">
26 <%def name="main()">
@@ -8,10 +8,7 b''
8 %endif
8 %endif
9 </%def>
9 </%def>
10
10
11 <%def name="breadcrumbs_links()">
11 <%def name="breadcrumbs_links()"></%def>
12 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
13 <span id="obj_count">0</span> ${_('tags')}
14 </%def>
15
12
16 <%def name="menu_bar_nav()">
13 <%def name="menu_bar_nav()">
17 ${self.menu_items(active='repositories')}
14 ${self.menu_items(active='repositories')}
@@ -33,7 +30,8 b''
33 </ul>
30 </ul>
34 %endif
31 %endif
35 %if c.has_references:
32 %if c.has_references:
36 ${self.breadcrumbs()}
33 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
34 <span id="obj_count">0</span> ${_('tags')}
37 %endif
35 %endif
38 </div>
36 </div>
39 <table id="obj_list_table" class="display"></table>
37 <table id="obj_list_table" class="display"></table>
General Comments 0
You need to be logged in to leave comments. Login now