Rework service package

web/app/templates/services/_nav_content.html.j2

@@ -0,0 +1,10 @@
+<ul class="tabs tabs-transparent">
+  <li class="tab disabled"><i class="material-icons left">explore</i>Roadmap</li>
+  <li class="tab"><a{%if request.path == url_for('services.service', service='file-setup') %} class="active"{% endif %} href="{{ url_for('services.service', service='file-setup') }}" target="_self">File setup</a></li>
+  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+  <li class="tab"><a{%if request.path == url_for('services.service', service='ocr') %} class="active"{% endif %} href="{{ url_for('services.service', service='ocr') }}" target="_self">OCR</a></li>
+  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+  <li class="tab"><a{%if request.path == url_for('services.service', service='nlp') %} class="active"{% endif %} href="{{ url_for('services.service', service='nlp') }}" target="_self">NLP</a></li>
+  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+  <li class="tab"><a{%if request.path == url_for('services.service', service='corpus_analysis') %} class="active"{% endif %} href="{{ url_for('services.service', service='corpus_analysis') }}" target="_self">Corpus Analysis</a></li>
+</ul>

web/app/templates/services/corpus_analysis.html.j2

@@ -1,9 +1,21 @@
 {% extends "nopaque.html.j2" %}
+{% from '_constants.html.j2' import COLORS %}
 
-{% set main_class = 'corpus-analysis-color lighten' %}
+{% set scheme_color = COLORS.corpus_analysis %}
+
+{% block nav_content %}
+{% include 'services/_nav_content.html.j2' %}
+{% endblock nav_content %}
+
+{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
-{{ Macros.insert_color_scheme(corpus_analysis_color_darken) }}
+<div class="container">
+  <div class="row">
+    <div class="col s12">
+      <p class="hide-on-small-only">&nbsp;</p>
+      <h1 id="title">{{ title }}</h1>
+    </div>
 
     <div class="col s12 m3 push-m9">
       <div class="center-align">
@@ -14,12 +26,11 @@
     </div>
 
     <div class="col s12 m9 pull-m3">
-  <p>{{ rgb }}</p>
       <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">
-  <h3>My Corpora</h3>
+      <h2>My Corpora</h2>
       <div class="card">
         <div class="card-content" id="corpora">
           <div class="input-field">
@@ -51,7 +62,7 @@
     </div>
 
     <div class="col s12">
-  <h3>My query results</h3>
+      <h2>My query results</h2>
       <div class="card">
         <div class="card-content" id="query-results">
           <div class="input-field">
@@ -90,10 +101,15 @@
         </div>
       </div>
     </div>
+  </div>
+</div>
+{% endblock %}
 
+{% block scripts %}
+{{ super() }}
 <script type="module">
   import {RessourceList} from '../../static/js/nopaque.lists.js';
   let corpusList = new RessourceList("corpora", nopaque.corporaSubscribers, "Corpus");
   let queryResultList = new RessourceList("query-results", nopaque.queryResultsSubscribers, "QueryResult");
 </script>
-{% endblock %}
+{% endblock scripts %}

web/app/templates/services/file-setup.html.j2

@@ -1,9 +1,22 @@
 {% extends "nopaque.html.j2" %}
+{% import 'materialize/wtf.html.j2' as wtf %}
+{% from '_constants.html.j2' import COLORS %}
 
-{% set main_class = 'file-setup-color lighten' %}
+{% set scheme_color = COLORS.file_setup_darken %}
+
+{% block nav_content %}
+{% include 'services/_nav_content.html.j2' %}
+{% endblock nav_content %}
+
+{% block main_attribs %} class="file-setup-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
-{{ Macros.insert_color_scheme(file_setup_color_darken) }}
+<div class="container">
+  <div class="row">
+    <div class="col s12">
+      <p class="hide-on-small-only">&nbsp;</p>
+      <h1 id="title">{{ title }}</h1>
+    </div>
 
     <div class="col s12 m3 push-m9">
       <div class="center-align">
@@ -16,7 +29,7 @@
     </div>
 
     <div class="col s12 m9 pull-m3">
-  <div class="card" style="border-top: 10px solid {{ file_setup_color_darken }};">
+      <div class="card" style="border-top: 10px solid {{ COLORS.file_setup_darken }};">
         <div class="card-content">
           <div class="row">
             <div class="col s12">
@@ -38,25 +51,27 @@
             {{ add_job_form.hidden_tag() }}
             <div class="row">
               <div class="col s12 l4">
-            {{ M.render_field(add_job_form.title, data_length='32', material_icon='title') }}
+                {{ wtf.render_field(add_job_form.title, data_length='32', material_icon='title') }}
               </div>
               <div class="col s12 l8">
-            {{ M.render_field(add_job_form.description, data_length='255', material_icon='description') }}
+                {{ wtf.render_field(add_job_form.description, data_length='255', material_icon='description') }}
               </div>
               <div class="col s12">
-            {{ M.render_field(add_job_form.files, accept='image/jpeg, image/png, image/tiff', placeholder='Choose your .jpeg, .png or .tiff files') }}
+                {{ wtf.render_field(add_job_form.files, accept='image/jpeg, image/png, image/tiff', placeholder='Choose your .jpeg, .png or .tiff files') }}
               </div>
               <div class="col s12 hide">
-            {{ M.render_field(add_job_form.version, material_icon='apps') }}
+                {{ wtf.render_field(add_job_form.version, material_icon='apps') }}
               </div>
             </div>
           </div>
           <div class="card-action right-align">
-        {{ M.render_field(add_job_form.submit, material_icon='send') }}
+            {{ wtf.render_field(add_job_form.submit, material_icon='send') }}
           </div>
         </form>
       </div>
     </div>
+  </div>
+</div>
 
 <div id="progress-modal" class="modal">
   <div class="modal-content">

web/app/templates/services/nlp.html.j2

@@ -1,9 +1,22 @@
 {% extends "nopaque.html.j2" %}
+{% import 'materialize/wtf.html.j2' as wtf %}
+{% from '_constants.html.j2' import COLORS %}
 
-{% set main_class = 'nlp-color lighten' %}
+{% set scheme_color = COLORS.nlp_darken %}
+
+{% block nav_content %}
+{% include 'services/_nav_content.html.j2' %}
+{% endblock nav_content %}
+
+{% block main_attribs %} class="nlp-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
-{{ Macros.insert_color_scheme(nlp_color_darken) }}
+<div class="container">
+  <div class="row">
+    <div class="col s12">
+      <p class="hide-on-small-only">&nbsp;</p>
+      <h1 id="title">{{ title }}</h1>
+    </div>
 
     <div class="col s12 m3 push-m9">
       <div class="center-align">
@@ -16,7 +29,7 @@
     </div>
 
     <div class="col s12 m9 pull-m3">
-  <div class="card" style="border-top: 10px solid {{ nlp_color_darken }};">
+      <div class="card" style="border-top: 10px solid {{ COLORS.nlp_darken }};">
         <div class="card-content">
           <div class="row">
             <div class="col s12 m6">
@@ -56,19 +69,19 @@
             {{ add_job_form.hidden_tag() }}
             <div class="row">
               <div class="col s12 l4">
-            {{ M.render_field(add_job_form.title, data_length='32', material_icon='title') }}
+                {{ wtf.render_field(add_job_form.title, data_length='32', material_icon='title') }}
               </div>
               <div class="col s12 l8">
-            {{ M.render_field(add_job_form.description, data_length='255', material_icon='description') }}
+                {{ wtf.render_field(add_job_form.description, data_length='255', material_icon='description') }}
               </div>
               <div class="col s12 l5">
-            {{ M.render_field(add_job_form.files, accept='text/plain', placeholder='Choose your .txt files') }}
+                {{ wtf.render_field(add_job_form.files, accept='text/plain', placeholder='Choose your .txt files') }}
               </div>
               <div class="col s12 l4">
-            {{ M.render_field(add_job_form.language, material_icon='language') }}
+                {{ wtf.render_field(add_job_form.language, material_icon='language') }}
               </div>
               <div class="col s12 l3">
-            {{ M.render_field(add_job_form.version, material_icon='apps') }}
+                {{ wtf.render_field(add_job_form.version, material_icon='apps') }}
               </div>
               <div class="col s12">
                 <span class="card-title">Preprocessing</span>
@@ -94,11 +107,13 @@
             </div>
           </div>
           <div class="card-action right-align">
-        {{ M.render_field(add_job_form.submit, material_icon='send') }}
+            {{ wtf.render_field(add_job_form.submit, material_icon='send') }}
           </div>
         </form>
       </div>
     </div>
+  </div>
+</div>
 
 <div id="progress-modal" class="modal">
   <div class="modal-content">

web/app/templates/services/ocr.html.j2

@@ -1,9 +1,22 @@
 {% extends "nopaque.html.j2" %}
+{% import 'materialize/wtf.html.j2' as wtf %}
+{% from '_constants.html.j2' import COLORS %}
 
-{% set main_class = 'ocr-color lighten' %}
+{% set scheme_color = COLORS.ocr_darken %}
+
+{% block nav_content %}
+{% include 'services/_nav_content.html.j2' %}
+{% endblock nav_content %}
+
+{% block main_attribs %} class="ocr-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
-{{ Macros.insert_color_scheme(ocr_color_darken) }}
+<div class="container">
+  <div class="row">
+    <div class="col s12">
+      <p class="hide-on-small-only">&nbsp;</p>
+      <h1 id="title">{{ title }}</h1>
+    </div>
 
     <div class="col s12 m3 push-m9">
       <div class="center-align">
@@ -16,7 +29,7 @@
     </div>
 
     <div class="col s12 m9 pull-m3">
-  <div class="card" style="border-top: 10px solid {{ ocr_color_darken }};">
+      <div class="card" style="border-top: 10px solid {{ COLORS.ocr_darken }};">
         <div class="card-content">
           <div class="row">
             <div class="col s12">
@@ -38,19 +51,19 @@
             {{ add_job_form.hidden_tag() }}
             <div class="row">
               <div class="col s12 l4">
-            {{ M.render_field(add_job_form.title, data_length='32', material_icon='title') }}
+                {{ wtf.render_field(add_job_form.title, data_length='32', material_icon='title') }}
               </div>
               <div class="col s12 l8">
-            {{ M.render_field(add_job_form.description, data_length='255', material_icon='description') }}
+                {{ wtf.render_field(add_job_form.description, data_length='255', material_icon='description') }}
               </div>
               <div class="col s12 l5">
-            {{ M.render_field(add_job_form.files, accept='application/pdf', color=ocr_color_darken, placeholder='Choose your .pdf files') }}
+                {{ wtf.render_field(add_job_form.files, accept='application/pdf', color=ocr_color_darken, placeholder='Choose your .pdf files') }}
               </div>
               <div class="col s12 l4">
-            {{ M.render_field(add_job_form.language, material_icon='language') }}
+                {{ wtf.render_field(add_job_form.language, material_icon='language') }}
               </div>
               <div class="col s12 l3">
-            {{ M.render_field(add_job_form.version, material_icon='apps') }}
+                {{ wtf.render_field(add_job_form.version, material_icon='apps') }}
               </div>
               <div class="col s12">
                 <span class="card-title">Preprocessing</span>
@@ -121,11 +134,13 @@
             </div>
           </div>
           <div class="card-action right-align">
-        {{ M.render_field(add_job_form.submit, color=ocr_color_darken, material_icon='send') }}
+            {{ wtf.render_field(add_job_form.submit, color=ocr_color_darken, material_icon='send') }}
           </div>
         </form>
       </div>
     </div>
+  </div>
+</div>
 
 <div id="progress-modal" class="modal">
   <div class="modal-content">

web/app/templates/services/roadmap.html.j2

@@ -1,20 +0,0 @@
-<ul class="table-of-contents" id="roadmap">
-  <li><b>Roadmap</b></li>
-  <li>
-    <a href="{{ url_for('services.service', service='file-setup') }}">File setup</a>
-  </li>
-  <li>
-    <a href="{{ url_for('services.service', service='ocr') }}">Optical Character Recognition</a>
-  </li>
-  <li>
-    <a href="{{ url_for('services.service', service='nlp') }}">Natural Language Processing</a>
-  </li>
-  <li>
-    <a href="{{ url_for('services.service', service='corpus_analysis') }}">Corpus analysis</a>
-  </li>
-</ul>
-<script>
-for (let entry of document.querySelectorAll(`#roadmap a`)) {
-  if (entry.href === window.location.href) {entry.classList.add("active");}
-}
-</script>

web/app/templates/utils/macros.html.j2

@@ -1,37 +0,0 @@
-{%- macro insert_page_content() -%}
-<noscript>
-  <div class="container">
-    <div class="row">
-      <div class="col s12">
-        <div class="card red darken-1">
-          <div class="card-content white-text">
-            <span class="card-title">JavaScript is disabled</span>
-            <p>You have JavaScript disabled. Nopaque uses javascript and sockets to send data in realtime to you. For example showing you the status of your jobs and your corpora. Please activate JavaScript to make full use of nopaque.</p>
-            <p>Some services are still useable without Javascript.</p>
-          </div>
-          <div class="card-action">
-            <a href="#">What services can I still use?</a>
-            <a href="#">What services and functions are not available?</a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</noscript>
-{% block page_content %}{% endblock %}
-{%- endmacro -%}
-
-{%- macro insert_color_scheme(hex_color) -%}
-<style>
-  main button, main .btn, main .btn-floating {background-color: {{ hex_color }};}
-  main .pagination li.active {background-color: {{ hex_color }};}
-  main .table-of-contents a.active {border-color: {{ hex_color }};}
-  main .tabs .tab a {color: inherit;}
-  main .tabs .tab a:hover {color: {{ hex_color }};}
-  main .tabs .tab a.active, .tabs .tab a:focus.active {
-    color: {{ hex_color }};
-    background-color: {{ hex_color }}28;
-  }
-  main .tabs .indicator {background-color: {{ hex_color }};}
-</style>
-{%- endmacro -%}