From 0ecd61c9b36705ab42c7b7bd62972d760680eb6c Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 29 Oct 2020 19:21:33 +0100 Subject: [PATCH] unifiy roadmap --- web/app/templates/corpora/add_corpus.html.j2 | 9 ----- .../templates/corpora/add_corpus_file.html.j2 | 13 ------- .../templates/corpora/analyse_corpus.html.j2 | 11 ------ web/app/templates/corpora/corpus.html.j2 | 9 ----- web/app/templates/corpora/corpus_file.html.j2 | 13 ------- web/app/templates/nopaque.html.j2 | 35 +++++++++++++++++-- web/app/templates/services/_roadmap.html.j2 | 10 ------ .../services/corpus_analysis.html.j2 | 5 --- web/app/templates/services/file-setup.html.j2 | 5 --- web/app/templates/services/nlp.html.j2 | 5 --- web/app/templates/services/ocr.html.j2 | 5 --- 11 files changed, 32 insertions(+), 88 deletions(-) delete mode 100644 web/app/templates/services/_roadmap.html.j2 diff --git a/web/app/templates/corpora/add_corpus.html.j2 b/web/app/templates/corpora/add_corpus.html.j2 index 9200da09..a1970f0b 100644 --- a/web/app/templates/corpora/add_corpus.html.j2 +++ b/web/app/templates/corpora/add_corpus.html.j2 @@ -5,21 +5,12 @@ {% set scheme_primary_color = colors.corpus_analysis_darken %} {% set scheme_secondary_color = colors.corpus_analysis %} -{% block nav_content %} - -{% endblock nav_content %} - {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ title }}

diff --git a/web/app/templates/corpora/add_corpus_file.html.j2 b/web/app/templates/corpora/add_corpus_file.html.j2 index 193c4ce1..5f8f25b3 100644 --- a/web/app/templates/corpora/add_corpus_file.html.j2 +++ b/web/app/templates/corpora/add_corpus_file.html.j2 @@ -7,23 +7,10 @@ {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} -{% block nav_content %} - -{% endblock nav_content %} - {% block page_content %}
-

 

{{ title }}

diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/web/app/templates/corpora/analyse_corpus.html.j2 index ae0d0d06..f4177a3f 100644 --- a/web/app/templates/corpora/analyse_corpus.html.j2 +++ b/web/app/templates/corpora/analyse_corpus.html.j2 @@ -5,22 +5,11 @@ {% set scheme_primary_color = colors.corpus_analysis_darken %} {% set scheme_secondary_color = colors.corpus_analysis %} -{% block nav_content %} - -{% 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 4d803f20..d2e7fd07 100644 --- a/web/app/templates/corpora/corpus.html.j2 +++ b/web/app/templates/corpora/corpus.html.j2 @@ -4,21 +4,12 @@ {% set scheme_primary_color = colors.corpus_analysis_darken %} {% set scheme_secondary_color = colors.corpus_analysis %} -{% block nav_content %} - -{% endblock nav_content %} - {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ corpus.title }}

{{ corpus.description }}

diff --git a/web/app/templates/corpora/corpus_file.html.j2 b/web/app/templates/corpora/corpus_file.html.j2 index 9ebb4f93..810816fe 100644 --- a/web/app/templates/corpora/corpus_file.html.j2 +++ b/web/app/templates/corpora/corpus_file.html.j2 @@ -5,25 +5,12 @@ {% set scheme_primary_color = colors.corpus_analysis_darken %} {% set scheme_secondary_color = colors.corpus_analysis %} -{% block nav_content %} - -{% endblock nav_content %} - {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ corpus_file.author }}: {{ corpus_file.title }}

diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index 8b49e1a8..b2e85dbe 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -85,8 +85,8 @@ {% if current_user.is_authenticated %} menu {% endif %} - - + +
- {% block nav_content %}{% endblock nav_content %} + {% block nav_content %} + {% if current_user.is_authenticated %} +
    +
  • exploreRoadmap
    • +
  • File setup
    • +
  • navigate_next
    • +
  • OCR
    • +
  • navigate_next
    • +
  • NLP
    • +
  • navigate_next
    • +
  • Add corpus
    • +
  • navigate_next
    • + {% if corpus %} +
  • Add corpus file(s)
    • + {% else %} +
  • Add corpus file(s)
    • + {% endif %} +
  • navigate_next
    • + {% if corpus %} + {% if corpus.files.all() %} +
  • Corpus analysis
    • + {% else %} +
  • Corpus analysis
    • + {% endif %} + {% else %} +
  • Corpus analysis
    • + {% endif %} +
+ {% endif %} + {% endblock nav_content %}
diff --git a/web/app/templates/services/_roadmap.html.j2 b/web/app/templates/services/_roadmap.html.j2 deleted file mode 100644 index ec528339..00000000 --- a/web/app/templates/services/_roadmap.html.j2 +++ /dev/null @@ -1,10 +0,0 @@ -
    -
  • exploreRoadmap
    • -
  • File setup
    • -
  • navigate_next
    • -
  • OCR
    • -
  • navigate_next
    • -
  • NLP
    • -
  • navigate_next
    • -
  • Corpus Analysis
    • -
diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/web/app/templates/services/corpus_analysis.html.j2 index 49623f55..906e2586 100644 --- a/web/app/templates/services/corpus_analysis.html.j2 +++ b/web/app/templates/services/corpus_analysis.html.j2 @@ -4,17 +4,12 @@ {% set scheme_primary_color = colors.corpus_analysis_darken %} {% set scheme_secondary_color = colors.corpus_analysis %} -{% block nav_content %} -{% include 'services/_roadmap.html.j2' %} -{% endblock nav_content %} - {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ title }}

diff --git a/web/app/templates/services/file-setup.html.j2 b/web/app/templates/services/file-setup.html.j2 index 7bf9da58..48ac3817 100644 --- a/web/app/templates/services/file-setup.html.j2 +++ b/web/app/templates/services/file-setup.html.j2 @@ -5,17 +5,12 @@ {% set scheme_primary_color = colors.file_setup_darken %} {% set scheme_secondary_color = colors.file_setup %} -{% block nav_content %} -{% include 'services/_roadmap.html.j2' %} -{% endblock nav_content %} - {% block main_attribs %} class="file-setup-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ title }}

diff --git a/web/app/templates/services/nlp.html.j2 b/web/app/templates/services/nlp.html.j2 index 48034561..8cb70d28 100644 --- a/web/app/templates/services/nlp.html.j2 +++ b/web/app/templates/services/nlp.html.j2 @@ -5,17 +5,12 @@ {% set scheme_primary_color = colors.nlp_darken %} {% set scheme_secondary_color = colors.nlp %} -{% block nav_content %} -{% include 'services/_roadmap.html.j2' %} -{% endblock nav_content %} - {% block main_attribs %} class="nlp-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ title }}

diff --git a/web/app/templates/services/ocr.html.j2 b/web/app/templates/services/ocr.html.j2 index 6e894707..150778c3 100644 --- a/web/app/templates/services/ocr.html.j2 +++ b/web/app/templates/services/ocr.html.j2 @@ -5,17 +5,12 @@ {% set scheme_primary_color = colors.ocr_darken %} {% set scheme_secondary_color = colors.ocr %} -{% block nav_content %} -{% include 'services/_roadmap.html.j2' %} -{% endblock nav_content %} - {% block main_attribs %} class="ocr-color lighten"{% endblock main_attribs %} {% block page_content %}
-

 

{{ title }}