From 882987ba68a9266f966f852cea0d28b976213628 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Sat, 4 May 2024 14:41:40 +0200 Subject: [PATCH] fixes --- .../_base/_modals/_manual/06_services.html.j2 | 2 +- app/templates/_base/metas.html.j2 | 2 + app/templates/_base/scripts.html.j2 | 48 ++++---- .../{styles.html.j2 => stylesheets.html.j2} | 12 +- app/templates/admin/edit_user.html.j2 | 2 +- app/templates/auth/login.html.j2 | 2 +- app/templates/auth/register.html.j2 | 2 +- app/templates/auth/reset_password.html.j2 | 2 +- .../auth/reset_password_request.html.j2 | 2 +- app/templates/base.html.j2 | 108 ++++++++++-------- .../spacy_nlp_pipeline_models/create.html.j2 | 2 +- .../spacy_nlp_pipeline_model.html.j2 | 2 +- .../spacy_nlp_pipeline_models.html.j2 | 2 +- .../create.html.j2 | 2 +- .../tesseract_ocr_pipeline_model.html.j2 | 2 +- .../tesseract_ocr_pipeline_models.html.j2 | 2 +- app/templates/corpora/analysis.html.j2 | 2 +- app/templates/corpora/corpus.html.j2 | 2 +- app/templates/corpora/create.html.j2 | 2 +- .../corpora/files/corpus_file.html.j2 | 2 +- app/templates/corpora/files/create.html.j2 | 2 +- app/templates/corpora/import.html.j2 | 2 +- app/templates/corpora/public_corpus.html.j2 | 2 +- app/templates/main/index.html.j2 | 2 +- app/templates/main/social_area.html.j2 | 2 +- app/templates/materialize/base.html.j2 | 49 -------- .../services/file_setup_pipeline.html.j2 | 2 +- .../services/spacy_nlp_pipeline.html.j2 | 2 +- .../services/tesseract_ocr_pipeline.html.j2 | 2 +- .../services/transkribus_htr_pipeline.html.j2 | 2 +- app/templates/users/settings/settings.html.j2 | 2 +- app/templates/users/user.html.j2 | 2 +- app/templates/{materialize => }/wtf.html.j2 | 0 33 files changed, 119 insertions(+), 154 deletions(-) create mode 100644 app/templates/_base/metas.html.j2 rename app/templates/_base/{styles.html.j2 => stylesheets.html.j2} (67%) delete mode 100644 app/templates/materialize/base.html.j2 rename app/templates/{materialize => }/wtf.html.j2 (100%) diff --git a/app/templates/_base/_modals/_manual/06_services.html.j2 b/app/templates/_base/_modals/_manual/06_services.html.j2 index e65f8088..40d9fb53 100644 --- a/app/templates/_base/_modals/_manual/06_services.html.j2 +++ b/app/templates/_base/_modals/_manual/06_services.html.j2 @@ -1,4 +1,4 @@ -

Services

+

Services

Services diff --git a/app/templates/_base/metas.html.j2 b/app/templates/_base/metas.html.j2 new file mode 100644 index 00000000..30185f8f --- /dev/null +++ b/app/templates/_base/metas.html.j2 @@ -0,0 +1,2 @@ + + diff --git a/app/templates/_base/scripts.html.j2 b/app/templates/_base/scripts.html.j2 index efc317d8..a527a835 100644 --- a/app/templates/_base/scripts.html.j2 +++ b/app/templates/_base/scripts.html.j2 @@ -1,20 +1,20 @@ + - -{%- assets +{% assets filters='rjsmin', output='gen/app.%(version)s.js', 'js/index.js', 'js/app.js', 'js/utils.js' -%} +-%} -{%- endassets %} +{% endassets -%} -{%- assets +{% assets filters='rjsmin', output='gen/Forms.%(version)s.js', 'js/forms/index.js', @@ -22,22 +22,22 @@ 'js/forms/create-contribution-form.js', 'js/forms/create-corpus-file-form.js', 'js/forms/create-job-form.js' -%} +-%} -{%- endassets %} +{% endassets -%} -{%- assets +{% assets filters='rjsmin', output='gen/resource-displays.%(version)s.js', 'js/resource-displays/index.js', 'js/resource-displays/resource-display.js', 'js/resource-displays/corpus-display.js', 'js/resource-displays/job-display.js' -%} +-%} -{%- endassets %} +{% endassets -%} -{%- assets +{% assets filters='rjsmin', output='gen/resource-lists.%(version)s.js', 'js/resource-lists/index.js', @@ -56,11 +56,11 @@ 'js/resource-lists/public-user-list.js', 'js/resource-lists/spacy-nlp-pipeline-model-list.js', 'js/resource-lists/tesseract-ocr-pipeline-model-list.js' -%} +-%} -{%- endassets %} +{% endassets -%} -{%- assets +{% assets filters='rjsmin', output='gen/requests.%(version)s.js', 'js/requests/index.js', @@ -69,11 +69,11 @@ 'js/requests/corpora.js', 'js/requests/jobs.js', 'js/requests/users.js' -%} +-%} -{%- endassets %} +{% endassets -%} -{%- assets +{% assets filters='rjsmin', output='gen/corpus-analysis.%(version)s.js', 'js/corpus-analysis/index.js', @@ -98,17 +98,16 @@ 'js/corpus-analysis/concordance-extension.js', 'js/corpus-analysis/reader-extension.js', 'js/corpus-analysis/static-visualization-extension.js' -%} +-%} -{%- endassets %} +{% endassets -%} - {% endblock scripts %} - {% endblock body %} - - {% endblock html %} - -{% endblock doc %} diff --git a/app/templates/services/file_setup_pipeline.html.j2 b/app/templates/services/file_setup_pipeline.html.j2 index 0f046e98..f2647983 100644 --- a/app/templates/services/file_setup_pipeline.html.j2 +++ b/app/templates/services/file_setup_pipeline.html.j2 @@ -1,5 +1,5 @@ {% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} +{% import "wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="file-setup-pipeline"{% endblock main_attribs %} diff --git a/app/templates/services/spacy_nlp_pipeline.html.j2 b/app/templates/services/spacy_nlp_pipeline.html.j2 index a7bf214c..094d132a 100644 --- a/app/templates/services/spacy_nlp_pipeline.html.j2 +++ b/app/templates/services/spacy_nlp_pipeline.html.j2 @@ -1,5 +1,5 @@ {% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} +{% import "wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="spacy-nlp-pipeline"{% endblock main_attribs %} diff --git a/app/templates/services/tesseract_ocr_pipeline.html.j2 b/app/templates/services/tesseract_ocr_pipeline.html.j2 index 69be6889..d4e9ce2c 100644 --- a/app/templates/services/tesseract_ocr_pipeline.html.j2 +++ b/app/templates/services/tesseract_ocr_pipeline.html.j2 @@ -1,5 +1,5 @@ {% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} +{% import "wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="tesseract-ocr-pipeline"{% endblock main_attribs %} diff --git a/app/templates/services/transkribus_htr_pipeline.html.j2 b/app/templates/services/transkribus_htr_pipeline.html.j2 index 50eb3b6e..37dfd6c7 100644 --- a/app/templates/services/transkribus_htr_pipeline.html.j2 +++ b/app/templates/services/transkribus_htr_pipeline.html.j2 @@ -1,5 +1,5 @@ {% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} +{% import "wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="transkribus-htr-pipeline"{% endblock main_attribs %} diff --git a/app/templates/users/settings/settings.html.j2 b/app/templates/users/settings/settings.html.j2 index f2593bd6..aeced15e 100644 --- a/app/templates/users/settings/settings.html.j2 +++ b/app/templates/users/settings/settings.html.j2 @@ -1,5 +1,5 @@ {% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} +{% import "wtf.html.j2" as wtf %} {% block page_content %}
diff --git a/app/templates/users/user.html.j2 b/app/templates/users/user.html.j2 index 41054eb6..89a42188 100644 --- a/app/templates/users/user.html.j2 +++ b/app/templates/users/user.html.j2 @@ -1,5 +1,5 @@ {% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} +{% import "wtf.html.j2" as wtf %} {% block page_content %} diff --git a/app/templates/materialize/wtf.html.j2 b/app/templates/wtf.html.j2 similarity index 100% rename from app/templates/materialize/wtf.html.j2 rename to app/templates/wtf.html.j2