Some renaming and moving

This commit is contained in:
Patrick Jentsch
2019-11-08 12:21:59 +01:00
parent e0a1514084
commit 4b0ef837ad
9 changed files with 90 additions and 100 deletions

View File

@ -11,8 +11,7 @@
<link type="text/css" rel="stylesheet" href="{{ url_for('static', filename='fonts/material-icons/material-icons.css') }}">
<link type="text/css" rel="stylesheet" href="{{ url_for('static', filename='css/materialize.min.css') }}" media="screen,projection"/>
<link type="text/css" rel="stylesheet" href="{{ url_for('static', filename='css/opaque.css') }}" media="screen,projection"/>
<script src="{{ url_for('static', filename='js/Animations.js') }}"></script>
<script src="{{ url_for('static', filename='js/opaque.js') }}"></script>
<script src="{{ url_for('static', filename='js/add_job.js') }}"></script>
<script src="{{ url_for('static', filename='js/jsonpatch.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/socket.io.js') }}"></script>
<script src="{{ url_for('static', filename='js/list.js') }}"></script>
@ -137,8 +136,8 @@
<li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
<li><div class="divider"></div></li>
<li><a class="subheader">Services</a></li>
<li><a href="{{ url_for('services.service', service_handle='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
<li><a href="{{ url_for('services.service', service_handle='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
<li><a href="{{ url_for('services.service', service='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
<li><a href="{{ url_for('services.service', service='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
{% if current_user.is_administrator() %}
<li><div class="divider"></div></li>
<li><a class="subheader">Administration</a></li>

View File

@ -86,7 +86,7 @@
</script>
<ul id='new-job-dropdown' class='dropdown-content'>
<li><a href="{{ url_for('services.service', service_handle='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
<li><a href="{{ url_for('services.service', service_handle='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
<li><a href="{{ url_for('services.service', service='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
<li><a href="{{ url_for('services.service', service='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
</ul>
{% endblock %}

View File

@ -53,16 +53,16 @@
<div class="col s12">
<div class="card">
<form method="POST" enctype="multipart/form-data" id="new-nlp-job-form">
<form method="POST" enctype="multipart/form-data" id="add-job-form">
<div class="card-content">
{{ new_job_form.hidden_tag() }}
{{ add_job_form.hidden_tag() }}
<div class="row">
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">title</i>
{{ new_job_form.title(data_length='32') }}
{{ new_job_form.title.label }}
{% for error in new_job_form.title.errors %}
{{ add_job_form.title(data_length='32') }}
{{ add_job_form.title.label }}
{% for error in add_job_form.title.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -70,9 +70,9 @@
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">language</i>
{{ new_job_form.language() }}
{{ new_job_form.language.label }}
{% for error in new_job_form.language.errors %}
{{ add_job_form.language() }}
{{ add_job_form.language.label }}
{% for error in add_job_form.language.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -80,9 +80,9 @@
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">language</i>
{{ new_job_form.version() }}
{{ new_job_form.version.label }}
{% for error in new_job_form.version.errors %}
{{ add_job_form.version() }}
{{ add_job_form.version.label }}
{% for error in add_job_form.version.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -92,13 +92,13 @@
<div class="col s12 m6">
<div class="file-field input-field">
<div class="btn">
<span>{{ new_job_form.files.label.text }}</span>
{{ new_job_form.files(accept='text/plain') }}
<span>{{ add_job_form.files.label.text }}</span>
{{ add_job_form.files(accept='text/plain') }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
{% for error in new_job_form.files.errors %}
{% for error in add_job_form.files.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -106,9 +106,9 @@
<div class="col s12 m6">
<div class="input-field">
<i class="material-icons prefix">description</i>
{{ new_job_form.description(data_length='255') }}
{{ new_job_form.description.label }}
{% for error in new_job_form.description.errors %}
{{ add_job_form.description(data_length='255') }}
{{ add_job_form.description.label }}
{% for error in add_job_form.description.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -136,7 +136,7 @@
</div>
<script>
initNewJobForm(document.getElementById("new-nlp-job-form"),
initAddJobForm(document.getElementById("add-job-form"),
document.getElementById("progress-modal"));
</script>
{% endblock %}

View File

@ -54,16 +54,16 @@
<div class="col s12">
<div class="card">
<form method="POST" enctype="multipart/form-data" id="new-ocr-job-form">
<form method="POST" enctype="multipart/form-data" id="add-job-form">
<div class="card-content">
{{ new_job_form.hidden_tag() }}
{{ add_job_form.hidden_tag() }}
<div class="row">
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">title</i>
{{ new_job_form.title(data_length='32') }}
{{ new_job_form.title.label }}
{% for error in new_job_form.title.errors %}
{{ add_job_form.title(data_length='32') }}
{{ add_job_form.title.label }}
{% for error in add_job_form.title.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -71,9 +71,9 @@
<div class="col s12 m8">
<div class="input-field">
<i class="material-icons prefix">description</i>
{{ new_job_form.description(data_length='255') }}
{{ new_job_form.description.label }}
{% for error in new_job_form.description.errors %}
{{ add_job_form.description(data_length='255') }}
{{ add_job_form.description.label }}
{% for error in add_job_form.description.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -81,13 +81,13 @@
<div class="col s12 m5">
<div class="file-field input-field">
<div class="btn">
<span>{{ new_job_form.files.label.text }}</span>
{{ new_job_form.files(accept='application/pdf, image/tiff') }}
<span>{{ add_job_form.files.label.text }}</span>
{{ add_job_form.files(accept='application/pdf, image/tiff') }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
{% for error in new_job_form.files.errors %}
{% for error in add_job_form.files.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -95,9 +95,9 @@
<div class="col s12 m4">
<div class="input-field">
<i class="material-icons prefix">language</i>
{{ new_job_form.language() }}
{{ new_job_form.language.label }}
{% for error in new_job_form.language.errors %}
{{ add_job_form.language() }}
{{ add_job_form.language.label }}
{% for error in add_job_form.language.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -105,9 +105,9 @@
<div class="col s12 m3">
<div class="input-field">
<i class="material-icons prefix">apps</i>
{{ new_job_form.version() }}
{{ new_job_form.version.label }}
{% for error in new_job_form.version.errors %}
{{ add_job_form.version() }}
{{ add_job_form.version.label }}
{% for error in add_job_form.version.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
@ -194,7 +194,7 @@
<div class="col s3">
<div class="switch">
<label>
{{ new_job_form.binarization() }}
{{ add_job_form.binarization() }}
<span class="lever"></span>
</label>
</div>
@ -224,7 +224,7 @@
</div>
<script>
initNewJobForm(document.getElementById("new-ocr-job-form"),
initAddJobForm(document.getElementById("add-job-form"),
document.getElementById("progress-modal"));
</script>
{% endblock %}