add DMIRR_SSL_LOGIN

derks · Feb 14, 2012 · 15916f3 · 15916f3
1 parent f149919
commit 15916f3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
diff --git 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
@@ -143,7 +143,11 @@ <h3>Login to dMirr</h3>
                                 </form>
                             </div>
                         </div>
-                        <p class="pull-right"><a data-controls-modal="signin-modal" href="javascript:;">Login</a></p>
+                        {% if ssl_login %}
+                            <p class="pull-right"><a href="{% url userena_signin %}">Login</a></p>
+                        {% else %}
+                            <p class="pull-right"><a data-controls-modal="signin-modal" href="javascript:;">Login</a></p>
+                        {% endif %}
                     {% endif %}    
                 </div>
             </div>