fixes

2024-12-24 10:34:17 +00:00 · 2024-05-04 14:41:40 +02:00 · 2024-05-04 14:41:40 +02:00 · 882987ba68
commit 882987ba68
parent a03b5918d9
33 changed files with 119 additions and 154 deletions
--- a/app/templates/_base/_modals/_manual/06_services.html.j2
+++ b/app/templates/_base/_modals/_manual/06_services.html.j2
@ -1,4 +1,4 @@
-<h3 class="manual-chapter-title">Services</h5>
+<h3 class="manual-chapter-title">Services</h3>
 <div class="row">
  <div class="col s12 m4">
    <img alt="Services" class="materialboxed responsive-img" src="{{ url_for('static', filename='images/manual/services.png') }}">
--- a/app/templates/_base/metas.html.j2
+++ b/app/templates/_base/metas.html.j2
@ -0,0 +1,2 @@
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
--- a/app/templates/_base/scripts.html.j2
+++ b/app/templates/_base/scripts.html.j2
@ -1,20 +1,20 @@
+<script src="{{ url_for('static', filename='external/materialize/js/materialize.min.js') }}"></script>
 <script src="{{ url_for('static', filename='external/JSON-Patch/js/fast-json-patch.min.js') }}"></script>
 <script src="{{ url_for('static', filename='external/list.js/js/list.min.js') }}"></script>
 <script src="{{ url_for('static', filename='external/pako/js/pako_inflate.min.js') }}"></script>
 <script src="{{ url_for('static', filename='external/plotly.js/js/plotly.min.js') }}"></script>
 <script src="{{ url_for('static', filename='external/socket.io/js/socket.io.min.js') }}"></script>
-
-{%- assets
+{% assets
  filters='rjsmin',
  output='gen/app.%(version)s.js',
  'js/index.js',
  'js/app.js',
  'js/utils.js'
-%}
+-%}
 <script src="{{ ASSET_URL }}"></script>
-{%- 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'
-%}
+-%}
 <script src="{{ ASSET_URL }}"></script>
-{%- 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'
-%}
+-%}
 <script src="{{ ASSET_URL }}"></script>
-{%- 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'
-%}
+-%}
 <script src="{{ ASSET_URL }}"></script>
-{%- 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'
-%}
+-%}
 <script src="{{ ASSET_URL }}"></script>
-{%- 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'
-%}
+-%}
 <script src="{{ ASSET_URL }}"></script>
-{%- endassets %}
+{% endassets -%}

 <script>
  // TODO: Implement an app.run method and use this for all of the following
  const app = new nopaque.App();
  app.init();

-  // Check if the current user is authenticated
-  {%- if current_user.is_authenticated %}
+  {% if current_user.is_authenticated -%}
  // TODO: Set this as a property of the app object
  const currentUserId = {{ current_user.hashid|tojson }};

@ -120,11 +119,10 @@
  app.getUser(currentUserId, true, true)
    .catch((error) => {throw JSON.stringify(error);});

-  // Check if the current user hasn't accepted the terms of use yet
-  {%- if not current_user.terms_of_use_accepted %}
+  {% if not current_user.terms_of_use_accepted -%}
  M.Modal.getInstance(document.querySelector('#terms-of-use-modal')).open();
-  {%- endif %}
-  {%- endif %}
+  {% endif -%}
+  {% endif -%}

  // Display flashed messages
  for (let [category, message] of {{ get_flashed_messages(with_categories=True)|tojson }}) {
--- a/app/templates/_base/stylesheets.html.j2
+++ b/app/templates/_base/stylesheets.html.j2
@ -1,16 +1,18 @@
-{% if current_user.is_authenticated %}
+<link href="{{ url_for('static', filename='external/material-design-icons/css/material-icons.css') }}" rel="stylesheet">
+<link href="{{ url_for('static', filename='external/materialize/css/materialize.min.css') }}" rel="stylesheet">
+{% if current_user.is_authenticated -%}
 <link href="{{ url_for('static', filename='materialize/css/sidenav-fixed.css') }}" rel="stylesheet">
-{% endif %}
+{% endif -%}
 <link href="{{ url_for('static', filename='materialize/css/sticky-footer.css') }}" rel="stylesheet">
 <link href="{{ url_for('static', filename='materialize/css/fixes.css') }}" rel="stylesheet">
 <link href="{{ url_for('static', filename='nopaque-icons/css/nopaque-icons.css') }}" rel="stylesheet">
 <link href="{{ url_for('static', filename='css/queryBuilder.css') }}" rel="stylesheet">
-{%- assets
+{% assets
  filters='pyscss',
  output='gen/app.%(version)s.css',
  'css/colors.scss',
  'css/helpers.scss',
  'css/style.css'
-%}
+-%}
 <link href="{{ ASSET_URL }}" rel="stylesheet">
-{%- endassets %}
+{% endassets -%}
--- a/app/templates/admin/edit_user.html.j2
+++ b/app/templates/admin/edit_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 %}
 <div class="container">
--- a/app/templates/auth/login.html.j2
+++ b/app/templates/auth/login.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 %}
--- a/app/templates/auth/register.html.j2
+++ b/app/templates/auth/register.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 %}
--- a/app/templates/auth/reset_password.html.j2
+++ b/app/templates/auth/reset_password.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 %}
 <div class="container">
--- a/app/templates/auth/reset_password_request.html.j2
+++ b/app/templates/auth/reset_password_request.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 %}
 <div class="container">
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@ -1,60 +1,72 @@
-{% extends "materialize/base.html.j2" %}
-
 {% if title is not defined %}
 {% set title = 'nopaque' %}
 {% endif %}

-{% block html_attribs %}lang="en"{% endblock html_attribs %}
+{% block doc %}
+<!DOCTYPE html>
+<html {% block html_attribs %}lang="en"{% endblock html_attribs %}>
+  {% block html %}
+  <head>
+    {% block head %}
+    {% block metas %}
+    {% include "_base/metas.html.j2" %}
+    {% endblock metas %}

-{% block head %}
-{{ super() }}
-<link href="{{ url_for('static', filename='images/nopaque_-_favicon.png') }}" rel="icon">
-{% endblock head %}
+    <title {% block title_attribs %}{% endblock title_attribs %}>
+      {%- block title %}{{ title }}{% endblock title -%}
+    </title>

-{% block metas %}
-<meta charset="UTF-8">
-{{ super() }}
-{% endblock metas %}
+    <link href="{{ url_for('static', filename='images/nopaque_-_favicon.png') }}" rel="icon">

-{% block title %}{{ title }}{% endblock title %}
+    {% block stylesheets %}
+    {% include "_base/stylesheets.html.j2" %}
+    {% endblock stylesheets %}
+    {% endblock head %}
+  </head>
+  <body {% block body_attribs %}{% endblock body_attribs %}>
+    {% block body %}
+    <header {% block header_attribs %}{% endblock header_attribs %}>
+      {% block header %}
+      {% block navbar %}
+      {% include "_base/navbar.html.j2" %}
+      {% endblock navbar %}
+      {% block sidenav %}
+      {% if current_user.is_authenticated %}
+      {% include "_base/sidenav.html.j2" %}
+      {% endif %}
+      {% endblock sidenav %}
+      {% endblock header %}
+    </header>

-{% block styles %}
-{{ super() }}
-{% include "_base/styles.html.j2" %}
-{% endblock styles %}
+    <main {% block main_attribs %}class="background-color"{% endblock main_attribs %}>
+      {% block main %}
+      {% block page_content %}{% endblock page_content %}

-{% block navbar %}
-{% include "_base/navbar.html.j2" %}
-{% endblock navbar %}
-
-{% block sidenav %}
-{% if current_user.is_authenticated %}
-{% include "_base/sidenav.html.j2" %}
-{% endif %}
-{% endblock sidenav %}
-
-{% block main_attribs %} class="background-color"{% endblock main_attribs %}
-{% block main %}
-{% block page_content %}{% endblock page_content %}
-<div id="dropdowns">
+      <div id="dropdowns">
        {% block dropdowns %}
        {% include "_base/dropdowns.html.j2" %}
        {% endblock dropdowns %}
-</div>
+      </div>

-<div id="modals">
+      <div id="modals">
        {% block modals %}
        {% include "_base/modals.html.j2" %}
        {% endblock modals %}
-</div>
-{% endblock main %}
+      </div>
+      {% endblock main %}
+    </main>

-{% block footer_attribs %} class="page-footer primary-variant-color"{% endblock footer_attribs %}
-{% block footer %}
-{% include "_base/footer.html.j2" %}
-{% endblock footer %}
+    <footer {% block footer_attribs %}class="page-footer primary-variant-color"{% endblock footer_attribs %}>
+      {% block footer %}
+      {% include "_base/footer.html.j2" %}
+      {% endblock footer %}
+    </footer>

-{% block scripts %}
-{{ super() }}
-{% include "_base/scripts.html.j2" %}
-{% endblock scripts %}
+    {% block scripts %}
+    {% include "_base/scripts.html.j2" %}
+    {% endblock scripts %}
+    {% endblock body %}
+  </body>
+  {% endblock html %}
+</html>
+{% endblock doc %}
--- a/app/templates/contributions/spacy_nlp_pipeline_models/create.html.j2
+++ b/app/templates/contributions/spacy_nlp_pipeline_models/create.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 %}

--- a/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2
+++ b/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.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 %}

--- a/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.html.j2
+++ b/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.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 %}
 <div class="container">
--- a/app/templates/contributions/tesseract_ocr_pipeline_models/create.html.j2
+++ b/app/templates/contributions/tesseract_ocr_pipeline_models/create.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 %}

--- a/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2
+++ b/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.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 %}

--- a/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.html.j2
+++ b/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.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 %}
 <div class="container">
--- a/app/templates/corpora/analysis.html.j2
+++ b/app/templates/corpora/analysis.html.j2
@ -1,5 +1,5 @@
 {% extends "base.html.j2" %}
-{% import "materialize/wtf.html.j2" as wtf %}
+{% import "wtf.html.j2" as wtf %}
 {% import 'corpora/_analysis/concordance.html.j2' as concordance_extension %}
 {% import 'corpora/_analysis/reader.html.j2' as reader_extension %}
 {% import 'corpora/_analysis/static_visualization.html.j2' as static_visualization_extension %}
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.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="corpus-analysis"{% endblock main_attribs %}

--- a/app/templates/corpora/create.html.j2
+++ b/app/templates/corpora/create.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="corpus-analysis"{% endblock main_attribs %}

--- a/app/templates/corpora/files/corpus_file.html.j2
+++ b/app/templates/corpora/files/corpus_file.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="corpus-analysis"{% endblock main_attribs %}

--- a/app/templates/corpora/files/create.html.j2
+++ b/app/templates/corpora/files/create.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="corpus-analysis"{% endblock main_attribs %}

--- a/app/templates/corpora/import.html.j2
+++ b/app/templates/corpora/import.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="corpus-analysis"{% endblock main_attribs %}

--- a/app/templates/corpora/public_corpus.html.j2
+++ b/app/templates/corpora/public_corpus.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="corpus-analysis"{% endblock main_attribs %}

--- a/app/templates/main/index.html.j2
+++ b/app/templates/main/index.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 %}
 <div class="parallax-container" id="title">
--- a/app/templates/main/social_area.html.j2
+++ b/app/templates/main/social_area.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="social-area-color-lighten" {% endblock main_attribs %}

--- a/app/templates/materialize/base.html.j2
+++ b/app/templates/materialize/base.html.j2
@ -1,49 +0,0 @@
-{% if title is not defined %}
-{% set title = 'Title' %}
-{% endif %}
-
-{% block doc %}
-<!DOCTYPE html>
-<html {% block html_attribs %}{% endblock html_attribs %}>
-  {% block html %}
-  <head>
-    {% block head %}
-    <title>{% block title %}{{ title }}{% endblock title %}</title>
-
-    {% block metas %}
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    {% endblock metas %}
-
-    {% block styles %}
-    <link rel="stylesheet" href="{{ url_for('static', filename='external/material-design-icons/css/material-icons.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='external/materialize/css/materialize.min.css') }}">
-    {% endblock styles %}
-    {% endblock head %}
-  </head>
-  <body {% block body_attribs %}{% endblock body_attribs %}>
-    {% block body %}
-    <header {% block header_attribs %}{% endblock header_attribs %}>
-      {% block header %}
-      {% block navbar %}
-      {% endblock navbar %}
-      {% block sidenav %}
-      {% endblock sidenav %}
-      {% endblock header %}
-    </header>
-
-    <main {% block main_attribs %}{% endblock main_attribs %}>
-      {% block main %}{% endblock main %}
-    </main>
-
-    <footer {% block footer_attribs %}{% endblock footer_attribs %}>
-      {% block footer %}{% endblock footer %}
-    </footer>
-
-    {% block scripts %}
-    <script src="{{ url_for('static', filename='external/materialize/js/materialize.min.js') }}"></script>
-    {% endblock scripts %}
-    {% endblock body %}
-  </body>
-  {% endblock html %}
-</html>
-{% endblock doc %}
--- 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 %}

--- 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 %}

--- 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 %}

--- 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 %}

--- 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 %}
 <div class="section container">
--- 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 %}
--- a/app/templates/materialize/wtf.html.j2
+++ b/app/templates/materialize/wtf.html.j2