From 467080c7f8b6697b00faaa270d87b2785b3b4b55 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Laptop.fritz.box>
Date: Sat, 7 Mar 2020 20:20:58 +0100
Subject: [PATCH] Update UI

---
 app/templates/nopaque.html.j2                  |  7 ++++---
 app/templates/profile/settings.html.j2         | 15 +++++++++++++++
 app/templates/services/corpus_analysis.html.j2 |  8 ++++----
 app/templates/services/nlp.html.j2             | 10 +++++-----
 app/templates/services/ocr.html.j2             | 10 +++++-----
 app/templates/services/setup_files.html.j2     | 14 +++++---------
 6 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index dbdc4ce5..d0f20afd 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -151,7 +151,7 @@
     {% endif %}
     </main>
 
-    <!-- <footer class="page-footer">
+    <footer class="page-footer">
       <div class="container">
         <div class="row">
           <div class="col s6 m3">
@@ -179,9 +179,9 @@
           <a class="grey-text text-lighten-4 right" href="#!">Legal notice</a>
         </div>
       </div>
-    </footer> -->
-
+    </footer>
 
+    <!--
     <footer class="page-footer">
       <div class="container">
         <div class="row">
@@ -215,6 +215,7 @@
         </div>
       </div>
     </footer>
+    -->
 
     <script src="{{ url_for('static', filename='js/Materialize/materialize.min.js') }}"></script>
     <script>
diff --git a/app/templates/profile/settings.html.j2 b/app/templates/profile/settings.html.j2
index 1289e5b0..08b9a016 100644
--- a/app/templates/profile/settings.html.j2
+++ b/app/templates/profile/settings.html.j2
@@ -23,6 +23,21 @@
               </label>
             </div>
           </div>
+          <div class="col s12"><p>&nbsp;</p></div>
+          <div class="col s12 divider"></div>
+          <div class="col s12"><p>&nbsp;</p></div>
+          <div class="col s9">
+            <p><i class="material-icons left">notifications</i>Email notifications</p>
+            <p class="light">Receive emails when a job completes.</p>
+          </div>
+          <div class="col s3 right-align">
+            <div class="switch">
+              <label>
+                <input disabled type="checkbox">
+                <span class="lever"></span>
+              </label>
+            </div>
+          </div>
           <!--
           Seperate each setting with the following two elements
           <div class="col s12 divider"></div>
diff --git a/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2
index 652078d3..4512ef6f 100644
--- a/app/templates/services/corpus_analysis.html.j2
+++ b/app/templates/services/corpus_analysis.html.j2
@@ -3,12 +3,12 @@
 {% set headline = '<i class="material-icons left service" data-service="corpus_analysis" style="font-size: inherit;"></i>Corpus analysis' %}
 
 {% block page_content %}
-<div class="col s12 m9 l9">
-  <p>Nopaque lets you create and upload as many text corpora as you want. It makes use of CQP Query Language, which allows for complex search requests with the aid of metadata and NLP tags. The results can either be displayed as text or abstract visualizations.</p>
+<div class="col s12 m3 push-m9">
+  {% include 'services/roadmap.html.j2' %}
 </div>
 
-<div class="col m3 l3">
-  {% include 'services/roadmap.html.j2' %}
+<div class="col s12 m9 pull-m3">
+  <p>Nopaque lets you create and upload as many text corpora as you want. It makes use of CQP Query Language, which allows for complex search requests with the aid of metadata and NLP tags. The results can either be displayed as text or abstract visualizations.</p>
 </div>
 
 <div class="col s12">
diff --git a/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2
index ee2073c1..22df6cfb 100644
--- a/app/templates/services/nlp.html.j2
+++ b/app/templates/services/nlp.html.j2
@@ -3,7 +3,11 @@
 {% set headline = '<i class="material-icons left service" data-service="nlp" style="font-size: inherit;"></i>Natural Language Processing' %}
 
 {% block page_content %}
-<div class="col s12 m9 l10">
+<div class="col s12 m3 push-m9">
+  {% include 'services/roadmap.html.j2' %}
+</div>
+
+<div class="col s12 m9 pull-m3">
   <div class="card">
     <div class="card-content">
       <div class="row">
@@ -36,10 +40,6 @@
   </div>
 </div>
 
-<div class="col m3 l2">
-  {% include 'services/roadmap.html.j2' %}
-</div>
-
 <div class="col s12">
   <h3>Submit a job</h3>
   <div class="card">
diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2
index f84b81e0..76cfac6b 100644
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@@ -3,7 +3,11 @@
 {% set headline = '<i class="material-icons left service" data-service="ocr" style="font-size: inherit;"></i>Optical Character Recognition' %}
 
 {% block page_content %}
-<div class="col s12 m9 l10">
+<div class="col s12 m3 push-m9">
+  {% include 'services/roadmap.html.j2' %}
+</div>
+
+<div class="col s12 m9 pull-m3">
   <div class="card">
     <div class="card-content">
       <div class="row">
@@ -18,10 +22,6 @@
   </div>
 </div>
 
-<div class="col s12 m3 l2">
-  {% include 'services/roadmap.html.j2' %}
-</div>
-
 <div class="col s12">
   <h3>Submit a job</h3>
   <div class="card">
diff --git a/app/templates/services/setup_files.html.j2 b/app/templates/services/setup_files.html.j2
index 31651ccd..49948180 100644
--- a/app/templates/services/setup_files.html.j2
+++ b/app/templates/services/setup_files.html.j2
@@ -3,7 +3,11 @@
 {% set headline = '<i class="material-icons left service" data-service="setup_files" style="font-size: inherit;"></i>File setup' %}
 
 {% block page_content %}
-<div class="col s12 m9 l10">
+<div class="col s12 m3 push-m9">
+  {% include 'services/roadmap.html.j2' %}
+</div>
+
+<div class="col s12 m9 pull-m3">
   <div class="card">
     <div class="card-content">
       <div class="row">
@@ -18,10 +22,6 @@
   </div>
 </div>
 
-<div class="col m3 l2">
-  {% include 'services/roadmap.html.j2' %}
-</div>
-
 <div class="col s12">
   <h3>Submit a job</h3>
   <div class="card">
@@ -82,10 +82,6 @@
   </div>
 </div>
 
-<div class="col hide-on-small-only m3 l2">
-  {% include 'services/roadmap.html.j2' %}
-</div>
-
 <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>