From f21f3e007d66e80db2d2df8c33b277eb0a15112f Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Notebook.fritz.box>
Date: Mon, 2 Nov 2020 10:47:38 +0100
Subject: [PATCH] Add breadcrumbs to corpora package

---
 .../templates/corpora/_breadcrumbs.html.j2    |  2 +
 web/app/templates/corpora/add_corpus.html.j2  |  4 ++
 .../templates/corpora/analyse_corpus.html.j2  |  4 ++
 web/app/templates/corpora/corpus.html.j2      |  4 ++
 .../templates/corpora/import_corpus.html.j2   | 67 ++++++++++++-------
 web/app/templates/main/dashboard.html.j2      |  2 +-
 6 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/web/app/templates/corpora/_breadcrumbs.html.j2 b/web/app/templates/corpora/_breadcrumbs.html.j2
index 053f4061..1487efb1 100644
--- a/web/app/templates/corpora/_breadcrumbs.html.j2
+++ b/web/app/templates/corpora/_breadcrumbs.html.j2
@@ -5,6 +5,8 @@
   <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
   {% if request.path == url_for('.add_corpus') %}
   <li class="tab"><a class="active" href="{{ url_for('.add_corpus') }}" target="_self">{{ title }}</a></li>
+  {% elif request.path == url_for('.import_corpus') %}
+  <li class="tab"><a class="active" href="{{ url_for('.import_corpus') }}" target="_self">{{ title }}</a></li>
   {% elif request.path == url_for('.corpus', corpus_id=corpus.id) %}
   <li class="tab"><a class="active" href="{{ url_for('.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
   {% elif request.path == url_for('.analyse_corpus', corpus_id=corpus.id) %}
diff --git a/web/app/templates/corpora/add_corpus.html.j2 b/web/app/templates/corpora/add_corpus.html.j2
index a1970f0b..219b098f 100644
--- a/web/app/templates/corpora/add_corpus.html.j2
+++ b/web/app/templates/corpora/add_corpus.html.j2
@@ -5,6 +5,10 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
+{% block nav_content %}
+{% include 'corpora/_breadcrumbs.html.j2' %}
+{% endblock nav_content %}
+
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/web/app/templates/corpora/analyse_corpus.html.j2
index f4177a3f..e9ca926f 100644
--- a/web/app/templates/corpora/analyse_corpus.html.j2
+++ b/web/app/templates/corpora/analyse_corpus.html.j2
@@ -5,6 +5,10 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
+{% block nav_content %}
+{% include 'corpora/_breadcrumbs.html.j2' %}
+{% endblock nav_content %}
+
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
diff --git a/web/app/templates/corpora/corpus.html.j2 b/web/app/templates/corpora/corpus.html.j2
index a316a8d4..c60b9e01 100644
--- a/web/app/templates/corpora/corpus.html.j2
+++ b/web/app/templates/corpora/corpus.html.j2
@@ -4,6 +4,10 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
+{% block nav_content %}
+{% include 'corpora/_breadcrumbs.html.j2' %}
+{% endblock nav_content %}
+
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
diff --git a/web/app/templates/corpora/import_corpus.html.j2 b/web/app/templates/corpora/import_corpus.html.j2
index dd64265e..0bc47d8e 100644
--- a/web/app/templates/corpora/import_corpus.html.j2
+++ b/web/app/templates/corpora/import_corpus.html.j2
@@ -1,34 +1,53 @@
 {% extends "nopaque.html.j2" %}
+{% from '_colors.html.j2' import colors %}
+{% import 'materialize/wtf.html.j2' as wtf %}
+
+{% set scheme_primary_color = colors.corpus_analysis_darken %}
+{% set scheme_secondary_color = colors.corpus_analysis %}
+
+{% block nav_content %}
+{% include 'corpora/_breadcrumbs.html.j2' %}
+{% endblock nav_content %}
+
+{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
-<div class="col s12 m4">
-  <p>Fill out the following form to import a corpus.</p>
-  <a class="waves-effect waves-light btn" href="{{ url_for('main.dashboard') }}"><i class="material-icons left">arrow_back</i>Back to dashboard</a>
-</div>
+<div class="container">
+  <div class="row">
+    <div class="col s12">
+      <h1 id="title">{{ title }}</h1>
+    </div>
 
-<div class="col s12 m8">
-  <form class="nopaque-submit-form" data-progress-modal="progress-modal">
-    <div class="card">
-      <div class="card-content">
-        {{ import_corpus_form.hidden_tag() }}
-        <div class="row">
-          <div class="col s12 m4">
-            {{ M.render_field(import_corpus_form.title, data_length='32', material_icon='title') }}
+    <div class="col s12 m4">
+      <p>Fill out the following form to import a corpus.</p>
+      <a class="waves-effect waves-light btn" href="{{ url_for('main.dashboard') }}"><i class="material-icons left">arrow_back</i>Back to dashboard</a>
+    </div>
+
+    <div class="col s12 m8">
+      <form class="nopaque-submit-form" data-progress-modal="progress-modal">
+        <div class="card">
+          <div class="card-content">
+            {{ import_corpus_form.hidden_tag() }}
+            <div class="row">
+              <div class="col s12 m4">
+                {{ wtf.render_field(import_corpus_form.title, data_length='32', material_icon='title') }}
+              </div>
+              <div class="col s12 m8">
+                {{ wtf.render_field(import_corpus_form.description, data_length='255', material_icon='description') }}
+              </div>
+            </div>
+            <div class="row">
+              <div class="col s12">
+                {{ wtf.render_field(import_corpus_form.file, accept='.zip', placeholder='Choose your exported .zip file') }}
+              </div>
+            </div>
           </div>
-          <div class="col s12 m8">
-            {{ M.render_field(import_corpus_form.description, data_length='255', material_icon='description') }}
+          <div class="card-action right-align">
+            {{ wtf.render_field(import_corpus_form.submit, material_icon='send') }}
           </div>
-        </div>
-        <div class="row">
-          <div class="col s12">
-            {{ M.render_field(import_corpus_form.file, accept='.zip', placeholder='Choose your exported .zip file') }}
-          </div>
-        </div>
+        </form>
       </div>
-      <div class="card-action right-align">
-        {{ M.render_field(import_corpus_form.submit, material_icon='send') }}
-      </div>
-    </form>
+    </div>
   </div>
 </div>
 
diff --git a/web/app/templates/main/dashboard.html.j2 b/web/app/templates/main/dashboard.html.j2
index 3d3018a8..4336178a 100644
--- a/web/app/templates/main/dashboard.html.j2
+++ b/web/app/templates/main/dashboard.html.j2
@@ -47,6 +47,7 @@
               <ul class="pagination paginationBottom"></ul>
             </div>
             <div class="card-action right-align">
+              <a class="waves-effect waves-light btn" href="{{ url_for('corpora.import_corpus') }}"><i class="material-icons right">import_export</i>Import Corpus</a>
               <a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_corpus') }}">New corpus<i class="material-icons right">add</i></a>
             </div>
           </div>
@@ -86,7 +87,6 @@
               <ul class="pagination paginationBottom"></ul>
             </div>
             <div class="card-action right-align">
-              <a class="waves-effect waves-light btn" href="{{ url_for('corpora.import_corpus') }}"><i class="material-icons right">import_export</i>Import Corpus</a>
               <a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_query_result') }}">Add query result<i class="material-icons right">file_upload</i></a>
             </div>
           </div>