From de699e6ccfe5b323903cf93340b50cc3e2ad0ace Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 12 Feb 2020 15:48:51 +0100
Subject: [PATCH] Update Jobpage
---
app/jobs/views.py | 3 ++-
app/templates/main/dashboard.html.j2 | 8 ++++----
app/templates/nopaque.html.j2 | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/jobs/views.py b/app/jobs/views.py
index a5bbe723..d84e77ea 100644
--- a/app/jobs/views.py
+++ b/app/jobs/views.py
@@ -14,7 +14,8 @@ def job(job_id):
job = Job.query.get_or_404(job_id)
if not (job.creator == current_user or current_user.is_administrator()):
abort(403)
- return render_template('jobs/job.html.j2', job=job, title='Job')
+ return render_template('jobs/job.html.j2', job=job,
+ title='<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service))
@jobs.route('/<int:job_id>/delete')
diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2
index 1ca22117..c910bbcf 100644
--- a/app/templates/main/dashboard.html.j2
+++ b/app/templates/main/dashboard.html.j2
@@ -4,11 +4,11 @@
{% set roadmap = False %}
{% block page_content %}
-<div class="col s12">
+<div class="col s12" id="corpora">
<h3>My Corpora</h3>
<p>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>
<div class="card">
- <div class="card-content" id="corpora">
+ <div class="card-content">
<div class="input-field">
<i class="material-icons prefix">search</i>
<input id="search-corpus" class="search" type="search"></input>
@@ -36,11 +36,11 @@
</div>
</div>
-<div class="col s12">
+<div class="col s12" id="jobs">
<h3>My Jobs</h3>
<p>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>
<div class="card">
- <div class="card-content" id="jobs">
+ <div class="card-content">
<div class="input-field">
<i class="material-icons prefix">search</i>
<input id="search-job" class="search" type="search"></input>
diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index e4258ba3..880e1738 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -60,8 +60,8 @@
<li><a href="{{ url_for('main.index') }}"><i class="material-icons">opacity</i>nopaque</a></li>
<li><a href="#"><i class="material-icons">linear_scale</i>Workflow</a></li>
<li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
- <li><a href="{{ url_for('main.dashboard', _anchor='my_anchor') }}" style="padding-left: 47px;"><i class="material-icons">book</i>Corpora</a></li>
- <li><a href="{{ url_for('main.dashboard', _anchor='my_anchor') }}" style="padding-left: 47px;"><i class="material-icons">work</i>Jobs</a></li>
+ <li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="material-icons">book</i>Corpora</a></li>
+ <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="material-icons">work</i>Jobs</a></li>
<li><div class="divider"></div></li>
<li><a class="subheader">Processes and Services</a></li>
<li><a href="{{ url_for('services.service', service='corpus_analysis') }}"><i class="material-icons">search</i>Corpus Analysis</a></li>
--
GitLab