Skip to content

wip: jinja tempaltes with bootstrap 4.x #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

wip: jinja tempaltes with bootstrap 4.x #1

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4076338
add html_kwargs to submit button
aparcar Dec 1, 2018
26dcf6e
update bootstrap to 4.1
aparcar Dec 1, 2018
9a64b84
improve alerts
aparcar Dec 1, 2018
15d7a98
fixup top navbar with search
aparcar Dec 1, 2018
12ae538
fixup and indent navigation
aparcar Dec 1, 2018
c4d9b38
issue.edit as bootstrap styled form
aparcar Dec 1, 2018
2ef09bc
add gitignore
aparcar Dec 2, 2018
764adab
fixup pagination
aparcar Dec 2, 2018
345c0ac
fixup sort.html
aparcar Dec 2, 2018
e2900d3
fixup issue.search, user.index and user.item
aparcar Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup and indent navigation 
bootstrap 4 does not support nav-list class anymore, instead use
flex-column
  • Loading branch information
@aparcar
aparcar committed Dec 2, 2018
commit 12ae5380abd1c1768ff43c096e05af486e4933ea
182 changes: 92 additions & 90 deletions share/roundup/templates/jinja2/html/layout/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
{% set columns_showall = 'id,activity,title,creator,assignedto,status' %}

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

{% if request.user.hasPermission('View', 'issue') %}
<ul class='nav nav-list'>
<ul class='nav flex-column'>
<li class='nav-header'>
<i class='icon-fire'></i>{{ i18n.gettext('Issues')|u }}
<i class='icon-fire'></i>{{ i18n.gettext('Issues')|u }}
</li>
{% if request.user.hasPermission('Create', 'issue') %}
<li>
<li>
<a href="issue?@template=item">{{ i18n.gettext('Create New')|u }}</a>
</li>
</li>
{% endif %}

<li>
<a href="{{ request.indexargs_url('issue', {
<li class="nav-item">
<a href="{{ request.indexargs_url('issue', {
'@sort': '-activity',
'@group': 'priority',
'@filter': 'status,assignedto',
Expand All @@ -30,8 +30,8 @@
'@dispname': i18n.gettext('Show Unassigned')|u,
}) }}">{{ i18n.gettext('Show Unassigned')|u }}</a>
</li>
<li>
<a href="{{ request.indexargs_url('issue', {
<li class="nav-item">
<a href="{{ request.indexargs_url('issue', {
'@sort': '-activity',
'@group': 'priority',
'@filter': 'status',
Expand All @@ -42,113 +42,115 @@
}) }}">{{ i18n.gettext('Show All')|u }}</a>
</li>
<li>
<a href="issue?@template=search">{{ i18n.gettext('Search')|u }}</a>
<a href="issue?@template=search">{{ i18n.gettext('Search')|u }}</a>
</li>
<li>
<form method="POST" class='form-inline' action="{{ request.base }}">
<input type="hidden" name="@type" value="issue">
<input type="hidden" name="@action" value="show">
<input class="input-mini" type="text" name="@number">
<input type="submit" class="btn" value="{{ i18n.gettext('Show issue')|u }}">
</form>
</li>
</ul>
<hr>
<form method="POST" class='form-inline' action="{{ request.base }}">
<div class="form-group">
<input type="hidden" name="@type" value="issue">
<input type="hidden" name="@action" value="show">
<input type="submit" class="form-control col-auto" value="{{ i18n.gettext('Show issue')|u }}">
<input class="form-control input-sm col-2" type="text" name="@number">
</div>
</form>
</li>
</ul>
<hr>
{% else %}
<p class='text-error'>{{ i18n.gettext("You don't have permission to view issues.") }}</p>
<p class='text-error'>{{ i18n.gettext("You don't have permission to view issues.") }}</p>
{% endif %}

<ul class='nav nav-list'>
{% if request.user.hasPermission('Create', 'keyword')
or request.user.hasPermission('Edit', 'keyword') %}
<ul class='nav flex-column'>
{% if request.user.hasPermission('Create', 'keyword')
or request.user.hasPermission('Edit', 'keyword') %}
<li class='nav-header'>
<i class='icon-star'></i>{{ i18n.gettext('Keywords')|u }}
<i class='icon-star'></i>{{ i18n.gettext('Keywords')|u }}
</li>
{% endif %}
{% if request.user.hasPermission('Create', 'keyword') %}
<li>
<a href="keyword?@template=item">{{ i18n.gettext('Create New')|u }}</a>
{% endif %}
{% if request.user.hasPermission('Create', 'keyword') %}
<li class="nav-item">
<a href="keyword?@template=item">{{ i18n.gettext('Create New')|u }}</a>
</li>
{% endif %}
{% if request.user.hasPermission('Edit', 'keyword') %}
<li>
<a href="keyword?@template=item">{{ i18n.gettext('Edit Existing')|u }}</a>
{% endif %}
{% if request.user.hasPermission('Edit', 'keyword') %}
<li class="nav-item">
<a href="keyword?@template=item">{{ i18n.gettext('Edit Existing')|u }}</a>
</li>
{% endif %}
{% endif %}
</ul>
{% if request.user.hasPermission('Create', 'keyword')
or request.user.hasPermission('Edit', 'keyword') %}
or request.user.hasPermission('Edit', 'keyword') %}
<hr>
{% endif %}

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

{% if request.user.hasPermission('Edit', None) %}
<li>
<li>
<a href="home?@template=classlist">{{ i18n.gettext('Class List')|u }}</a>
</li>
</li>
{% endif %}

{% if request.user.hasPermission('View', 'user') or request.user.hasPermission('Edit', 'user') %}
<li>
<li>
<a href="user">{{ i18n.gettext('User List')|u }}</a>
</li>
</li>
{% endif %}

{% if request.user.hasPermission('Create', 'user') %}
<li>
<li>
<a href="user?@template=item">{{ i18n.gettext('Add User')|u }}</a>
</li>
</li>
{% endif %}
</ul>
<hr>
</ul>
<hr>
{% endif %}

{% if request.user.username == 'anonymous' %}
<form method="POST" action='{{ request.base }}'>
<ul class='nav nav-list'>
<li class='nav-header'>
<i class='icon-user'></i>{{ i18n.gettext('Login')|u }}
</li>
<li>
<input type='text' name="__login_name" placeholder='username'>
</li>
<li>
<input type="password" name="__login_password" placeholder='password'>
</li>
<li>
<label class='checkbox'>
<input type="checkbox" name="remember"> {{ i18n.gettext('Remember me?')|u }}
</label>
</li>
<li>
<input type="submit" value="{{ i18n.gettext('Login')|u }}" class='btn btn-inverse'>
</li>
<li class='vspace-one'>
{% if request.user.hasPermission('Register', 'user') %}
<a href="user?@template=register">{{ i18n.gettext('Register')|u }}</a>
{% endif %}
</li>
<li>
<a href="user?@template=forgotten">{{ i18n.gettext('Lost your login?')|u }}</a>
</li>
{% if request.user.username == 'anonymous' %}
<form method="POST" action='{{ request.base }}'>
<ul class='nav flex-column'>
<li class='nav-header'>
<i class='icon-user'></i>{{ i18n.gettext('Login')|u }}
</li>
<li class="nav-item">
<input class="form-control" type='text' name="__login_name" placeholder='username'>
</li>
<li class="nav-item">
<input class="form-control" type="password" name="__login_password" placeholder='password'>
</li>
<li class="nav-item">
<label class="form-control" class='checkbox'>
<input type="checkbox" name="remember"> {{ i18n.gettext('Remember me?')|u }}
</label>
</li>
<li class="nav-item">
<input class="form-control" type="submit" value="{{ i18n.gettext('Login')|u }}" class='btn btn-inverse'>
</li>
<li class='vspace-one'>
{% if request.user.hasPermission('Register', 'user') %}
<a href="user?@template=register">{{ i18n.gettext('Register')|u }}</a>
{% endif %}
</li>
<li class="nav-item">
<a href="user?@template=forgotten">{{ i18n.gettext('Lost your login?')|u }}</a>
</li>
</ul>
<input type="hidden" name="@action" value="{{ i18n.gettext('Login')|u }}">
<input type="hidden" name="__came_from" value='{{request.base}}{{request.env.PATH_INFO}}'>
</form>
<hr>
</form>
<hr>
{% else %}
<ul class='nav nav-list'>
<ul class='nav flex-column'>
<li class='nav-header'>
<i class='icon-user'></i>{{ i18n.gettext('Hello,')|u }}
<span class='username'>{{ request.user.username.plain(escape=1) }}</span>
<i class='icon-user'></i>{{ i18n.gettext('Hello,')|u }}
<span class='username'>{{ request.user.username.plain(escape=1) }}</span>
</li>
<li>
<a href="{{ request.indexargs_url('issue', {
<a href="{{ request.indexargs_url('issue', {
'@sort': '-activity',
'@group': 'priority',
'@filter': 'status,assignedto',
Expand All @@ -160,20 +162,20 @@
}) }}">{{ i18n.gettext('Your Issues')|u }}</a>
</li>
<li>
<a href="user{{ request.user.id }}">{{ i18n.gettext('Your Details')|u }}</a>
<a href="user{{ request.user.id }}">{{ i18n.gettext('Your Details')|u }}</a>
</li>
<li>
<a href="{{ request.indexargs_url('', {'@action':'logout'}) }}">{{ i18n.gettext('Logout')|u }}</a>
<a href="{{ request.indexargs_url('', {'@action':'logout'}) }}">{{ i18n.gettext('Logout')|u }}</a>
</li>
</ul>
<hr>
</ul>
<hr>
{% endif %}

<ul class='nav nav-list'>
<li class='nav-header'>
<i class='icon-bookmark'></i>{{ i18n.gettext('Help')|u }}
</li>
<li>
<a href="http://www.roundup-tracker.org">Roundup docs</a>
</li>
<ul class='nav flex-column'>
<li class='nav-header'>
<i class='icon-bookmark'></i>{{ i18n.gettext('Help')|u }}
</li>
<li>
<a href="http://www.roundup-tracker.org">Roundup docs</a>
</li>
</ul>