From a1d33077a3fc57a63bc7b9440f3dff7d22beebdc Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 18 Feb 2020 15:44:55 +0100 Subject: [PATCH] Small changes everywhere --- app/templates/403.html.j2 | 7 +- app/templates/404.html.j2 | 7 +- app/templates/500.html.j2 | 7 +- app/templates/admin/edit_user.html.j2 | 3 - app/templates/admin/index.html.j2 | 1 - app/templates/admin/user.html.j2 | 3 - app/templates/auth/register.html.j2 | 3 - app/templates/auth/reset_password.html.j2 | 3 - .../auth/reset_password_request.html.j2 | 3 - app/templates/auth/unconfirmed.html.j2 | 3 - app/templates/corpora/add_corpus.html.j2 | 3 - app/templates/corpora/add_corpus_file.html.j2 | 3 - .../corpora/analyse_corpus.bak.html.j2 | 543 ------------------ app/templates/corpora/analyse_corpus.html.j2 | 1 - .../corpora/analyse_corpus_pjentsch.html.j2 | 423 -------------- app/templates/corpora/corpus.html.j2 | 3 - .../corpora/edit_corpus_file.html.j2 | 3 - app/templates/jobs/job.html.j2 | 3 - app/templates/main/dashboard.html.j2 | 3 - app/templates/main/index.html.j2 | 17 + app/templates/main/poster.html.j2 | 3 - app/templates/main/poster2.html.j2 | 68 --- app/templates/nopaque.html.j2 | 18 - app/templates/profile/index.html.j2 | 3 - .../services/corpus_analysis.html.j2 | 3 - app/templates/services/nlp.html.j2 | 3 - app/templates/services/ocr.html.j2 | 3 - app/templates/services/setup_files.html.j2 | 3 - app/templates/test/index.html.j2 | 80 --- 29 files changed, 23 insertions(+), 1203 deletions(-) delete mode 100644 app/templates/corpora/analyse_corpus.bak.html.j2 delete mode 100644 app/templates/corpora/analyse_corpus_pjentsch.html.j2 delete mode 100644 app/templates/main/poster2.html.j2 delete mode 100644 app/templates/test/index.html.j2 diff --git a/app/templates/403.html.j2 b/app/templates/403.html.j2 index c7036333..eba64fb3 100644 --- a/app/templates/403.html.j2 +++ b/app/templates/403.html.j2 @@ -1,10 +1,7 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %} -
-

This site is forbidden for you.

+
+

This site is forbidden for you.

{% endblock %} diff --git a/app/templates/404.html.j2 b/app/templates/404.html.j2 index d25a4486..b0fdc4fb 100644 --- a/app/templates/404.html.j2 +++ b/app/templates/404.html.j2 @@ -1,10 +1,7 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %} -
-

Site has not been found.

+
+

Site has not been found.

{% endblock %} diff --git a/app/templates/500.html.j2 b/app/templates/500.html.j2 index 462492f7..4c9c4a33 100644 --- a/app/templates/500.html.j2 +++ b/app/templates/500.html.j2 @@ -1,10 +1,7 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %} -
-

Internal Server Error. We are Sorry!

+
+

Internal Server Error. We are Sorry!

{% endblock %} diff --git a/app/templates/admin/edit_user.html.j2 b/app/templates/admin/edit_user.html.j2 index 535b2cee..76e42881 100644 --- a/app/templates/admin/edit_user.html.j2 +++ b/app/templates/admin/edit_user.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

{{ user.username }}

diff --git a/app/templates/admin/index.html.j2 b/app/templates/admin/index.html.j2 index e0072079..7e538b9c 100644 --- a/app/templates/admin/index.html.j2 +++ b/app/templates/admin/index.html.j2 @@ -1,7 +1,6 @@ {% extends "nopaque.html.j2" %} {% set full_width = True %} -{% set roadmap = False %} {% block page_content %}
diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index e4e24b6f..9d2f7b05 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

{{ user.username }}

diff --git a/app/templates/auth/register.html.j2 b/app/templates/auth/register.html.j2 index c4f3abc5..0b73ecbe 100644 --- a/app/templates/auth/register.html.j2 +++ b/app/templates/auth/register.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

DSGVO

diff --git a/app/templates/auth/reset_password.html.j2 b/app/templates/auth/reset_password.html.j2 index 899ba4b2..1ef3adfa 100644 --- a/app/templates/auth/reset_password.html.j2 +++ b/app/templates/auth/reset_password.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

Lorem ipsum

diff --git a/app/templates/auth/reset_password_request.html.j2 b/app/templates/auth/reset_password_request.html.j2 index 86282d50..86c513df 100644 --- a/app/templates/auth/reset_password_request.html.j2 +++ b/app/templates/auth/reset_password_request.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

Lost password?

diff --git a/app/templates/auth/unconfirmed.html.j2 b/app/templates/auth/unconfirmed.html.j2 index bac1f380..f3d26dc9 100644 --- a/app/templates/auth/unconfirmed.html.j2 +++ b/app/templates/auth/unconfirmed.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block title %}Opaque - Confirm your account{% endblock %} {% block page_content %} diff --git a/app/templates/corpora/add_corpus.html.j2 b/app/templates/corpora/add_corpus.html.j2 index 51a84af7..6ea38aaf 100644 --- a/app/templates/corpora/add_corpus.html.j2 +++ b/app/templates/corpora/add_corpus.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = True %} - {% block page_content %}

...

diff --git a/app/templates/corpora/add_corpus_file.html.j2 b/app/templates/corpora/add_corpus_file.html.j2 index 67c66191..7cd7d807 100644 --- a/app/templates/corpora/add_corpus_file.html.j2 +++ b/app/templates/corpora/add_corpus_file.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

{{ corpus.title }}

diff --git a/app/templates/corpora/analyse_corpus.bak.html.j2 b/app/templates/corpora/analyse_corpus.bak.html.j2 deleted file mode 100644 index e5f38982..00000000 --- a/app/templates/corpora/analyse_corpus.bak.html.j2 +++ /dev/null @@ -1,543 +0,0 @@ -{% extends "full_width.html.j2" %} - -{% block page_content %} - - - -
-
- -
-
- - - - - -
-
-
-
- Fetching your results! -
-
-
-
-
-
-
-
-
- - -
-
-
-
- Query Results -

- -

-
    - - - - - - - - - - -
    TitleLeft contextMatchRight Context
    -
      -
      -
      -
      -
      - - - - - - - - -{% endblock %} diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2 index ae5d4297..5309249d 100644 --- a/app/templates/corpora/analyse_corpus.html.j2 +++ b/app/templates/corpora/analyse_corpus.html.j2 @@ -1,7 +1,6 @@ {% extends "nopaque.html.j2" %} {% set full_width = True %} -{% set roadmap = False %} {% block page_content %} diff --git a/app/templates/corpora/analyse_corpus_pjentsch.html.j2 b/app/templates/corpora/analyse_corpus_pjentsch.html.j2 deleted file mode 100644 index 06c24b97..00000000 --- a/app/templates/corpora/analyse_corpus_pjentsch.html.j2 +++ /dev/null @@ -1,423 +0,0 @@ -{% extends "full_width.html.j2" %} - -{% block page_content %} - - -
      -
      - {{ query_form.hidden_tag() }} - -
      -
      - - - -
      -
      -
      - Fetching your results! -
      -
      -
      -
      -
      -
      -
      -
      - -
      -
      -
      - Query Results -

      - -

      -
        - - - - - - - - - - -
        TitleLeft contextMatchRight Context
        -
          -
          -
          -
          - - - - - - - - - - - -{% endblock %} diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index b6058be5..67a3ec29 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

          {{ corpus.title }}

          diff --git a/app/templates/corpora/edit_corpus_file.html.j2 b/app/templates/corpora/edit_corpus_file.html.j2 index 4076e280..071c91d1 100644 --- a/app/templates/corpora/edit_corpus_file.html.j2 +++ b/app/templates/corpora/edit_corpus_file.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

          ...

          diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2 index c6ac3ba6..2d1d97a7 100644 --- a/app/templates/jobs/job.html.j2 +++ b/app/templates/jobs/job.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% set title = 'Job'.format(service=job.service) %} {% block page_content %} diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index c910bbcf..50dfdf04 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

          My Corpora

          diff --git a/app/templates/main/index.html.j2 b/app/templates/main/index.html.j2 index 89bdd77f..923876f8 100644 --- a/app/templates/main/index.html.j2 +++ b/app/templates/main/index.html.j2 @@ -4,6 +4,23 @@ {% block page_content %} {% if current_user.is_anonymous %} + + +
          diff --git a/app/templates/main/poster.html.j2 b/app/templates/main/poster.html.j2 index ee3c6a81..a5389a0e 100644 --- a/app/templates/main/poster.html.j2 +++ b/app/templates/main/poster.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %} - {% endif %} diff --git a/app/templates/profile/index.html.j2 b/app/templates/profile/index.html.j2 index 6a26317b..da47e065 100644 --- a/app/templates/profile/index.html.j2 +++ b/app/templates/profile/index.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = False %} - {% block page_content %}

          Dark Mode

          diff --git a/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2 index 06497d7a..7073bc5c 100644 --- a/app/templates/services/corpus_analysis.html.j2 +++ b/app/templates/services/corpus_analysis.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = True %} - {% block page_content %}
          diff --git a/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2 index 1e1de9f8..3d813c3d 100644 --- a/app/templates/services/nlp.html.j2 +++ b/app/templates/services/nlp.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = True %} - {% block page_content %}
          diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2 index 845c5368..7f55a725 100644 --- a/app/templates/services/ocr.html.j2 +++ b/app/templates/services/ocr.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = True %} - {% block page_content %}
          diff --git a/app/templates/services/setup_files.html.j2 b/app/templates/services/setup_files.html.j2 index e06af5c6..4b62f3ad 100644 --- a/app/templates/services/setup_files.html.j2 +++ b/app/templates/services/setup_files.html.j2 @@ -1,8 +1,5 @@ {% extends "nopaque.html.j2" %} -{% set full_width = False %} -{% set roadmap = True %} - {% block page_content %}
          diff --git a/app/templates/test/index.html.j2 b/app/templates/test/index.html.j2 deleted file mode 100644 index 3fb77913..00000000 --- a/app/templates/test/index.html.j2 +++ /dev/null @@ -1,80 +0,0 @@ -{% extends "limited_width.html.j2" %} - -{% block page_content %} -
          -

          Submit a Test

          -
          - -
          -
          -
          - {{ test_form.hidden_tag() }} -
          -
          -
          -
          - title - {{ test_form.title(class='validate', data_length='32') }} - {{ test_form.title.label }} -
          -
          -
          -
          - description - {{ test_form.description(class='validate', data_length='255') }} - {{ test_form.description.label }} -
          -
          -
          -
          -
          - {{ test_form.file.label.text }} - {{ test_form.file() }} -
          -
          - -
          -
          -
          -
          -
          -
          - -
          -
          -
          -
          - - - - -{% endblock %}