From 15916f3d7ef3fc1995dedc5573d6dea5a2c98033 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 14 Feb 2012 00:26:18 -0600 Subject: [PATCH] add DMIRR_SSL_LOGIN --- src/dmirr.hub/dmirr/hub/context_processors.py | 1 + src/dmirr.hub/dmirr/hub/settings.py | 1 + src/dmirr.hub/dmirr/hub/templates/base.html | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/dmirr.hub/dmirr/hub/context_processors.py b/src/dmirr.hub/dmirr/hub/context_processors.py index ce73070..0b12ac5 100644 --- a/src/dmirr.hub/dmirr/hub/context_processors.py +++ b/src/dmirr.hub/dmirr/hub/context_processors.py @@ -14,5 +14,6 @@ def template_shortcuts(request): 'site' : Site.objects.get_current(), 'dmirr_version' : get_distribution('dmirr.hub').version, 'flags' : "%simg/flags/" % settings.STATIC_URL, + 'ssl_login' : settings.DMIRR_SSL_LOGIN, } return cuts \ No newline at end of file diff --git a/src/dmirr.hub/dmirr/hub/settings.py b/src/dmirr.hub/dmirr/hub/settings.py index 9c3a8cc..8056b6b 100644 --- a/src/dmirr.hub/dmirr/hub/settings.py +++ b/src/dmirr.hub/dmirr/hub/settings.py @@ -227,6 +227,7 @@ CACHES['default'] = CACHES['dummy'] DMIRR_REMOTE_ADDR_KEY = 'REMOTE_ADDR' +DMIRR_SSL_LOGIN = False # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to diff --git a/src/dmirr.hub/dmirr/hub/templates/base.html b/src/dmirr.hub/dmirr/hub/templates/base.html index 948ef99..e90446a 100644 --- a/src/dmirr.hub/dmirr/hub/templates/base.html +++ b/src/dmirr.hub/dmirr/hub/templates/base.html @@ -143,7 +143,11 @@

Login to dMirr

-

Login

+ {% if ssl_login %} +

Login

+ {% else %} +

Login

+ {% endif %} {% endif %}