Skip to content

Commit 12ae538

Browse files
aparcaraparcar
committed
fixup and indent navigation
bootstrap 4 does not support nav-list class anymore, instead use flex-column
1 parent 15d7a98 commit 12ae538

File tree

1 file changed

+92
-90
lines changed

1 file changed

+92
-90
lines changed

‎share/roundup/templates/jinja2/html/layout/navigation.html‎

Lines changed: 92 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
{% set columns_showall = 'id,activity,title,creator,assignedto,status' %}
33

44
{% if request.user.hasPermission('View', 'query') %}
5-
<p>
5+
<p>
66
<b>{{ i18n.gettext('Your Queries')|u }}</b> (<a href="query?@template=edit">{{ i18n.gettext('edit')|u }}</a>)
7-
</p>
7+
</p>
88
{% endif %}
99

1010
{% if request.user.hasPermission('View', 'issue') %}
11-
<ul class='nav nav-list'>
11+
<ul class='nav flex-column'>
1212
<li class='nav-header'>
13-
<i class='icon-fire'></i>{{ i18n.gettext('Issues')|u }}
13+
<i class='icon-fire'></i>{{ i18n.gettext('Issues')|u }}
1414
</li>
1515
{% if request.user.hasPermission('Create', 'issue') %}
16-
<li>
16+
<li>
1717
<a href="issue?@template=item">{{ i18n.gettext('Create New')|u }}</a>
18-
</li>
18+
</li>
1919
{% endif %}
2020

21-
<li>
22-
<a href="{{ request.indexargs_url('issue', {
21+
<li class="nav-item">
22+
<a href="{{ request.indexargs_url('issue', {
2323
'@sort': '-activity',
2424
'@group': 'priority',
2525
'@filter': 'status,assignedto',
@@ -30,8 +30,8 @@
3030
'@dispname': i18n.gettext('Show Unassigned')|u,
3131
}) }}">{{ i18n.gettext('Show Unassigned')|u }}</a>
3232
</li>
33-
<li>
34-
<a href="{{ request.indexargs_url('issue', {
33+
<li class="nav-item">
34+
<a href="{{ request.indexargs_url('issue', {
3535
'@sort': '-activity',
3636
'@group': 'priority',
3737
'@filter': 'status',
@@ -42,113 +42,115 @@
4242
}) }}">{{ i18n.gettext('Show All')|u }}</a>
4343
</li>
4444
<li>
45-
<a href="issue?@template=search">{{ i18n.gettext('Search')|u }}</a>
45+
<a href="issue?@template=search">{{ i18n.gettext('Search')|u }}</a>
4646
</li>
4747
<li>
48-
<form method="POST" class='form-inline' action="{{ request.base }}">
49-
<input type="hidden" name="@type" value="issue">
50-
<input type="hidden" name="@action" value="show">
51-
<input class="input-mini" type="text" name="@number">
52-
<input type="submit" class="btn" value="{{ i18n.gettext('Show issue')|u }}">
53-
</form>
54-
</li>
55-
</ul>
56-
<hr>
48+
<form method="POST" class='form-inline' action="{{ request.base }}">
49+
<div class="form-group">
50+
<input type="hidden" name="@type" value="issue">
51+
<input type="hidden" name="@action" value="show">
52+
<input type="submit" class="form-control col-auto" value="{{ i18n.gettext('Show issue')|u }}">
53+
<input class="form-control input-sm col-2" type="text" name="@number">
54+
</div>
55+
</form>
56+
</li>
57+
</ul>
58+
<hr>
5759
{% else %}
58-
<p class='text-error'>{{ i18n.gettext("You don't have permission to view issues.") }}</p>
60+
<p class='text-error'>{{ i18n.gettext("You don't have permission to view issues.") }}</p>
5961
{% endif %}
6062

61-
<ul class='nav nav-list'>
62-
{% if request.user.hasPermission('Create', 'keyword')
63-
or request.user.hasPermission('Edit', 'keyword') %}
63+
<ul class='nav flex-column'>
64+
{% if request.user.hasPermission('Create', 'keyword')
65+
or request.user.hasPermission('Edit', 'keyword') %}
6466
<li class='nav-header'>
65-
<i class='icon-star'></i>{{ i18n.gettext('Keywords')|u }}
67+
<i class='icon-star'></i>{{ i18n.gettext('Keywords')|u }}
6668
</li>
67-
{% endif %}
68-
{% if request.user.hasPermission('Create', 'keyword') %}
69-
<li>
70-
<a href="keyword?@template=item">{{ i18n.gettext('Create New')|u }}</a>
69+
{% endif %}
70+
{% if request.user.hasPermission('Create', 'keyword') %}
71+
<li class="nav-item">
72+
<a href="keyword?@template=item">{{ i18n.gettext('Create New')|u }}</a>
7173
</li>
72-
{% endif %}
73-
{% if request.user.hasPermission('Edit', 'keyword') %}
74-
<li>
75-
<a href="keyword?@template=item">{{ i18n.gettext('Edit Existing')|u }}</a>
74+
{% endif %}
75+
{% if request.user.hasPermission('Edit', 'keyword') %}
76+
<li class="nav-item">
77+
<a href="keyword?@template=item">{{ i18n.gettext('Edit Existing')|u }}</a>
7678
</li>
77-
{% endif %}
79+
{% endif %}
7880
</ul>
7981
{% if request.user.hasPermission('Create', 'keyword')
80-
or request.user.hasPermission('Edit', 'keyword') %}
82+
or request.user.hasPermission('Edit', 'keyword') %}
8183
<hr>
8284
{% endif %}
8385

8486
{% if request.user.hasPermission('View', 'user') %}
85-
<ul class='nav nav-list'>
87+
<ul class='nav flex-column'>
8688
<li class='nav-header'>
87-
<i class='icon-eye-open'></i>{{ i18n.gettext('Administration')|u }}
89+
<i class='icon-eye-open'></i>{{ i18n.gettext('Administration')|u }}
8890
</li>
8991

9092
{% if request.user.hasPermission('Edit', None) %}
91-
<li>
93+
<li>
9294
<a href="home?@template=classlist">{{ i18n.gettext('Class List')|u }}</a>
93-
</li>
95+
</li>
9496
{% endif %}
9597

9698
{% if request.user.hasPermission('View', 'user') or request.user.hasPermission('Edit', 'user') %}
97-
<li>
99+
<li>
98100
<a href="user">{{ i18n.gettext('User List')|u }}</a>
99-
</li>
101+
</li>
100102
{% endif %}
101103

102104
{% if request.user.hasPermission('Create', 'user') %}
103-
<li>
105+
<li>
104106
<a href="user?@template=item">{{ i18n.gettext('Add User')|u }}</a>
105-
</li>
107+
</li>
106108
{% endif %}
107-
</ul>
108-
<hr>
109+
</ul>
110+
<hr>
109111
{% endif %}
110112

111-
{% if request.user.username == 'anonymous' %}
112-
<form method="POST" action='{{ request.base }}'>
113-
<ul class='nav nav-list'>
114-
<li class='nav-header'>
115-
<i class='icon-user'></i>{{ i18n.gettext('Login')|u }}
116-
</li>
117-
<li>
118-
<input type='text' name="__login_name" placeholder='username'>
119-
</li>
120-
<li>
121-
<input type="password" name="__login_password" placeholder='password'>
122-
</li>
123-
<li>
124-
<label class='checkbox'>
125-
<input type="checkbox" name="remember"> {{ i18n.gettext('Remember me?')|u }}
126-
</label>
127-
</li>
128-
<li>
129-
<input type="submit" value="{{ i18n.gettext('Login')|u }}" class='btn btn-inverse'>
130-
</li>
131-
<li class='vspace-one'>
132-
{% if request.user.hasPermission('Register', 'user') %}
133-
<a href="user?@template=register">{{ i18n.gettext('Register')|u }}</a>
134-
{% endif %}
135-
</li>
136-
<li>
137-
<a href="user?@template=forgotten">{{ i18n.gettext('Lost your login?')|u }}</a>
138-
</li>
113+
{% if request.user.username == 'anonymous' %}
114+
<form method="POST" action='{{ request.base }}'>
115+
<ul class='nav flex-column'>
116+
<li class='nav-header'>
117+
<i class='icon-user'></i>{{ i18n.gettext('Login')|u }}
118+
</li>
119+
<li class="nav-item">
120+
<input class="form-control" type='text' name="__login_name" placeholder='username'>
121+
</li>
122+
<li class="nav-item">
123+
<input class="form-control" type="password" name="__login_password" placeholder='password'>
124+
</li>
125+
<li class="nav-item">
126+
<label class="form-control" class='checkbox'>
127+
<input type="checkbox" name="remember"> {{ i18n.gettext('Remember me?')|u }}
128+
</label>
129+
</li>
130+
<li class="nav-item">
131+
<input class="form-control" type="submit" value="{{ i18n.gettext('Login')|u }}" class='btn btn-inverse'>
132+
</li>
133+
<li class='vspace-one'>
134+
{% if request.user.hasPermission('Register', 'user') %}
135+
<a href="user?@template=register">{{ i18n.gettext('Register')|u }}</a>
136+
{% endif %}
137+
</li>
138+
<li class="nav-item">
139+
<a href="user?@template=forgotten">{{ i18n.gettext('Lost your login?')|u }}</a>
140+
</li>
139141
</ul>
140142
<input type="hidden" name="@action" value="{{ i18n.gettext('Login')|u }}">
141143
<input type="hidden" name="__came_from" value='{{request.base}}{{request.env.PATH_INFO}}'>
142-
</form>
143-
<hr>
144+
</form>
145+
<hr>
144146
{% else %}
145-
<ul class='nav nav-list'>
147+
<ul class='nav flex-column'>
146148
<li class='nav-header'>
147-
<i class='icon-user'></i>{{ i18n.gettext('Hello,')|u }}
148-
<span class='username'>{{ request.user.username.plain(escape=1) }}</span>
149+
<i class='icon-user'></i>{{ i18n.gettext('Hello,')|u }}
150+
<span class='username'>{{ request.user.username.plain(escape=1) }}</span>
149151
</li>
150152
<li>
151-
<a href="{{ request.indexargs_url('issue', {
153+
<a href="{{ request.indexargs_url('issue', {
152154
'@sort': '-activity',
153155
'@group': 'priority',
154156
'@filter': 'status,assignedto',
@@ -160,20 +162,20 @@
160162
}) }}">{{ i18n.gettext('Your Issues')|u }}</a>
161163
</li>
162164
<li>
163-
<a href="user{{ request.user.id }}">{{ i18n.gettext('Your Details')|u }}</a>
165+
<a href="user{{ request.user.id }}">{{ i18n.gettext('Your Details')|u }}</a>
164166
</li>
165167
<li>
166-
<a href="{{ request.indexargs_url('', {'@action':'logout'}) }}">{{ i18n.gettext('Logout')|u }}</a>
168+
<a href="{{ request.indexargs_url('', {'@action':'logout'}) }}">{{ i18n.gettext('Logout')|u }}</a>
167169
</li>
168-
</ul>
169-
<hr>
170+
</ul>
171+
<hr>
170172
{% endif %}
171173

172-
<ul class='nav nav-list'>
173-
<li class='nav-header'>
174-
<i class='icon-bookmark'></i>{{ i18n.gettext('Help')|u }}
175-
</li>
176-
<li>
177-
<a href="http://www.roundup-tracker.org">Roundup docs</a>
178-
</li>
174+
<ul class='nav flex-column'>
175+
<li class='nav-header'>
176+
<i class='icon-bookmark'></i>{{ i18n.gettext('Help')|u }}
177+
</li>
178+
<li>
179+
<a href="http://www.roundup-tracker.org">Roundup docs</a>
180+
</li>
179181
</ul>

0 commit comments

Comments
 (0)