sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-14 18:10:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Stephan Porada
2020-04-20 09:59:34 +02:00
parent 9145265e4b 188aeae88f
commit 2eb3d2f03e
23 changed files with 199 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/templates/corpora/add_corpus.html.j2
View File

@ -9,33 +9,19 @@
<div class="col s12 m8">
<div class="card">
<form method="POST">
{{ add_corpus_form.hidden_tag() }}
<div class="card-content">
{{ add_corpus_form.hidden_tag() }}
<div class="row">
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">title</i>
{{ add_corpus_form.title(data_length='32') }}
{{ add_corpus_form.title.label }}
{% for error in add_corpus_form.title.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(add_corpus_form.title, data_length='32', material_icon='title') }}
</div>
<div class="col s12 m8">
<div class="input-field">
<i class="material-icons prefix">description</i>
{{ add_corpus_form.description(data_length='255') }}
{{ add_corpus_form.description.label }}
{% for error in add_corpus_form.description.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(add_corpus_form.description, data_length='255', material_icon='description') }}
</div>
</div>
</div>
<div class="card-action right-align">
{{ macros.submit_button(add_corpus_form.submit) }}
{{ M.render_field(add_corpus_form.submit, material_icon='send') }}
</div>
</form>
</div>

51
app/templates/corpora/add_corpus_file.html.j2
View File

@ -9,59 +9,27 @@
<div class="col s12 m8">
<form class="nopaque-submit-form" data-progress-modal="progress-modal">
{{ add_corpus_file_form.hidden_tag() }}
<div class="card">
<div class="card-content">
<span class="card-title">Required metadata</span>
{{ add_corpus_file_form.hidden_tag() }}
<div class="row">
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">person</i>
{{ add_corpus_file_form.author(data_length='255') }}
{{ add_corpus_file_form.author.label }}
{% for error in add_corpus_file_form.author.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(add_corpus_file_form.author, data_length='255', material_icon='person') }}
</div>
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">title</i>
{{ add_corpus_file_form.title(data_length='255') }}
{{ add_corpus_file_form.title.label }}
{% for error in add_corpus_file_form.title.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(add_corpus_file_form.title, data_length='255', material_icon='title') }}
</div>
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">access_time</i>
{{ add_corpus_file_form.publishing_year() }}
{{ add_corpus_file_form.publishing_year.label }}
{% for error in add_corpus_file_form.publishing_year.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(add_corpus_file_form.publishing_year, material_icon='access_time') }}
</div>
<div class="col s12">
<div class="file-field input-field">
<div class="btn">
<span>{{ add_corpus_file_form.file.label.text }}</span>
{{ add_corpus_file_form.file(accept='.vrt') }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
{% for error in add_corpus_file_form.file.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(add_corpus_file_form.file, accept='.vrt') }}
</div>
</div>
</div>
<div class="card-action right-align">
{{ macros.submit_button(add_corpus_file_form.submit) }}
{{ M.render_field(add_corpus_file_form.submit, material_icon='send') }}
</div>
</div>
<br>
@ -69,8 +37,9 @@
<li>
<div class="collapsible-header"><i class="material-icons">add</i>Add additional metadata</div>
<div class="collapsible-body">
{% for field in add_corpus_file_form if not (field.name.endswith(('author', 'csrf_token', 'file', 'publishing_year', 'submit', 'title'))) %}
{{ macros.render_field(field)}}
{% for field in add_corpus_file_form
if field.short_name not in ['author', 'csrf_token', 'file', 'publishing_year', 'submit', 'title'] %}
{{ M.render_field(field, data_length='255', material_icon=field.label.text[0:1]) }}
{% endfor %}
</div>
</li>
@ -95,7 +64,7 @@
<div id="progress-modal" class="modal">
<div class="modal-content">
<h4><i class="material-icons prefix">file_upload</i> Uploading files for <span class="title"></span></h4>
<h4><i class="material-icons prefix">file_upload</i> Uploading file...</h4>
<div class="progress">
<div class="determinate" style="width: 0%"></div>
</div>

23
app/templates/corpora/analyse_corpus.html.j2
View File

@ -34,7 +34,7 @@
</div>
<div class="col s12 m2">
<br class="hide-on-small-only">
{{ macros.submit_button(query_form.submit) }}
{{ M.render_field(query_form.submit, material_icon='send') }}
</div>
</div>
</form>
@ -49,27 +49,13 @@
<form id="display-options-form">
<div class="row">
<div class="col s12 m6">
<div class="input-field">
<i class="material-icons prefix">format_list_numbered</i>
{{ display_options_form.results_per_page() }}
{{ display_options_form.results_per_page.label }}
</div>
{{ M.render_field(display_options_form.results_per_page, material_icon='format_list_numbered') }}
</div>
<div class="col s12 m6">
<div class="input-field">
<i class="material-icons prefix">short_text</i>
{{ display_options_form.result_context() }}
{{ display_options_form.result_context.label }}
</div>
{{ M.render_field(display_options_form.result_context, material_icon='short_text') }}
</div>
<div class="col s12">
<div class="switch">
<label>
{{ display_options_form.expert_mode.label.text }}
{{ display_options_form.expert_mode() }}
<span class="lever"></span>
</label>
</div>
{{ M.render_field(display_options_form.expert_mode) }}
</div>
</div>
</form>
@ -152,7 +138,6 @@
<div id="query-results-download-modal"
class="modal modal-fixed-footer no-autoinit">
<div class="modal-content">
{{ query_download_form.hidden_tag() }}
<h4>Download current query Results</h4>
<p>The results of the current query can be downlaoded as several files like csv or json. Those files can be used in other software like excel. Also it is easy to publish your results as raw data like this!</p>
<table>

49
app/templates/corpora/edit_corpus_file.html.j2
View File

@ -4,7 +4,7 @@
<div class="col s12 m4">
<h3 id="title">...</h3>
<p id="description">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et</p>
<a class="btn waves-effect waves-light" href="{{ url_for('corpora.corpus', corpus_id=corpus_file.corpus.id) }}"><i class="material-icons left">arrow_back</i>Back to corpus</a>
<a class="btn waves-effect waves-light" href="{{ url_for('corpora.corpus', corpus_id=corpus.id) }}"><i class="material-icons left">arrow_back</i>Back to corpus</a>
</div>
<div class="col s12 m8">
@ -14,39 +14,18 @@
<div class="card-content">
<div class="row">
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">person</i>
{{ edit_corpus_file_form.author(data_length='255', value=corpus_file.author) }}
{{ edit_corpus_file_form.author.label }}
{% for error in edit_corpus_file_form.author.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(edit_corpus_file_form.author, data_length='255', material_icon='person') }}
</div>
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">title</i>
{{ edit_corpus_file_form.title(data_length='255', value=corpus_file.title) }}
{{ edit_corpus_file_form.title.label }}
{% for error in edit_corpus_file_form.title.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(edit_corpus_file_form.title, data_length='255', material_icon='title') }}
</div>
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">access_time</i>
{{ edit_corpus_file_form.publishing_year(value=corpus_file.publishing_year) }}
{{ edit_corpus_file_form.publishing_year.label }}
{% for error in edit_corpus_file_form.publishing_year.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
{{ M.render_field(edit_corpus_file_form.publishing_year, material_icon='access_time') }}
</div>
</div>
</div>
<div class="card-action right-align">
{{ macros.submit_button(edit_corpus_file_form.submit) }}
{{ M.render_field(edit_corpus_file_form.submit, material_icon='send') }}
</div>
</div>
<br>
@ -54,20 +33,10 @@
<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") %}
{{ macros.render_field_with_value(field, corpus_file)}}
{% endfor %}
</div>
</div>
</span>
{% for field in edit_corpus_file_form
if field.short_name not in ['author', 'csrf_token', 'publishing_year', 'submit', 'title'] %}
{{ M.render_field(field) }}
{% endfor %}
</div>
</li>
</ul>