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 @@ +