diff --git a/bdr/settings.py b/bdr/settings.py index cf1bd21..c2d4640 100644 --- a/bdr/settings.py +++ b/bdr/settings.py @@ -246,6 +246,7 @@ BDR_EMAIL_FROM = env('BDR_EMAIL_FROM', 'bdr@localhost') USE_ZOPE_LAYOUT = env('USE_ZOPE_LAYOUT', True) +USE_ZOPE_LOGIN = env('USE_ZOPE_LOGIN', False) USE_SIDEMENU = env('USE_SIDEMENU', False) BDR_SIDEMENU_URL=env('BDR_SIDEMENU_URL', '') diff --git a/docker/app.env.example b/docker/app.env.example index edf7894..1463ccb 100644 --- a/docker/app.env.example +++ b/docker/app.env.example @@ -32,8 +32,9 @@ BDR_SIDEMENU_URL= BDR_API_USER= BDR_API_PASSWORD= -BDRREGISTRY_URL= +BDR_SERVER_URL= USE_ZOPE_LAYOUT=True +USE_ZOPE_LOGIN=False EMAIL_HOST=postfix EMAIL_PASS= diff --git a/notifications/context.py b/notifications/context.py index ab46a71..db88247 100644 --- a/notifications/context.py +++ b/notifications/context.py @@ -23,5 +23,7 @@ def debug(request): def utils(request): return { - "bcc_email_address": env('BCC', '') + 'bcc_email_address': env('BCC', ''), + 'USE_ZOPE_LOGIN': env('USE_ZOPE_LOGIN', ''), + 'BDR_SERVER_URL': env('BDR_SERVER_URL', ''), } diff --git a/notifications/templates/notifications/base_zope.html b/notifications/templates/notifications/base_zope.html index 3dcf14c..3822a7b 100644 --- a/notifications/templates/notifications/base_zope.html +++ b/notifications/templates/notifications/base_zope.html @@ -53,27 +53,34 @@
- - + +
+ {% if user.is_anonymous %} + {% if USE_ZOPE_LOGIN %} + {% trans "Login" %} + {% else %} + {% trans "Login" %} + {% endif %} + {% else %} + {% if USE_ZOPE_LOGIN %} + {% trans "Logout" %} ({{ user.username }}) + {% else %} + {% trans "Logout" %} ({{ user.username }}) + {% endif %} + {% endif %} + {% trans "Print" %} + {% trans "Switch to/from full screen mode" %} +
@@ -85,26 +92,26 @@ {% for item in view.breadcrumbs %} + {% if item.url %} + {{ item.title }} + {% else %} + {{ item.title }} + {% endif %} +
{% endfor %}
{% if USE_SIDEMENU %} {% cache 3000 sidebar request.user %} - {% get_sidebar request.user %} + {% get_sidebar request.user %} {% endcache %} - {% else %} + {% else %}

Services

-