diff --git a/requirements/base.txt b/requirements/base.txt index 4466244d..cd35807e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,6 +14,8 @@ asgiref==3.8.1 # django-cors-headers asn1crypto==1.5.1 # via webauthn +async-timeout==4.0.3 + # via redis attrs==23.2.0 # via # glom @@ -227,7 +229,7 @@ mozilla-django-oidc-db==0.15.0 # via open-api-framework notifications-api-common==0.2.2 # via commonground-api-common -open-api-framework==0.4.2 +open-api-framework==0.5.0 # via -r requirements/base.in orderedmultidict==1.0.1 # via furl diff --git a/requirements/ci.txt b/requirements/ci.txt index ed9537de..34d414d1 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -29,6 +29,11 @@ asn1crypto==1.5.1 # webauthn astroid==3.1.0 # via pylint +async-timeout==4.0.3 + # via + # -c requirements/base.txt + # -r requirements/base.txt + # redis attrs==23.2.0 # via # -c requirements/base.txt @@ -479,7 +484,7 @@ notifications-api-common==0.2.2 # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common -open-api-framework==0.4.2 +open-api-framework==0.5.0 # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index bbe660b0..ee25f1c6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -35,6 +35,11 @@ astroid==3.1.0 # -c requirements/ci.txt # -r requirements/ci.txt # pylint +async-timeout==4.0.3 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # redis attrs==23.2.0 # via # -c requirements/ci.txt @@ -539,7 +544,7 @@ notifications-api-common==0.2.2 # -c requirements/ci.txt # -r requirements/ci.txt # commonground-api-common -open-api-framework==0.4.2 +open-api-framework==0.5.0 # via # -c requirements/ci.txt # -r requirements/ci.txt diff --git a/src/openklant/scss/admin/_admin_theme.scss b/src/openklant/scss/admin/_admin_theme.scss index 965d9660..3632b891 100644 --- a/src/openklant/scss/admin/_admin_theme.scss +++ b/src/openklant/scss/admin/_admin_theme.scss @@ -56,6 +56,12 @@ DO NOT PUT ANY TARGET APP-SPECIFIC RULES HERE. --input-group-text-bg: #{$color-secondary-dark}; --input-group-text-fg: #{$color-dark}; --formio-dropdown-highlighted-bg: #f2f2f2; + + // version styling + --version-fg: var(--body-quiet-color); + + // environment styling + --env-button-fg: #{$color-secondary}; } @media (prefers-color-scheme: dark) { @@ -263,43 +269,6 @@ div.breadcrumbs { background: none !important; } -/* Footer */ -.login .version { - text-align: center; -} -.version { - padding: 0 30px; - color: $color_secondary_dark; - font-size: smaller; -} - -#footer { - display: flex; - justify-content: space-between; - align-items: center; -} - -/** - * Environment banner - */ -.env { - display: block; - line-height: 35px; - text-align: center; - font-weight: bold; - text-transform: uppercase; - color: $color_secondary; - background-color: $color_dark; - position: fixed; - top: 0; - height: 35px; - width: 300px; - left: 50%; - margin-left: -150px; - z-index: 1000001; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); -} - /** * Django form field lengths */ diff --git a/src/openklant/templates/admin/base_site.html b/src/openklant/templates/admin/base_site.html index d8351cb1..2e2befad 100644 --- a/src/openklant/templates/admin/base_site.html +++ b/src/openklant/templates/admin/base_site.html @@ -1,4 +1,4 @@ -{% extends "admin/base.html" %} +{% extends "open_api_framework/admin/base_site.html" %} {% load i18n static %} {% block title %}{{ title }} | {{ settings.PROJECT_NAME }}{% endblock %} @@ -30,20 +30,3 @@

{{ settings.PROJECT_NAME }} {% endblock %} {% block nav-global %}{% endblock %} - -{% block messages %} - {% if settings.ENVIRONMENT_SHOWN_IN_ADMIN %} -
{{ settings.ENVIRONMENT }}
- {% endif %} - {{ block.super }} -{% endblock %} - -{% block footer %} - -{% endblock %} diff --git a/src/openklant/utils/context_processors.py b/src/openklant/utils/context_processors.py index 1ad23a8f..de54f75c 100644 --- a/src/openklant/utils/context_processors.py +++ b/src/openklant/utils/context_processors.py @@ -8,6 +8,7 @@ def settings(request): "SITE_TITLE", "PROJECT_NAME", "VNG_COMPONENTS_BRANCH", + "ENVIRONMENT_SHOWN_IN_ADMIN", "RELEASE", "GIT_SHA", )