Add macro for submit button

This commit is contained in:
Patrick Jentsch
2020-02-24 09:18:49 +01:00
parent 62263a1f88
commit c7254781d0
15 changed files with 72 additions and 75 deletions

View File

@@ -41,7 +41,7 @@
</div>
</div>
<div class="card-action right-align">
<button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
{{ submit_button(add_corpus_form.submit) }}
</div>
</form>
</div>

View File

@@ -1,5 +1,18 @@
{% extends "nopaque.html.j2" %}
{% macro render_field(field) %}
<div class="input-field">
<i class="prefix">{{ field.name[0:1]|upper }}</i>
{{ field.label }}
{{ field(data_length='255')|safe }}
</div>
{% if field.errors %}
{% for error in field.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endif %}
{% endmacro %}
{% block page_content %}
<div class="col s12 m4">
<h3>{{ corpus.title }}</h3>
@@ -61,7 +74,7 @@
</div>
</div>
<div class="card-action right-align">
<button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
{{ submit_button(add_corpus_file_form.submit) }}
</div>
</div>
<br>
@@ -72,7 +85,6 @@
<span>
<div class="row">
<div class="col s12">
{% from "_formhelpers.html.j2" import render_field %}
{% for field in add_corpus_file_form if not (field.name == "file"
or field.name == "author"
or field.name == "submit"

View File

@@ -1,5 +1,18 @@
{% extends "nopaque.html.j2" %}
{% macro render_field_with_value(field, corpus_file) %}
<div class="input-field">
<i class="prefix">{{ field.name[0:1]|upper }}</i>
{{ field.label }}
{{ field(value=corpus_file[field.name], data_length='255')| safe }}
</div>
{% if field.errors %}
{% for error in field.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endif %}
{% endmacro %}
{% block page_content %}
<div class="col s12 m4">
<h3 id="title">...</h3>
@@ -46,32 +59,31 @@
</div>
</div>
<div class="card-action right-align">
<button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
{{ submit_button(edit_corpus_file_form.submit) }}
</div>
</div>
<br>
<ul class="collapsible hoverable">
<li>
<div class="collapsible-header"><i class="material-icons">edit</i>Edit additional metadata</div>
<div class="collapsible-body">
<span>
<div class="row">
<div class="col s12">
{% from "_formhelpers.html.j2" import render_field_with_value %}
{% for field in edit_corpus_file_form if not (field.name == "file"
or field.name == "author"
or field.name == "submit"
or field.name == "csrf_token"
or field.name == "title"
or field.name == "publishing_year") %}
{{ render_field_with_value(field, corpus_file)}}
{% endfor %}
</div>
</div>
<br>
<ul class="collapsible hoverable">
<li>
<div class="collapsible-header"><i class="material-icons">edit</i>Edit additional metadata</div>
<div class="collapsible-body">
<span>
<div class="row">
<div class="col s12">
{% for field in edit_corpus_file_form if not (field.name == "file"
or field.name == "author"
or field.name == "submit"
or field.name == "csrf_token"
or field.name == "title"
or field.name == "publishing_year") %}
{{ render_field_with_value(field, corpus_file)}}
{% endfor %}
</div>
</span>
</div>
</li>
</ul>
</form>
</div>
</span>
</div>
</li>
</ul>
</form>
</div>
{% endblock %}