diff --git a/app/admin/views.py b/app/admin/views.py
index 0cc915b19a83e437cec3544a097e0dd6f14bba68..aa60d2619ea6f917bf1531ebe80ee8e6e81f858d 100644
--- a/app/admin/views.py
+++ b/app/admin/views.py
@@ -5,64 +5,51 @@ from app.tables import AdminUserItem, AdminUserTable
from app.profile.background_functions import delete_user_
from flask import current_app, flash, redirect, render_template, url_for
from flask_login import login_required
+from threading import Thread
from . import admin
from .forms import EditProfileAdminForm
-import threading
-@admin.route('/overview', methods=['GET', 'POST'])
+@admin.route('/board')
@login_required
@admin_required
-def for_admins_only():
- users = User.query.order_by(User.username).all()
+def board():
+ users = User.query.all()
items = [AdminUserItem(u.username, u.email, u.role_id, u.confirmed, u.id)
for u in users]
# Convert table object to html string
table = AdminUserTable(items).__html__()
# Add class "list" to tbody element. Needed for "List.js"
table = table.replace('tbody', 'tbody class="list"', 1)
- return render_template('admin/admin.html.j2',
- table=table,
- title='Administration tools')
+ return render_template('admin/board.html.j2', table=table,
+ title='Admin board')
-@admin.route('/overview/admin_user_page/<int:user_id>',
- methods=['GET', 'POST'])
+@admin.route('/user/<int:user_id>')
@login_required
@admin_required
-def admin_user_page(user_id):
- selected_user = User.query.get_or_404(user_id)
- title = 'Administration of user {} with ID: {}'.format(
- selected_user.username,
- selected_user.id
- )
- registration_date = selected_user.registration_date.strftime(
- '%A, %e %B %H:%M'
- )
- return render_template('admin/admin_user_page.html.j2',
- registration_date=registration_date,
- selected_user=selected_user,
- title=title)
+def user(user_id):
+ user = User.query.get_or_404(user_id)
+ return render_template('admin/user.html.j2', title='Administrate user',
+ user=user)
-@admin.route('/overview/admin_user_page/delete/<int:user_id>',
- methods=['GET', 'POST'])
+@admin.route('/user/<int:user_id>/delete')
@login_required
@admin_required
-def admin_delete_user(user_id):
- delete_thread = threading.Thread(target=delete_user_,
- args=(current_app._get_current_object(),
- user_id))
- delete_thread.start()
- flash('User {} has been deleted!'.format(user_id))
- return redirect(url_for('admin.for_admins_only'))
+def delete_user(user_id):
+ user = User.query.get_or_404(user_id)
+ thread = Thread(target=delete_user_,
+ args=(current_app._get_current_object(), user.id))
+ thread.start()
+ flash('User has been deleted!')
+ return redirect(url_for('admin.board'))
-@admin.route('/overview/admin_user_page/edit_profile_admin/<int:user_id>',
- methods=['GET', 'POST'])
+@admin.route('/user/<int:user_id>/edit', methods=['GET', 'POST'])
@login_required
@admin_required
-def edit_profile_admin(user_id):
+def edit_user(user_id):
user = User.query.get_or_404(user_id)
form = EditProfileAdminForm(user=user)
if form.validate_on_submit():
@@ -73,16 +60,10 @@ def edit_profile_admin(user_id):
db.session.add(user)
db.session.commit()
flash('The profile has been updated.')
- return redirect(url_for('admin.edit_profile_admin', user_id=user.id))
+ return redirect(url_for('admin.edit_user', user_id=user.id))
form.email.data = user.email
form.username.data = user.username
form.confirmed.data = user.confirmed
form.role.data = user.role_id
- title = 'Edit profile of user {} with ID {}'.format(
- user.username,
- user.id
- )
- return render_template('admin/edit_profile_admin.html.j2',
- form=form,
- title=title,
- user=user)
+ return render_template('admin/edit_user.html.j2', form=form,
+ title='Edit user', user=user)
diff --git a/app/corpora/views.py b/app/corpora/views.py
index 9c86a6448cc87c5684bae9ffd2e020104e80c8ff..1f8fa1325c2077cf5701124cdd019f1a80a081fb 100644
--- a/app/corpora/views.py
+++ b/app/corpora/views.py
@@ -3,6 +3,7 @@ from app.models import Corpus, CorpusFile
from flask import (abort, current_app, flash, redirect, request,
render_template, url_for, send_from_directory)
from flask_login import current_user, login_required
+from threading import Thread
from werkzeug.utils import secure_filename
from . import corpora
from .background_functions import (delete_corpus_, delete_corpus_file_,
@@ -10,7 +11,6 @@ from .background_functions import (delete_corpus_, delete_corpus_file_,
from .forms import (AddCorpusFileForm, AddCorpusForm, EditCorpusFileForm,
QueryDownloadForm, QueryForm)
import os
-import threading
@corpora.route('/add', methods=['GET', 'POST'])
@@ -71,9 +71,8 @@ def delete_corpus(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
if not (corpus.creator == current_user or current_user.is_administrator()):
abort(403)
- thread = threading.Thread(target=delete_corpus_,
- args=(current_app._get_current_object(),
- corpus.id))
+ thread = Thread(target=delete_corpus_,
+ args=(current_app._get_current_object(), corpus.id))
thread.start()
flash('Corpus deleted!')
return redirect(url_for('main.dashboard'))
@@ -106,9 +105,9 @@ def add_corpus_file(corpus_id):
title=add_corpus_file_form.title.data)
db.session.add(corpus_file)
db.session.commit()
- thread = threading.Thread(target=edit_corpus_file_,
- args=(current_app._get_current_object(),
- corpus_file.id))
+ thread = Thread(target=edit_corpus_file_,
+ args=(current_app._get_current_object(),
+ corpus_file.id))
thread.start()
flash('Corpus file added!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
@@ -126,9 +125,8 @@ def delete_corpus_file(corpus_id, corpus_file_id):
if not (corpus_file.corpus.creator == current_user
or current_user.is_administrator()):
abort(403)
- thread = threading.Thread(target=delete_corpus_file_,
- args=(current_app._get_current_object(),
- corpus_file.id))
+ thread = Thread(target=delete_corpus_file_,
+ args=(current_app._get_current_object(), corpus_file.id))
thread.start()
flash('Corpus file deleted!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
@@ -165,9 +163,9 @@ def edit_corpus_file(corpus_id, corpus_file_id):
corpus_file.publishing_year = edit_corpus_file_form.publishing_year.data
corpus_file.title = edit_corpus_file_form.title.data
db.session.commit()
- thread = threading.Thread(target=edit_corpus_file_,
- args=(current_app._get_current_object(),
- corpus_file.id))
+ thread = Thread(target=edit_corpus_file_,
+ args=(current_app._get_current_object(),
+ corpus_file.id))
thread.start()
flash('Corpus file edited!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
diff --git a/app/email.py b/app/email.py
index 072b7bc37aabf70f94b0b7a17154e680d29ece9c..fa516327585fd55a3b60081dafa87615c66e4075 100644
--- a/app/email.py
+++ b/app/email.py
@@ -13,7 +13,7 @@ def send_email(to, subject, template, **kwargs):
msg = Message('[Opaque] {}'.format(subject), recipients=[to])
msg.body = render_template(template + '.txt.j2', **kwargs)
msg.html = render_template(template + '.html.j2', **kwargs)
- thr = Thread(target=send_async_email,
- args=[current_app._get_current_object(), msg])
- thr.start()
- return thr
+ thread = Thread(target=send_async_email,
+ args=(current_app._get_current_object(), msg))
+ thread.start()
+ return thread
diff --git a/app/jobs/views.py b/app/jobs/views.py
index 7b1b24fdfaf9454bf20e27330b990a85e049906c..37a81a215f5986abdc391680351a11c7710b1422 100644
--- a/app/jobs/views.py
+++ b/app/jobs/views.py
@@ -2,10 +2,10 @@ from app.models import Job, JobInput, JobResult
from flask import (abort, current_app, flash, redirect, render_template,
send_from_directory, url_for)
from flask_login import current_user, login_required
+from threading import Thread
from . import jobs
from .background_functions import delete_job_
import os
-import threading
@jobs.route('/<int:job_id>')
@@ -23,10 +23,9 @@ def delete_job(job_id):
job = Job.query.get_or_404(job_id)
if not (job.creator == current_user or current_user.is_administrator()):
abort(403)
- delete_thread = threading.Thread(target=delete_job_,
- args=(current_app._get_current_object(),
- job_id))
- delete_thread.start()
+ thread = Thread(target=delete_job_,
+ args=(current_app._get_current_object(), job_id))
+ thread.start()
flash('Job has been deleted!')
return redirect(url_for('main.dashboard'))
diff --git a/app/tables.py b/app/tables.py
index fac611d17b3097d9cdb325341cb1fb9da5b8e6a1..f393ac89b305f3ab300dc8186f204113fe1521f5 100644
--- a/app/tables.py
+++ b/app/tables.py
@@ -21,7 +21,7 @@ class AdminUserTable(Table):
id = Col('User Id', column_html_attrs={'class': 'id'},
th_html_attrs={'class': 'sort',
'data-sort': 'id'})
- url = LinkCol('Profile', 'admin.admin_user_page',
+ url = LinkCol('Profile', 'admin.user',
url_kwargs=dict(user_id='id'),
anchor_attrs={'class': 'waves-effect waves-light btn-small'})
diff --git a/app/templates/admin/admin.html.j2 b/app/templates/admin/admin.html.j2
deleted file mode 100644
index 8fbb368ce542867bfc0a49ab1cd7a3fd0e1bc775..0000000000000000000000000000000000000000
--- a/app/templates/admin/admin.html.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "full_width.html.j2" %}
-
-{% block page_content %}
-<div class="col s12">
- <div class="card">
- <div class="card-content">
- <span class="card-title">User list</span>
- <div id="users">
- <div class="input-field">
- <i class="material-icons prefix">search</i>
- <input id="search-corpus" class="search" type="text"></input>
- <label for="search-corpus">Search users</label>
- </div>
- {{ table }}
- <ul class="pagination"></ul>
- </div>
- </div>
- </div>
-</div>
-<script type="text/javascript">
-var options = {
- valueNames: ['username', 'email', 'role', 'confirmed', 'id'],
- page: 10,
- pagination: true
-};
-var userList = new List('users', options);
-</script>
-{% endblock %}
diff --git a/app/templates/admin/admin_user_page.html.j2 b/app/templates/admin/admin_user_page.html.j2
deleted file mode 100644
index e1ad5fddfa864cf00bb42a526e281964323356ba..0000000000000000000000000000000000000000
--- a/app/templates/admin/admin_user_page.html.j2
+++ /dev/null
@@ -1,104 +0,0 @@
-{% extends "limited_width.html.j2" %}
-
-{% block page_content %}
-<div class="col s12 m6">
- <div class="card large">
- <div class="card-content">
- <span class="card-title">User information</span>
- <ul>
- <li>Username: {{selected_user.username}}</li>
- <li>Email: {{selected_user.email}}</li>
- <li>ID: {{selected_user.id}}</li>
- <li>Registration date: {{registration_date}}</li>
- <li>Confirmed status: {{selected_user.confirmed}}</li>
- <li>Role ID: {{selected_user.role_id}}</li>
- <li>Permissions as Int: {{selected_user.role.permissions}}</li>
- <li>Role name: {{selected_user.role.name}}</li>
- </ul>
- <div class="card-action">
- <a href="{{url_for('admin.edit_profile_admin', user_id=selected_user.id)}}" class="waves-effect waves-light btn"><i class="material-icons left">edit</i>Edit user</a>
- <a href="#modal-confirm-delete" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete User</a>
- <!-- Modal Strucutre -->
- <div id="modal-confirm-delete" class="modal">
- <div class="modal-content">
- <h4>Confirm deletion</h4>
- <p>Do you really want to delete the current selected user ({{selected_user.username}})?
- All associated jobs and job files will be permanently deleted.</p>
- </div>
- <div class="modal-footer">
- <a href="{{url_for('admin.admin_delete_user', user_id=selected_user.id)}}" class="modal-close waves-effect waves-green btn red"><i class="material-icons left">delete</i>Delete User</a>
- <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-<script>
- socket.emit('subscribe_foreign_user_ressources', {{ selected_user.id }});
-</script>
-<div class="col s12 m6">
- <div id="job-foreign-list">
- <div class="card">
- <div class="card-content">
- <span class="card-title">User Jobs</span>
- <div class="row">
- <div class="col s12">
- <div class="input-field">
- <i class="material-icons prefix">search</i>
- <input id="search-job" class="search" type="text"></input>
- <label for="search-job">Search job</label>
- </div>
- </div>
- <div class="col s12">
- <ul class="pagination"></ul>
- </div>
- </div>
- </div>
- </div>
- <div class="collection list"></div>
- </div>
-</div>
-<script>
- var jobList = new JobList("job-foreign-list", foreignJobsSubscribers, {
- item: '<div><span class="title"></span><span class="description"></span></div>',
- page: 4,
- pagination: true,
- valueNames: ["description", "title", {data: ["id"]}]
- });
- jobList.on("filterComplete", List.updatePagination);
- jobList.on("searchComplete", List.updatePagination);
-</script>
-<div class="col s12 m6">
- <div id="corpus-foreign-list">
- <div class="card">
- <div class="card-content">
- <span class="card-title">User Corpora</span>
- <div class="row">
- <div class="col s12">
- <div class="input-field">
- <i class="material-icons prefix">search</i>
- <input id="search-job" class="search" type="text"></input>
- <label for="search-job">Search corpus</label>
- </div>
- </div>
- <div class="col s12">
- <ul class="pagination"></ul>
- </div>
- </div>
- </div>
- </div>
- <div class="collection list"></div>
- </div>
-</div>
-<script>
- var corpusList = new CorpusList("corpus-foreign-list", foreignCorporaSubscribers, {
- item: '<div><span class="title"></span><span class="description"></span></div>',
- page: 4,
- pagination: true,
- valueNames: ["description", "title", {data: ["id"]}]
- });
- corpusList.on("filterComplete", List.updatePagination);
- corpusList.on("searchComplete", List.updatePagination);
-</script>
-{% endblock %}
diff --git a/app/templates/admin/board.html.j2 b/app/templates/admin/board.html.j2
new file mode 100644
index 0000000000000000000000000000000000000000..efc07a098680cec187fcbf85b8d624117e1c10b8
--- /dev/null
+++ b/app/templates/admin/board.html.j2
@@ -0,0 +1,26 @@
+{% extends "full_width.html.j2" %}
+
+{% block page_content %}
+<div class="col s12">
+ <div id="user-list">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">User list</span>
+ <div class="input-field">
+ <i class="material-icons prefix">search</i>
+ <input id="search-user" class="search" type="text"></input>
+ <label for="search-user">Search user</label>
+ </div>
+ {{ table }}
+ <ul class="pagination"></ul>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script>
+ var options = {page: 10, pagination: true,
+ valueNames: ['username', 'email', 'role', 'confirmed', 'id']};
+ var userList = new List('user-list', options);
+</script>
+{% endblock %}
diff --git a/app/templates/admin/edit_profile_admin.html.j2 b/app/templates/admin/edit_user.html.j2
similarity index 56%
rename from app/templates/admin/edit_profile_admin.html.j2
rename to app/templates/admin/edit_user.html.j2
index f96aabc651ea0d6c21e28240a5f1e54d227b47ef..0686d3102af6f9bdef7d2b6eed2fa6966eac1d48 100644
--- a/app/templates/admin/edit_profile_admin.html.j2
+++ b/app/templates/admin/edit_user.html.j2
@@ -1,6 +1,12 @@
{% extends "limited_width.html.j2" %}
{% block page_content %}
+<div class="col s12 m4">
+ <h3 id="title">{{ user.username }}</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 justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
+ <a class="waves-effect waves-light btn" href="{{ url_for('admin.user', user_id=user.id) }}"><i class="material-icons left">arrow_back</i>Back to user administration</a>
+</div>
+
<div class="col s12 m8">
<div class="card">
<form method="POST">
@@ -11,7 +17,7 @@
{{ form.username() }}
{{ form.username.label }}
{% for error in form.username.errors %}
- <span class="helper-text red-text">{{ error }}</span>
+ <span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
<div class="input-field">
@@ -19,7 +25,7 @@
{{ form.email() }}
{{ form.email.label }}
{% for error in form.email.errors %}
- <span class="helper-text red-text">{{ error }}</span>
+ <span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
<div class="input-field">
@@ -27,7 +33,7 @@
{{ form.role() }}
{{ form.role.label }}
{% for error in form.role.errors %}
- <span class="helper-text red-text">{{ error }}</span>
+ <span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
<div class="switch">
@@ -36,22 +42,21 @@
Confirmed status:
Off
{% if form.confirmed.data == True %}
- <input type="checkbox" id="{{form.confirmed.name}}" name="{{form.confirmed.name}}" checked="checked">
+ <input type="checkbox" id="{{ form.confirmed.name }}" name="{{ form.confirmed.name }}" checked="checked">
{% else %}
- <input type="checkbox" id="{{form.confirmed.name}}" name="{{form.confirmed.name}}">
+ <input type="checkbox" id="{{ form.confirmed.name }}" name="{{ form.confirmed.name }}">
{% endif %}
<span class="lever"></span>
On
</label>
{% for error in form.confirmed.errors %}
- <span class="helper-text red-text">{{ error }}</span>
+ <span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
</div>
<div class="card-action right-align">
- {{ form.submit(class='btn') }}
+ <button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
</div>
- </div>
</form>
</div>
</div>
diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2
new file mode 100644
index 0000000000000000000000000000000000000000..bf2df2d3f184ae0c8364dff1f2fc46d7ee503119
--- /dev/null
+++ b/app/templates/admin/user.html.j2
@@ -0,0 +1,115 @@
+{% extends "limited_width.html.j2" %}
+
+{% block page_content %}
+<div class="col s12 m4">
+ <h3 id="title">{{ user.username }}</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 justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
+ <a class="waves-effect waves-light btn" href="{{ url_for('admin.board') }}"><i class="material-icons left">arrow_back</i>Back to admin board</a>
+</div>
+
+<div class="col s12 m8">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">User information</span>
+ <ul>
+ <li>Username: {{ user.username }}</li>
+ <li>Email: {{ user.email }}</li>
+ <li>ID: {{ user.id }}</li>
+ <li>Registration date: {{ user.registration_date.strftime('%m/%d/%Y, %H:%M:%S %p') }}</li>
+ <li>Confirmed status: {{ user.confirmed }}</li>
+ <li>Role ID: {{ user.role_id }}</li>
+ <li>Permissions as Int: {{ user.role.permissions }}</li>
+ <li>Role name: {{ user.role.name }}</li>
+ </ul>
+ </div>
+ <div class="card-action right-align">
+ <a href="{{ url_for('admin.edit_user', user_id=user.id) }}" class="waves-effect waves-light btn"><i class="material-icons left">edit</i>Edit user</a>
+ <a data-target="delete-user-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete user</a>
+ </div>
+ </div>
+</div>
+
+<div class="col s12"></div>
+
+<div class="col s12 m6">
+ <div id="corpus-list">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">Corpora</span>
+ <div class="row">
+ <div class="col s12">
+ <div class="input-field">
+ <i class="material-icons prefix">search</i>
+ <input id="search-corpus" class="search" type="text"></input>
+ <label for="search-corpus">Search corpus</label>
+ </div>
+ </div>
+ <div class="col s12">
+ <ul class="pagination"></ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="collection list"></div>
+ </div>
+</div>
+
+<div class="col s12 m6">
+ <div id="job-list">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">Jobs</span>
+ <div class="row">
+ <div class="col s12">
+ <div class="input-field">
+ <i class="material-icons prefix">search</i>
+ <input id="search-job" class="search" type="text"></input>
+ <label for="search-job">Search job</label>
+ </div>
+ </div>
+ <div class="col s12">
+ <ul class="pagination"></ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="collection list"></div>
+ </div>
+</div>
+
+
+<!-- Modals -->
+<div id="delete-user-modal" class="modal">
+ <div class="modal-content">
+ <h4>Confirm user deletion</h4>
+ <p>Do you really want to delete the user {{ user.username }}? All associated data will be permanently deleted!</p>
+ </div>
+ <div class="modal-footer">
+ <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
+ <a href="{{ url_for('admin.delete_user', user_id=user.id) }}" class="modal-close waves-effect waves-green btn red">Confirm<i class="material-icons right">send</i></a>
+ </div>
+</div>
+
+
+<script>
+ socket.emit('subscribe_foreign_user_ressources', {{ user.id }});
+
+ var corpusList = new CorpusList("corpus-list", foreignCorporaSubscribers, {
+ item: '<div><span class="title"></span><span class="description"></span></div>',
+ page: 4,
+ pagination: true,
+ valueNames: ["description", "title", {data: ["id"]}]
+ });
+ corpusList.on("filterComplete", List.updatePagination);
+ corpusList.on("searchComplete", List.updatePagination);
+
+ var jobList = new JobList("job-list", foreignJobsSubscribers, {
+ item: '<div><span class="title"></span><span class="description"></span></div>',
+ page: 4,
+ pagination: true,
+ valueNames: ["description", "title", {data: ["id"]}]
+ });
+ jobList.on("filterComplete", List.updatePagination);
+ jobList.on("searchComplete", List.updatePagination);
+</script>
+{% endblock %}
diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index a73b7d37a1818ca6eae26d3c79101689b3350515..6a8d5487ae9463979bd6d076911af31dab02693a 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -37,7 +37,6 @@
var jobsSubscribers = [];
var socket = io();
- socket.emit('subscribe_user_ressources');
socket.on('init-corpora', function(msg) {
corpora = JSON.parse(msg);
for (let subscriber of corporaSubscribers) {subscriber._init(corpora);}
@@ -141,7 +140,7 @@
{% if current_user.is_administrator() %}
<li><div class="divider"></div></li>
<li><a class="subheader">Administration</a></li>
- <li><a href="{{ url_for('admin.for_admins_only') }}"><i class="material-icons">build</i>Administration tools</a></li>
+ <li><a href="{{ url_for('admin.board') }}"><i class="material-icons">build</i>Administration tools</a></li>
{% endif %}
<div class="hide-on-large-only">
<li><div class="divider"></div></li>
@@ -170,28 +169,31 @@
</div>
</footer>
- <script type="text/javascript" src="{{ url_for('static', filename='js/materialize.min.js') }}"></script>
<script>
- M.AutoInit();
- M.CharacterCounter.init(document.querySelectorAll('input[data-length][type="text"]'))
- M.Dropdown.init(
- document.getElementById("nav-notifications"),
- {"alignment": "right", "constrainWidth": false, "coverTrigger": false}
- );
- M.Dropdown.init(
- document.getElementById("nav-account"),
- {"alignment": "right", "constrainWidth": false, "coverTrigger": false}
- );
- // Highlight current navigation entry
- var entry;
- for (entry of document.querySelectorAll("#slide-out a:not(.subheader)")) {
- if (entry.href === window.location.href) {
- entry.parentNode.classList.add("active");
- }
+ socket.emit('subscribe_user_ressources');
+ </script>
+ <script src="{{ url_for('static', filename='js/materialize.min.js') }}"></script>
+ <script>
+ M.AutoInit();
+ M.CharacterCounter.init(document.querySelectorAll('input[data-length][type="text"]'))
+ M.Dropdown.init(
+ document.getElementById("nav-notifications"),
+ {"alignment": "right", "constrainWidth": false, "coverTrigger": false}
+ );
+ M.Dropdown.init(
+ document.getElementById("nav-account"),
+ {"alignment": "right", "constrainWidth": false, "coverTrigger": false}
+ );
+ // Highlight current navigation entry
+ var entry;
+ for (entry of document.querySelectorAll("#slide-out a:not(.subheader)")) {
+ if (entry.href === window.location.href) {
+ entry.parentNode.classList.add("active");
}
- {% for message in get_flashed_messages() %}
- M.toast({html: '{{ message }}'})
- {% endfor %}
+ }
+ {% for message in get_flashed_messages() %}
+ M.toast({html: '{{ message }}'})
+ {% endfor %}
</script>
</body>
</html>
diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index 84367cf83f890413c7c6038fca7c4b057197959d..30c5d060469e8e45fed27c5f4feab8f089e0e1c8 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -1,83 +1,6 @@
{% extends "limited_width.html.j2" %}
{% block page_content %}
-<script>
- {% if corpus.creator == current_user %}
- var foreignCorpusFlag = false;
- {% else %}
- var foreignCorpusFlag = true;
- socket.emit('subscribe_foreign_user_ressources', {{ corpus.user_id }});
- {% endif %}
-
- class InformationUpdater {
- constructor(corpusId) {
- this.corpusId = corpusId;
- if (foreignCorpusFlag) {
- foreignCorporaSubscribers.push(this);
- } else {
- corporaSubscribers.push(this);
- }
- }
-
- _init() {
- if (foreignCorpusFlag) {
- this.corpus = foreignCorpora[this.corpusId];
- } else {
- this.corpus = corpora[this.corpusId];
- }
-
- // Status
- this.setStatus(this.corpus.status);
- }
-
- _update(patch) {
- var pathArray;
-
- for (let operation of patch) {
- /* "/corpusId/valueName" -> ["corpusId", "valueName"] */
- pathArray = operation.path.split("/").slice(1);
- if (pathArray[0] != this.corpusId) {continue;}
- switch(operation.op) {
- case "add":
- location.reload();
- break;
- case "delete":
- location.reload();
- break;
- case "replace":
- if (pathArray[1] === "status") {
- this.setStatus(operation.value);
- }
- break;
- default:
- break;
- }
- }
- }
-
- setStatus(status) {
- var statusElement;
- statusElement = document.getElementById("status");
- statusElement.classList.remove(...Object.values(CorpusList.STATUS_COLORS));
- statusElement.classList.add(CorpusList.STATUS_COLORS[status] || CorpusList.STATUS_COLORS['default']);
- statusElement.innerText = status;
- var analyseBtn = document.getElementById('analyse');
- if (status === 'prepared' || status === 'analysing') {
- analyseBtn.classList.remove('hide', 'disabled');
- } else if (status === 'start analysis' || status === 'stop analysis') {
- analyseBtn.classList.remove('hide');
- analyseBtn.classList.add('disabled');
- }
- if (status === 'prepared' || status === 'preparable' || status === 'preparing' || status === 'start analysis' || status === 'analysing' || status === 'stop analysis') {
- var prepareBtn = document.getElementById('prepare');
- prepareBtn.classList.add('hide');
- }
- }
- }
-
- var informationUpdater = new InformationUpdater({{ corpus.id }});
-</script>
-
<div class="col s12 m4">
<h3 id="title">{{ corpus.title }}</h3>
<p id="description">{{ corpus.description }}</p>
@@ -146,11 +69,12 @@
</div>
</div>
+
<!-- Modals -->
<div id="delete-corpus-modal" class="modal">
<div class="modal-content">
<h4>Confirm corpus deletion</h4>
- <p>Do you really want to delete the Corpus {{corpus.title}}? All files will be permanently deleted!</p>
+ <p>Do you really want to delete the corpus {{corpus.title}}? All files will be permanently deleted!</p>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
@@ -169,5 +93,78 @@
<a class="modal-close waves-effect waves-green btn red" href="{{ url_for('corpora.delete_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}">Confirm<i class="material-icons right">send</i></a>
</div>
</div>
+
+
+<script>
+ class InformationUpdater {
+ constructor(corpusId, foreignCorpusFlag) {
+ this.corpusId = corpusId;
+ this.foreignCorpusFlag = foreignCorpusFlag;
+ if (this.foreignCorpusFlag) {
+ foreignCorporaSubscribers.push(this);
+ } else {
+ corporaSubscribers.push(this);
+ }
+ }
+
+ _init() {
+ var corpus = this.foreignCorpusFlag ? foreignCorpora[this.corpusId] : corpora[this.corpusId];
+
+ // Status
+ this.setStatus(corpus.status);
+ }
+
+ _update(patch) {
+ var pathArray;
+
+ for (let operation of patch) {
+ /* "/corpusId/valueName" -> ["corpusId", "valueName"] */
+ pathArray = operation.path.split("/").slice(1);
+ if (pathArray[0] != this.corpusId) {continue;}
+ switch(operation.op) {
+ case "add":
+ location.reload();
+ break;
+ case "delete":
+ location.reload();
+ break;
+ case "replace":
+ if (pathArray[1] === "status") {
+ this.setStatus(operation.value);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ setStatus(status) {
+ var statusElement;
+ statusElement = document.getElementById("status");
+ statusElement.classList.remove(...Object.values(CorpusList.STATUS_COLORS));
+ statusElement.classList.add(CorpusList.STATUS_COLORS[status] || CorpusList.STATUS_COLORS['default']);
+ statusElement.innerText = status;
+ var analyseBtn = document.getElementById('analyse');
+ if (status === 'prepared' || status === 'analysing') {
+ analyseBtn.classList.remove('hide', 'disabled');
+ } else if (status === 'start analysis' || status === 'stop analysis') {
+ analyseBtn.classList.remove('hide');
+ analyseBtn.classList.add('disabled');
+ }
+ if (status === 'prepared' || status === 'preparable' || status === 'preparing' || status === 'start analysis' || status === 'analysing' || status === 'stop analysis') {
+ var prepareBtn = document.getElementById('prepare');
+ prepareBtn.classList.add('hide');
+ }
+ }
+ }
+
+ {% if corpus.creator == current_user %}
+ var informationUpdater = new InformationUpdater({{ corpus.id }}, false);
+ {% else %}
+ var informationUpdater = new InformationUpdater({{ corpus.id }}, true);
+ socket.emit('subscribe_foreign_user_ressources', {{ corpus.user_id }});
+ {% endif %}
+</script>
{% endfor %}
{% endblock %}
diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2
index 6536e32e5748e435f47fa0ce857c49432477231b..bdc9599e4b79b26de2bfee2f9221170e550eee6e 100644
--- a/app/templates/jobs/job.html.j2
+++ b/app/templates/jobs/job.html.j2
@@ -1,114 +1,6 @@
{% extends "limited_width.html.j2" %}
{% block page_content %}
-<script>
- {% if job.creator == current_user %}
- var foreignJobFlag = false;
- {% else %}
- var foreignJobFlag = true;
- socket.emit('subscribe_foreign_user_ressources', {{ job.user_id }});
- {% endif %}
-
- class InformationUpdater {
- constructor(jobId) {
- this.jobId = jobId;
- if (foreignJobFlag) {
- foreignJobsSubscribers.push(this);
- } else {
- jobsSubscribers.push(this);
- }
- }
-
- _init() {
- if (foreignJobFlag) {
- this.job = foreignJobs[this.jobId];
- } else {
- this.job = jobs[this.jobId];
- }
-
- // End date
- this.setEndDate(this.job.end_date);
- // Status
- this.setStatus(this.job.status);
- // End date
- if (this.job.end_date) {this.setEndDate(this.job.end_date);}
- // Input results
- for (let input of this.job.inputs) {
- for (let result of input.results) {
- this.setResult(result);
- }
- }
- }
-
- _update(patch) {
- var pathArray;
-
- for (let operation of patch) {
- /* "/jobId/valueName" -> ["jobId", "valueName"] */
- pathArray = operation.path.split("/").slice(1);
- if (pathArray[0] != this.jobId) {continue;}
- switch(operation.op) {
- case "add":
- if (pathArray[1] === "inputs" && pathArray[3] === "results") {
- this.setResult(operation.value);
- }
- break;
- case "delete":
- location.reload();
- break;
- case "replace":
- if (pathArray[1] === "end_date") {
- this.setEndDate(operation.value);
- } else if (pathArray[1] === "status") {
- this.setStatus(operation.value);
- }
- break;
- default:
- break;
- }
- }
- }
-
- setEndDate(timestamp) {
- var end_date;
- if (timestamp === null) {
- end_date = "N.a.";
- } else {
- end_date = new Date(timestamp * 1000).toLocaleString("en-US");
- }
- document.getElementById("end-date").value = end_date;
- M.updateTextFields();
- }
-
- setResult(result) {
- var resultsElement, resultDownloadButtonElement,
- resultDownloadButtonIconElement;
- resultsElement = document.getElementById(`input-${result.job_input_id}-results`);
- resultDownloadButtonElement = document.createElement("a");
- resultDownloadButtonElement.classList.add("waves-effect", "waves-light", "btn-small");
- resultDownloadButtonElement.href = `/jobs/${this.jobId}/results/${result.id}/download`;
- resultDownloadButtonElement.innerText = result.filename.split(".").reverse()[0];
- resultDownloadButtonElement.setAttribute("download", "");
- resultDownloadButtonIconElement = document.createElement("i");
- resultDownloadButtonIconElement.classList.add("material-icons", "left");
- resultDownloadButtonIconElement.innerText = "file_download";
- resultDownloadButtonElement.prepend(resultDownloadButtonIconElement);
- resultsElement.append(resultDownloadButtonElement);
- resultsElement.append(" ");
- }
-
- setStatus(status) {
- var statusElement;
- statusElement = document.getElementById("status");
- statusElement.classList.remove(...Object.values(JobList.STATUS_COLORS));
- statusElement.classList.add(JobList.STATUS_COLORS[status] || JobList.STATUS_COLORS['default']);
- statusElement.innerText = status;
- }
- }
-
- var informationUpdater = new InformationUpdater({{ job.id }});
-</script>
-
<div class="col s12 m4">
<h3 id="title">{{ job.title }}</h3>
<p id="description">{{ job.description }}</p>
@@ -210,6 +102,7 @@
</div>
</div>
+
<!-- Modals -->
<div id="delete-job-modal" class="modal">
<div class="modal-content">
@@ -221,4 +114,108 @@
<a class="modal-close waves-effect waves-green btn red" href="{{ url_for('jobs.delete_job', job_id=job.id) }}">Confirm<i class="material-icons right">send</i></a>
</div>
</div>
+
+
+<script>
+ class InformationUpdater {
+ constructor(jobId, foreignJobFlag) {
+ this.jobId = jobId;
+ this.foreignJobFlag = foreignJobFlag;
+ if (this.foreignJobFlag) {
+ foreignJobsSubscribers.push(this);
+ } else {
+ jobsSubscribers.push(this);
+ }
+ }
+
+ _init() {
+ var job = this.foreignJobFlag ? foreignJobs[this.jobId] : jobs[this.jobId];
+
+ // End date
+ this.setEndDate(job.end_date);
+ // Status
+ this.setStatus(job.status);
+ // End date
+ if (job.end_date) {this.setEndDate(job.end_date);}
+ // Input results
+ for (let input of job.inputs) {
+ for (let result of input.results) {
+ this.setResult(result);
+ }
+ }
+ }
+
+ _update(patch) {
+ var pathArray;
+
+ for (let operation of patch) {
+ /* "/jobId/valueName" -> ["jobId", "valueName"] */
+ pathArray = operation.path.split("/").slice(1);
+ if (pathArray[0] != this.jobId) {continue;}
+ switch(operation.op) {
+ case "add":
+ if (pathArray[1] === "inputs" && pathArray[3] === "results") {
+ this.setResult(operation.value);
+ }
+ break;
+ case "delete":
+ location.reload();
+ break;
+ case "replace":
+ if (pathArray[1] === "end_date") {
+ this.setEndDate(operation.value);
+ } else if (pathArray[1] === "status") {
+ this.setStatus(operation.value);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ setEndDate(timestamp) {
+ var end_date;
+ if (timestamp === null) {
+ end_date = "N.a.";
+ } else {
+ end_date = new Date(timestamp * 1000).toLocaleString("en-US");
+ }
+ document.getElementById("end-date").value = end_date;
+ M.updateTextFields();
+ }
+
+ setResult(result) {
+ var resultsElement, resultDownloadButtonElement,
+ resultDownloadButtonIconElement;
+ resultsElement = document.getElementById(`input-${result.job_input_id}-results`);
+ resultDownloadButtonElement = document.createElement("a");
+ resultDownloadButtonElement.classList.add("waves-effect", "waves-light", "btn-small");
+ resultDownloadButtonElement.href = `/jobs/${this.jobId}/results/${result.id}/download`;
+ resultDownloadButtonElement.innerText = result.filename.split(".").reverse()[0];
+ resultDownloadButtonElement.setAttribute("download", "");
+ resultDownloadButtonIconElement = document.createElement("i");
+ resultDownloadButtonIconElement.classList.add("material-icons", "left");
+ resultDownloadButtonIconElement.innerText = "file_download";
+ resultDownloadButtonElement.prepend(resultDownloadButtonIconElement);
+ resultsElement.append(resultDownloadButtonElement);
+ resultsElement.append(" ");
+ }
+
+ setStatus(status) {
+ var statusElement;
+ statusElement = document.getElementById("status");
+ statusElement.classList.remove(...Object.values(JobList.STATUS_COLORS));
+ statusElement.classList.add(JobList.STATUS_COLORS[status] || JobList.STATUS_COLORS['default']);
+ statusElement.innerText = status;
+ }
+ }
+
+ {% if job.creator == current_user %}
+ var informationUpdater = new InformationUpdater({{ job.id }}, false);
+ {% else %}
+ var informationUpdater = new InformationUpdater({{ job.id }}, true);
+ socket.emit('subscribe_foreign_user_ressources', {{ job.user_id }});
+ {% endif %}
+</script>
{% endblock %}