diff --git a/web/app/templates/corpora/_breadcrumbs.html.j2 b/web/app/templates/corpora/_breadcrumbs.html.j2
index 053f4061863fe563211634d6cf0f488ae42defd3..1487efb1fdb4842cb21dc0c4ebd223d2fedc454f 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 a1970f0b1c73a13d5b34095af5d65d41de9fa275..219b098ff0e7ba61f995a49a8ad643a8063a7c38 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 f4177a3f2adedbe5a56f7134b27a74028c2adfda..e9ca926f117805e31f645e45275943ca81d2f5db 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 a316a8d4c34a43f2a1637aabaeaf51a126d6a9b3..c60b9e01ea6816cea5310ca41cc65ddb6d3919cf 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 dd64265e49e1b2b994a26f62b687adbf1113189f..0bc47d8e3771fbd06612fc48e3bf9099c12fa5dd 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>
- <div class="col s12 m8">
- {{ M.render_field(import_corpus_form.description, data_length='255', material_icon='description') }}
+ <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>
- <div class="row">
- <div class="col s12">
- {{ M.render_field(import_corpus_form.file, accept='.zip', placeholder='Choose your exported .zip file') }}
+ <div class="card-action right-align">
+ {{ wtf.render_field(import_corpus_form.submit, material_icon='send') }}
</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 3d3018a8ed73bdbda6f6dcfc292593708851d8c4..4336178a9cb99196da66786adb243067feeaeeec 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>