From ee7f64f5be68332ac1a0646feabb31af6e5ff2cc Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 15 Nov 2024 15:21:26 +0100 Subject: [PATCH] Design update --- app/__init__.py | 6 +- app/static/css/materialize.override.css | 19 +--- ...png => nopaque_-_logo+wordmark+slogan.png} | Bin app/static/js/app.js | 9 ++ .../data-processing-and-analysis.html.j2 | 52 ++++++++++ app/templates/_base/dropdowns.html.j2 | 3 + app/templates/_base/modals.html.j2 | 2 + .../_base/navbar_primary_content.html.j2 | 91 ++++++++++++++---- app/templates/_base/sidenav.html.j2 | 57 ++++------- app/templates/base.html.j2 | 2 +- 10 files changed, 165 insertions(+), 76 deletions(-) rename app/static/images/{nopaque_-_wordmark+slogan.png => nopaque_-_logo+wordmark+slogan.png} (100%) create mode 100644 app/templates/_base/_modals/data-processing-and-analysis.html.j2 diff --git a/app/__init__.py b/app/__init__.py index eb8b10f9..75df4689 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -105,13 +105,13 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(contributions_blueprint, url_prefix='/contributions') from .blueprints.spacy_nlp_pipeline_models import bp as spacy_nlp_pipeline_models_blueprint - app.register_blueprint(spacy_nlp_pipeline_models_blueprint, url_prefix='/spacy-nlp-pipeline-models') + app.register_blueprint(spacy_nlp_pipeline_models_blueprint, url_prefix='/contributions/spacy-nlp-pipeline-models') from .blueprints.tesseract_ocr_pipeline_models import bp as tesseract_ocr_pipeline_models_blueprint - app.register_blueprint(tesseract_ocr_pipeline_models_blueprint, url_prefix='/tesseract-ocr-pipeline-models') + app.register_blueprint(tesseract_ocr_pipeline_models_blueprint, url_prefix='/contributions/tesseract-ocr-pipeline-models') from.blueprints.transkribus_htr_pipeline_models import bp as transkribus_htr_pipeline_models_blueprint - app.register_blueprint(transkribus_htr_pipeline_models_blueprint, url_prefix='/transkribus-htr-pipeline-models') + app.register_blueprint(transkribus_htr_pipeline_models_blueprint, url_prefix='/contributions/transkribus-htr-pipeline-models') from .blueprints.corpora import bp as corpora_blueprint app.register_blueprint(corpora_blueprint, cli_group='corpus', url_prefix='/corpora') diff --git a/app/static/css/materialize.override.css b/app/static/css/materialize.override.css index e1876c2f..cc7b73bf 100644 --- a/app/static/css/materialize.override.css +++ b/app/static/css/materialize.override.css @@ -7,26 +7,15 @@ * * Read more: https://materializecss.com/sidenav.html#variations */ -body[data-sidenav-fixed="true" i] main, -body[data-sidenav-fixed="true" i] footer { - padding-left: 300px; -} - -@media only screen and (max-width: 992px) { +@media only screen and (min-width: 993px) { + body[data-sidenav-fixed="true" i] header, body[data-sidenav-fixed="true" i] main, body[data-sidenav-fixed="true" i] footer { - padding-left: 0; + padding-left: 300px; } body[data-sidenav-fixed="true" i] .navbar-fixed > nav { - width: 100%; - } -} - -@media only screen and (min-width: 993px) { - body[data-sidenav-fixed="true" i] .sidenav-fixed { - margin-top: 64px; - z-index: 996; + width: calc(100% - 300px); } } /* #endregion sidenav-fixed */ diff --git a/app/static/images/nopaque_-_wordmark+slogan.png b/app/static/images/nopaque_-_logo+wordmark+slogan.png similarity index 100% rename from app/static/images/nopaque_-_wordmark+slogan.png rename to app/static/images/nopaque_-_logo+wordmark+slogan.png diff --git a/app/static/js/app.js b/app/static/js/app.js index 71705244..8ad12449 100644 --- a/app/static/js/app.js +++ b/app/static/js/app.js @@ -163,6 +163,15 @@ nopaque.App = class App { // AutoInit method (maybe they forgot it?). Anyway... We do it here. :) M.CharacterCounter.init(document.querySelectorAll('input[data-length]:not(.no-autoinit), textarea[data-length]:not(.no-autoinit)')); + // Header navigation processes and services Dropdown. + M.Dropdown.init( + document.querySelector('#nav-processes-and-services-dropdown-trigger'), + { + constrainWidth: false, + coverTrigger: false + } + ); + // Header navigation account Dropdown. M.Dropdown.init( document.querySelector('#nav-account-dropdown-trigger'), diff --git a/app/templates/_base/_modals/data-processing-and-analysis.html.j2 b/app/templates/_base/_modals/data-processing-and-analysis.html.j2 new file mode 100644 index 00000000..e6a9440a --- /dev/null +++ b/app/templates/_base/_modals/data-processing-and-analysis.html.j2 @@ -0,0 +1,52 @@ + diff --git a/app/templates/_base/dropdowns.html.j2 b/app/templates/_base/dropdowns.html.j2 index a17ef249..b2679d70 100644 --- a/app/templates/_base/dropdowns.html.j2 +++ b/app/templates/_base/dropdowns.html.j2 @@ -1,5 +1,8 @@ {% if current_user.is_authenticated %} diff --git a/app/templates/_base/modals.html.j2 b/app/templates/_base/modals.html.j2 index 69d6cbaf..b4e092a2 100644 --- a/app/templates/_base/modals.html.j2 +++ b/app/templates/_base/modals.html.j2 @@ -1,3 +1,5 @@ {% if current_user.is_authenticated and not current_user.terms_of_use_accepted %} {% include "_base/_modals/terms_of_use.html.j2" %} {% endif %} + +{% include "_base/_modals/data-processing-and-analysis.html.j2" %} diff --git a/app/templates/_base/navbar_primary_content.html.j2 b/app/templates/_base/navbar_primary_content.html.j2 index 943c423c..83ffbf51 100644 --- a/app/templates/_base/navbar_primary_content.html.j2 +++ b/app/templates/_base/navbar_primary_content.html.j2 @@ -1,38 +1,95 @@ {% if current_user.is_authenticated %} - - +{# menu icon #} +{# shown for small/medium devices #} menu + +{# nopaque logo #} +{# shown for large devices #} + + +{# left aligned navigation items #} +{# shown for large devices #} + +{% else %} +{# nopaque logo+wordmark+slogan #} +{# shown for large devices #} + {% endif %} - - +{# nopaque logo+wordmark #} +{# small/medium devices #} - - - - +{# right aligned navigation items #} +{# large devices #} diff --git a/app/templates/_base/sidenav.html.j2 b/app/templates/_base/sidenav.html.j2 index 8b674d47..625292de 100644 --- a/app/templates/_base/sidenav.html.j2 +++ b/app/templates/_base/sidenav.html.j2 @@ -1,7 +1,6 @@ -