From 84578c0d768c50204a4246bf593ef0f2f7625888 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Mon, 4 Nov 2019 16:58:15 +0100
Subject: [PATCH] UI enhancements

---
 app/templates/corpora/corpus.html.j2 | 11 ++++------
 app/templates/jobs/job.html.j2       | 32 +++++++++++++---------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index 59eabf75..bf04d74d 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -19,13 +19,10 @@
           </div>
         </div>
       </div>
-      <span class="card-title">Actions</span>
-      <a href="{{ url_for('corpora.corpus_analysis', corpus_id=corpus.id) }}" class="waves-effect waves-light btn">
-        <i class="material-icons left">help</i>Analyse
-      </a>
-      <a data-target="delete-corpus-modal" class="waves-effect waves-light btn red modal-trigger right">
-        <i class="material-icons left">delete</i>Delete Corpus
-      </a>
+    </div>
+    <div class="card-action right-align">
+      <a href="{{ url_for('corpora.corpus_analysis', corpus_id=corpus.id) }}" class="waves-effect waves-light btn"><i class="material-icons left">help</i>Analyse</a>
+      <a data-target="delete-corpus-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete Corpus</a>
     </div>
   </div>
 </div>
diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2
index 512dc734..896d2d25 100644
--- a/app/templates/jobs/job.html.j2
+++ b/app/templates/jobs/job.html.j2
@@ -118,23 +118,6 @@
   <h3 id="title">{{ job.title }}</h3>
   <p id="description">{{ job.description }}</p>
   <a class="waves-effect waves-light btn" id="status"></a>
-  <h2>Actions:</h2>
-  <!-- Confirm deletion of job with modal dialogue
-  Modal Trigger-->
-  <a href="#modal-confirm-delete" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete Job</a>
-  <a href="#" class="waves-effect waves-light btn"><i class="material-icons left">settings</i>Export Parameters</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 job {{job.title}}?
-        All iput and output files will be permanently deleted.</p>
-    </div>
-    <div class="modal-footer">
-      <a href="{{ url_for('jobs.delete_job', job_id=job.id) }}" class="modal-close waves-effect waves-green btn red"><i class="material-icons left">delete</i>Delete Job</a>
-      <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
-    </div>
-  </div>
 </div>
 
 
@@ -195,6 +178,10 @@
         </div>
       </div>
     </div>
+    <div class="card-action right-align">
+      <a href="#" class="waves-effect waves-light btn"><i class="material-icons left">settings</i>Export Parameters</a>
+      <a data-target="delete-job-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete Job</a>
+    </div>
   </div>
 </div>
 
@@ -228,4 +215,15 @@
   </div>
 </div>
 
+<!-- Modals -->
+<div id="delete-job-modal" class="modal">
+  <div class="modal-content">
+    <h4>Confirm deletion</h4>
+      <p>Do you really want to delete the job {{job.title}}? All associated files will be permanently deleted.</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
+    <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>
 {% endblock %}