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 @@
  • navigate_next
  • {% if request.path == url_for('.add_corpus') %}
  • {{ title }}
  • + {% elif request.path == url_for('.import_corpus') %} +
  • {{ title }}
  • {% elif request.path == url_for('.corpus', corpus_id=corpus.id) %}
  • {{ corpus.title }}
  • {% 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 %} -
    -

    Fill out the following form to import a corpus.

    - arrow_backBack to dashboard -
    +
    +
    +
    +

    {{ title }}

    +
    -
    -
    -
    -
    - {{ import_corpus_form.hidden_tag() }} -
    -
    - {{ M.render_field(import_corpus_form.title, data_length='32', material_icon='title') }} +
    +

    Fill out the following form to import a corpus.

    + arrow_backBack to dashboard +
    + +
    + +
    +
    + {{ import_corpus_form.hidden_tag() }} +
    +
    + {{ wtf.render_field(import_corpus_form.title, data_length='32', material_icon='title') }} +
    +
    + {{ wtf.render_field(import_corpus_form.description, data_length='255', material_icon='description') }} +
    +
    +
    +
    + {{ wtf.render_field(import_corpus_form.file, accept='.zip', placeholder='Choose your exported .zip file') }} +
    +
    -
    - {{ M.render_field(import_corpus_form.description, data_length='255', material_icon='description') }} +
    + {{ wtf.render_field(import_corpus_form.submit, material_icon='send') }}
    -
    -
    -
    - {{ M.render_field(import_corpus_form.file, accept='.zip', placeholder='Choose your exported .zip file') }} -
    -
    +
    -
    - {{ M.render_field(import_corpus_form.submit, material_icon='send') }} -
    - +
    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 @@
      @@ -86,7 +87,6 @@