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

Show file tree
Hide file tree
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
fixup issue.search, user.index and user.item
  • Loading branch information
@aparcar
aparcar committed Dec 3, 2018
commit e2900d365e86da5e037cbe8c246bd3cbb190b834
312 changes: 154 additions & 158 deletions share/roundup/templates/jinja2/html/issue.search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,184 +9,180 @@
{% set group_on = (group_on and group_on[1]) or 'status' %}

{% macro input(name, type='text') -%}
<input type="{{ type }}" name="{{ name }}"
value="{{ request.form.getvalue(name, '')|e }}" />
<input class="form-control" type="{{ type }}" name="{{ name }}" value="{{ request.form.getvalue(name, '')|e }}" />
{%- endmacro %}
{% macro display_column(name) -%}
<input type="checkbox" name="@columns"
value="{{ name }}" {% if name in cols %}checked{% endif %} />
<input type="checkbox" name="@columns" value="{{ name }}" {% if name in cols %}checked{% endif %} />
{%- endmacro %}
{% macro sort_column(name) -%}
<input type="radio" name="@sort"
value="{{ name }}" {% if name == sort_on %}checked{% endif %} />
<input type="radio" name="@sort" value="{{ name }}" {% if name == sort_on %}checked{% endif %} />
{%- endmacro %}
{% macro group_column(name) -%}
<input type="radio" name="@group"
value="{{ name }}" {% if name == group_on %}checked{% endif %} />
<input type="radio" name="@group" value="{{ name }}" {% if name == group_on %}checked{% endif %} />
{%- endmacro %}
{% macro option_value(option, id, name) -%}
<option value="{{ id }}"
{% if id == request.form.getvalue(option, '') %}selected{% endif %} >{{ name|u|e }}</option>
<option value="{{ id }}"
{% if id == request.form.getvalue(option, '') %}selected{% endif %} >{{ name|u|e }}</option>
{%- endmacro %}

{% block head_title %}
Issue searching
Issue searching
{% endblock %}

{% block page_header %}
Issue searching
Issue searching
{% endblock %}

{% block content %}

<form method="GET" name="itemSynopsis" action="{{ request.classname }}">

<table class="form">

<tr>
<th class="header">&nbsp;</th>
<th class="header">{{ i18n.gettext('Filter on')|u }}</th>
<th class="header">{{ i18n.gettext('Display')|u }}</th>
<th class="header">{{ i18n.gettext('Sort on')|u }}</th>
<th class="header">{{ i18n.gettext('Group on')|u }}</th>
</tr>

<tr>
<th>{{ i18n.gettext('All text*:')|u }}</th>
<td>{{ input('@search_text') }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Title:')|u }}</th>
<td>{{ input('title') }}</td>
<td>{{ display_column('title') }}</td>
<td>{{ sort_column('title') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Keyword:')|u }}</th>
<td><select name="keyword" id="keyword">
{{ option_value('keyword', '', 'don\'t care') }}
{{ option_value('keyword', '-1', 'not selected') }}
<option value="" disabled="disabled">------------</option>
{% for keyword in db['keyword'].list() %}
{{ option_value('keyword', keyword.id, keyword.name.plain()) }}
{% endfor %}
</select></td>
<td>{{ display_column('id') }}</td>
<td>{{ sort_column('id') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('ID:')|u }}</th>
<td>{{ input('id') }}</td>
<td>{{ display_column('id') }}</td>
<td>{{ sort_column('id') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Creation Date:')|u }}</th>
<td>{{ input('creation') }}</td>
<td>{{ display_column('creation') }}</td>
<td>{{ sort_column('creation') }}</td>
<td>{{ group_column('creation') }}</td>
</tr>

<tr>
<th>{{ i18n.gettext('Activity:')|u }}</th>
<td>{{ input('activity') }}</td>
<td>{{ display_column('activity') }}</td>
<td>{{ sort_column('activity') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Priority:')|u }}</th>
<td><select name="priority" id="priority">
{{ option_value('priority', '', 'don\'t care') }}
{{ option_value('priority', '-1', 'not selected') }}
<option value="" disabled="disabled">------------</option>
{% for priority in db['priority'].list() %}
{{ option_value('priority', priority.id, priority.name.plain()) }}
{% endfor %}
</select></td>
<td>{{ display_column('priority') }}</td>
<td>{{ sort_column('priority') }}</td>
<td>{{ group_column('priority') }}</td>
</tr>

<tr>
<th>Status:</th>
<td><select name="status" id="status">
{{ option_value('status', '', 'don\'t care') }}
{{ option_value('status', '-1', 'not selected') }}
{{ option_value('status', status_notresolved, 'not resolved') }}
<option value="" disabled="disabled">------------</option>
{% for status in db['status'].list() %}
{{ option_value('status', status.id, status.name.plain()) }}
{% endfor %}
</select></td>
<td>{{ display_column('status') }}</td>
<td>{{ sort_column('status') }}</td>
<td>{{ group_column('status') }}</td>
</tr>

<tr>
<th>{{ i18n.gettext('Assigned to:')|u }}</th>
<td>{{ input('submitter') }}</td>
<td>{{ display_column('assignedto') }}</td>
<td>{{ sort_column('assignedto') }}</td>
<td>{{ group_column('assignedto') }}</td>
</tr>

<tr>
<th>{{ i18n.gettext('No Sort or group:')|u }}</th>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td><input type="radio" name="@sort" value=""></td>
<td><input type="radio" name="@group" value=""></td>
</tr>

<tr>
<th>{{ i18n.gettext('Pagesize:')|u }}</th>
<td><input name="@pagesize" size="3" value="{{ request.form.getfirst('@pagesize', '50') }}" /></td>
</tr>

<tr>
<th>{{ i18n.gettext('Start With:')|u }}</th>
<td><input name="@startwith" size="3" value="{{ request.form.getfirst('@startwith', '0') }}" /></td>
</tr>

<tr>
<th>{{ i18n.gettext('Sort Descending:')|u }}</th>
<td><input type="checkbox" name="@sortdir" {% if sort_desc %}checked{% endif %} /></td>
</tr>

<tr>
<th>{{ i18n.gettext('Group Descending:')|u }}</th>
<td><input type="checkbox" name="@groupdir" {% if group_desc %}checked{% endif %} /></td>
</tr>

<tr>
<td>
&nbsp;
<input type="hidden" name="@action" value="search">
</td>
<td><input type="submit" value="Search" i18n:attributes="value"></td>
</tr>

<tr><td>&nbsp;</td>
<td colspan="4" class="help">
{{ i18n.gettext('*: The "all text" field will look in message bodies and issue titles')|u }}
</td>
</tr>
</table>
<table class="form">

<tr>
<th class="header">&nbsp;</th>
<th class="header">{{ i18n.gettext('Filter on')|u }}</th>
<th class="header">{{ i18n.gettext('Display')|u }}</th>
<th class="header">{{ i18n.gettext('Sort on')|u }}</th>
<th class="header">{{ i18n.gettext('Group on')|u }}</th>
</tr>

<tr>
<th>{{ i18n.gettext('All text*:')|u }}</th>
<td>{{ input('@search_text') }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Title:')|u }}</th>
<td>{{ input('title') }}</td>
<td>{{ display_column('title') }}</td>
<td>{{ sort_column('title') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Keyword:')|u }}</th>
<td><select class="custom-select" name="keyword" id="keyword">
{{ option_value('keyword', '', 'don\'t care') }}
{{ option_value('keyword', '-1', 'not selected') }}
<option value="" disabled="disabled">------------</option>
{% for keyword in db['keyword'].list() %}
{{ option_value('keyword', keyword.id, keyword.name.plain()) }}
{% endfor %}
</select></td>
<td>{{ display_column('id') }}</td>
<td>{{ sort_column('id') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('ID:')|u }}</th>
<td>{{ input('id') }}</td>
<td>{{ display_column('id') }}</td>
<td>{{ sort_column('id') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Creation Date:')|u }}</th>
<td>{{ input('creation') }}</td>
<td>{{ display_column('creation') }}</td>
<td>{{ sort_column('creation') }}</td>
<td>{{ group_column('creation') }}</td>
</tr>

<tr>
<th>{{ i18n.gettext('Activity:')|u }}</th>
<td>{{ input('activity') }}</td>
<td>{{ display_column('activity') }}</td>
<td>{{ sort_column('activity') }}</td>
<td>&nbsp;</td>
</tr>

<tr>
<th>{{ i18n.gettext('Priority:')|u }}</th>
<td><select class="custom-select" name="priority" id="priority">
{{ option_value('priority', '', 'don\'t care') }}
{{ option_value('priority', '-1', 'not selected') }}
<option value="" disabled="disabled">------------</option>
{% for priority in db['priority'].list() %}
{{ option_value('priority', priority.id, priority.name.plain()) }}
{% endfor %}
</select></td>
<td>{{ display_column('priority') }}</td>
<td>{{ sort_column('priority') }}</td>
<td>{{ group_column('priority') }}</td>
</tr>

<tr>
<th>Status:</th>
<td><select class="custom-select" name="status" id="status">
{{ option_value('status', '', 'don\'t care') }}
{{ option_value('status', '-1', 'not selected') }}
{{ option_value('status', status_notresolved, 'not resolved') }}
<option value="" disabled="disabled">------------</option>
{% for status in db['status'].list() %}
{{ option_value('status', status.id, status.name.plain()) }}
{% endfor %}
</select></td>
<td>{{ display_column('status') }}</td>
<td>{{ sort_column('status') }}</td>
<td>{{ group_column('status') }}</td>
</tr>

<tr>
<th>{{ i18n.gettext('Assigned to:')|u }}</th>
<td>{{ input('submitter') }}</td>
<td>{{ display_column('assignedto') }}</td>
<td>{{ sort_column('assignedto') }}</td>
<td>{{ group_column('assignedto') }}</td>
</tr>

<tr>
<th>{{ i18n.gettext('No Sort or group:')|u }}</th>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td><input type="radio" name="@sort" value=""></td>
<td><input type="radio" name="@group" value=""></td>
</tr>

<tr>
<th>{{ i18n.gettext('Pagesize:')|u }}</th>
<td><input class="form-control col-4" name="@pagesize" value="{{ request.form.getfirst('@pagesize', '50') }}" /></td>
</tr>

<tr>
<th>{{ i18n.gettext('Start With:')|u }}</th>
<td><input class="form-control col-4" name="@startwith"" value="{{ request.form.getfirst('@startwith', '0') }}" /></td>
</tr>

<tr>
<th>{{ i18n.gettext('Sort Descending:')|u }}</th>
<td><input type="checkbox" name="@sortdir" {% if sort_desc %}checked{% endif %} /></td>
</tr>

<tr>
<th>{{ i18n.gettext('Group Descending:')|u }}</th>
<td><input type="checkbox" name="@groupdir" {% if group_desc %}checked{% endif %} /></td>
</tr>

<tr>
<td>
&nbsp;
<input type="hidden" name="@action" value="search">
</td>
<td><input class="btn btn-primary" type="submit" value="Search" i18n:attributes="value"></td>
</tr>

<tr><td>&nbsp;</td>
<td colspan="4" class="help">
{{ i18n.gettext('*: The "all text" field will look in message bodies and issue titles')|u }}
</td>
</tr>
</table>
</form>

{% endblock %}
Loading