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 all commits
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyc
15 changes: 11 additions & 4 deletions roundup/cgi/templating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,12 @@ def classhelp(self, properties=None, label=''"(list)", width='500',
(help_url, onclick, cgi_escape_attrs(**html_kwargs),
self._(label))

def submit(self, label=''"Submit New Entry", action="new"):
def submit(self, label=''"Submit New Entry", action="new", html_kwargs={}):
""" Generate a submit button (and action hidden element)

"html_kwargs" specified additional html args for the
generated html <select>

Generate nothing if we're not editable.
"""
if not self.is_edit_ok():
Expand All @@ -775,7 +778,8 @@ def submit(self, label=''"Submit New Entry", action="new"):
'\n' + \
self.input(type="hidden", name="@action", value=action) + \
'\n' + \
self.input(type="submit", name="submit_button", value=self._(label))
self.input(type="submit", name="submit_button", value=self._(label),
**html_kwargs)

def history(self):
if not self.is_view_ok():
Expand Down Expand Up @@ -905,9 +909,12 @@ def is_retired(self):
"""Is this item retired?"""
return self._klass.is_retired(self._nodeid)

def submit(self, label=''"Submit Changes", action="edit"):
def submit(self, label=''"Submit Changes", action="edit", html_kwargs={}):
"""Generate a submit button.

"html_kwargs" specified additional html args for the
generated html <select>

Also sneak in the lastactivity and action hidden elements.
"""
return self.input(type="hidden", name="@lastactivity",
Expand All @@ -919,7 +926,7 @@ def submit(self, label=''"Submit Changes", action="edit"):
self.input(type="hidden", name="@action", value=action) + \
'\n' + \
self.input(type="submit", name="submit_button",
value=self._(label))
value=self._(label), **html_kwargs)

def journal(self, direction='descending'):
""" Return a list of HTMLJournalEntry instances.
Expand Down
149 changes: 61 additions & 88 deletions share/roundup/templates/jinja2/html/issue.item.edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,70 @@
<form method="POST"
{% if context.id %}
action='issue{{ context.id }}'
{% else %}
action='issue'
{% endif %}
name="itemSynopsis"
enctype="multipart/form-data"
>
<fieldset>
<!-- title -->
<div class='row-fluid'>
<div class='control-group'>
<label class='control-label' for='title'>{{ i18n.gettext('Title')|u }}</label>
<div class='controls'>
<input name='title' id='title' type='text' class='input-xxlarge' value='{{ context.title.plain()|u|e }}' required>
<form class="col-xl-6" method="POST" {% if context.id %} action='issue{{ context.id }}' {% else %} action='issue' {% endif %} name="itemSynopsis" enctype="multipart/form-data">
<fieldset>
<!-- title -->
<div class='form-group row'>
<label class='col-3 col-form-label' for='title'>{{ i18n.gettext('Title')|u }}</label>
<div class='col-9'>
<input class="form-control" name='title' id='title' type='text' class='input-lg' value='{{ context.title.plain()|u|e }}' required>
</div>
</div>
</div>
</div> <!-- row-fluid -->

<!-- priority & Status -->
<div class='row-fluid'>
<div class='control-group span6'>
<label class='control-label' for='priority'>{{ i18n.gettext('Priority')|u }}</label>
<div class='controls'>
{{ context.priority.menu()|u }}
<div class='form-group row'>
<label class='col-3 col-form-label' for='priority'>{{ i18n.gettext('Priority')|u }}</label>
<div class='col-3'>
{{ context.priority.menu(html_kwargs={"class": "custom-select"})|u }}
</div>
<label class='col-3 col-form-label' for='status'>{{ i18n.gettext('Status')|u }}</label>
<div class='col-3'>
{{ context.status.menu(html_kwargs={"class": "custom-select"})|u }}
</div>
</div>
</div>
<div class='control-group span6'>
<label class='control-label' for='status'>{{ i18n.gettext('Status')|u }}</label>
<div class='controls'>
{{ context.status.menu()|u }}
</div>
</div>
</div> <!-- row-fluid -->

<!-- Superseder & nosy list -->
<div class='row-fluid'>
<div class='control-group span6'>
<label class='control-label' for='superseder'>{{ i18n.gettext('Superseder')|u }}</label>
<div class='controls'>
<input type='text' name='superseder' id='superseder' value='{{ context.superseder.plain()|u|e }}'>
</div>
</div>
<div class='control-group span6'>
<label class='control-label' for='nosylist'>{{ i18n.gettext('Nosy list')|u }}</label>
<div class='controls'>
<input type='text' name='nosy' id='nosylist' value='{{ context.nosy.plain()|u|e }}'>
<!-- Superseder & nosy list -->
<div class='form-group row'>
<label class='col-3 col-form-label' for='superseder'>{{ i18n.gettext('Superseder')|u }}</label>
<div class='col-3'>
<input class="form-control" type='text' name='superseder' id='superseder' value='{{ context.superseder.plain()|u|e }}'>
</div>
<label class='col-3 col-form-label' for='nosylist'>{{ i18n.gettext('Nosy list')|u }}</label>
<div class='col-3'>
<input class="form-control" type='text' name='nosy' id='nosylist' value='{{ context.nosy.plain()|u|e }}'>
</div>
</div>
</div>
</div> <!-- row-fluid -->

<!-- Assigned to & keywords -->
<div class='row-fluid'>
<div class='control-group span6'>
<label class='control-label' for='assignedto'>{{ i18n.gettext('Assigned to')|u }}</label>
<div class='controls'>
{{ context.assignedto.menu()|u }}
</div>
</div>
<div class='control-group span6'>
<label class='control-label' for='keyword'>{{ i18n.gettext('Keywords')|u }}</label>
<div class='controls'>
<input type='text' name='keyword' id='keyword' value='{{ context.keyword.plain()|u|e }}'>
</div>
</div>
</div> <!-- row-fluid -->
<!-- Assigned to & keywords -->
<div class='form-group row'>
<label class='col-3 col-form-label' for='assignedto'>{{ i18n.gettext('Assigned to')|u }}</label>
<div class='col-3'>
{{ context.assignedto.menu(html_kwargs={"class": "custom-select"})|u }}
</div>
<label class='col-3 col-form-label' for='keyword'>{{ i18n.gettext('Keywords')|u }}</label>
<div class='col-3'>
<input class="form-control" type='text' name='keyword' id='keyword' value='{{ context.keyword.plain()|u|e }}'>
</div>
</div> <!-- form-group row -->

<!-- Note -->
<div class='row-fluid'>
<div class='control-group'>
<label class='control-label' for='change_note'>{{ i18n.gettext('Change note')|u }}</label>
<div class='controls'>
<textarea name="@note" rows="5" class='input-xxlarge' id='change_note'></textarea>
</div>
</div>
</div> <!-- row-fluid -->
<!-- Note -->
<div class='form-group row'>
<label class='col-3 col-form-label' for='change_note'>{{ i18n.gettext('Change note')|u }}</label>
<div class='col-9'>
<textarea class="form-control" name="@note" rows="5" class='input-lg' id='change_note'></textarea>
</div>
</div> <!-- form-group row -->

<!-- File upload -->
<div class='row-fluid'>
<div class='control-group'>
<label class='control-label' for='file_upload'>{{ i18n.gettext('File')|u }}</label>
<div class='controls'>
<input type="file" name="@file" id='file_upload'>
</div>
</div>
</div> <!-- row-fluid -->
</fieldset>
<div class='form-actions'>
{{ context.submit() }}
{% if context.id %}
<a href='{{ context.copy_url() }}'>{{ i18n.gettext('Make a copy')|u }}</a>
{% endif %}
</div>
<input type="hidden" name="@template" value="item">
<input type="hidden" name="@required" value="title,priority">
<!-- File upload -->
<div class='form-group row'>
<label class='col-3 col-form-label' for='file_upload'>{{ i18n.gettext('File')|u }}</label>
<div class='col-3'>
<input class="form-control-file" type="file" name="@file" id='file_upload'>
</div>
</div> <!-- form-group row -->
</fieldset>
<div class='form-actions'>
{{ context.submit(html_kwargs={"class": "btn btn-primary"}) }}
{% if context.id %}
<a href='{{ context.copy_url() }}'>{{ i18n.gettext('Make a copy')|u }}</a>
{% endif %}
</div>
<input type="hidden" name="@template" value="item">
<input type="hidden" name="@required" value="title,priority">
</form>
Loading