Simplify template

app/templates/jobs/job.html.j2

@@ -2,7 +2,8 @@
 
 {% set full_width = False %}
 {% set roadmap = False %}
-{% set title_override = '<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service) %}
+<!-- Override title -->
+{% set title = '<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service) %}
 
 {% block page_content %}
 <div class="col s12 m4">

app/templates/main/index.html.j2

@@ -3,13 +3,7 @@
 {% set parallax = True %}
 
 {% block page_content %}
-<style media="screen">
-.grey.lighten-5 {
-  background-color: transparent !important;
-}
-</style>
 {% if current_user.is_anonymous %}
-
 <div class="parallax-container">
   <div class="parallax">
     <img src="{{ url_for('static', filename='images/bible_text.jpg') }}" alt="">

app/templates/nopaque.html.j2

@@ -88,56 +88,29 @@
       </ul>
     </header>
 
+    {%- macro insert_page_content() -%}
+    {% block page_content %}{% endblock %}
+    {%- endmacro -%}
+
+    {% if parallax %}
+      <main>
+        {{ insert_page_content() }}
+      </main>
+    {% else %}
       <main class="grey lighten-5">
-      {% if not parallax %}
         {% if not full_width %}
         <div class="container">
         {% endif %}
         <div class="row">
           <div class="col s12">
-            <h2>
+            <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
-              {% if title_override %}
-              {{ title_override }}
-              {% elif title %}
-              {{ title }}
-              {% else %}
-              Unnamed page
-              {% endif %}
-            </h2>
           </div>
-          {% if roadmap %}
+          {{ insert_page_content() }}
-          <div class="col s12 m9 l10">
-          {% else %}
-          <div class="col s12">
-          {% endif %}
-            <div class="row">
-              {% endif %}
-              {% block page_content %}
-              {% endblock %}
-              {% if not parallax %}
-            </div>
-          </div>
-          {% if roadmap %}
-          <div class="col hide-on-small-only m3 l2">
-            <ul class="table-of-contents" id="roadmap">
-              <li><b>Roadmap</b></li>
-              <li><a href="{{ url_for('services.service', service='setup_files') }}">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('corpora.add_corpus') }}">Create a corpus</a></li>
-              <li><a href="{{ url_for('services.service', service='corpus_analysis') }}">Corpus analysis</a></li>
-            </ul>
-          </div>
-          <script>
-          for (let entry of document.querySelectorAll(`#roadmap a`)) {
-            if (entry.href === window.location.href) {entry.classList.add("active");}
-          }
-          </script>
-          {% endif %}
         </div>
         {% if not full_width %}
         </div>
         {% endif %}
+      </div>
     {% endif %}
     </main>
 

app/templates/services/corpus_analysis.html.j2

@@ -4,6 +4,7 @@
 {% set roadmap = True %}
 
 {% block page_content %}
+<div class="col s12 m9 l10">
   <div class="col s12">
     <div class="card">
       <div class="card-content">
@@ -62,6 +63,11 @@
       </div>
     </div>
   </div>
+</div>
+
+<div class="col hide-on-small-only m3 l2">
+  {% include 'services/roadmap.html.j2' %}
+</div>
 
 <script>
   var corpusList = new RessourceList("corpora", nopaque.corporaSubscribers,

app/templates/services/nlp.html.j2

@@ -4,6 +4,7 @@
 {% set roadmap = True %}
 
 {% block page_content %}
+<div class="col s12 m9 l10">
   <div class="col s12">
     <div class="card">
       <div class="card-content">
@@ -115,6 +116,11 @@
       </form>
     </div>
   </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">

app/templates/services/ocr.html.j2

@@ -4,6 +4,7 @@
 {% set roadmap = True %}
 
 {% block page_content %}
+<div class="col s12 m9 l10">
   <div class="col s12">
     <div class="card">
       <div class="card-content">
@@ -190,6 +191,11 @@
       </form>
     </div>
   </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">

app/templates/services/roadmap.html.j2

@@ -0,0 +1,20 @@
+<ul class="table-of-contents" id="roadmap">
+  <li><b>Roadmap</b></li>
+  <li>
+    <a href="{{ url_for('services.service', service='setup_files') }}">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>

app/templates/services/setup_files.html.j2

@@ -4,6 +4,7 @@
 {% set roadmap = True %}
 
 {% block page_content %}
+<div class="col s12 m9 l10">
   <div class="col s12">
     <div class="card">
       <div class="card-content">
@@ -81,6 +82,11 @@
       </form>
     </div>
   </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">