provide non openid login in development configuration

diff --git a/plgng/settings_common.py b/plgng/settings_common.py
index 9095e9f..a6c93aa 100644 (file)
--- a/plgng/settings_common.py
+++ b/plgng/settings_common.py
@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
-import django.conf.global_settings as defaults
+from django.conf import global_settings
 from django.contrib.messages import constants as messages
 
 from local import *
@@ -47,7 +47,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + (
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
     'django.core.context_processors.request',
 )
 
@@ -88,7 +88,7 @@ AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
 )
 
-LOGIN_URL = 'openid-login'
+LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = '/jobs/'
 
 # If set, always use this as the identity URL rather than asking the
@@ -126,3 +126,6 @@ MESSAGE_TAGS = {
     messages.WARNING: 'alert alert-warning',
     messages.ERROR: 'alert alert-danger',
 }
+
+
+GRAPPELLI_ADMIN_TITLE = 'Portal QCG'

diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html
index 9accb20..7030598 100644 (file)
--- a/qcg/templates/qcg/base.html
+++ b/qcg/templates/qcg/base.html
@@ -61,7 +61,7 @@
                                 </ul>
                             </li>
                     {% else %}
-                        <li><a href="{% url 'openid-login' %}" class="navbar-link">Zaloguj</a></li>
+                        <li><a href="{% url 'login' %}" class="navbar-link">Zaloguj</a></li>
                     {% endif %}
                 </ul>
             </div><!--/.nav-collapse -->
@@ -96,7 +96,7 @@
             </div>
 
             <p class="text-center" style="margin: 20px 0">
-                <a class="btn btn-lg btn-primary" href="{% url 'openid-login' %}" role="button">Zaloguj się korzystając z OpenID</a>
+                <a class="btn btn-lg btn-primary" href="{% url 'login' %}" role="button">Zaloguj się korzystając z OpenID</a>
             </p>
 
         {% endblock container %}

diff --git a/qcg/urls.py b/qcg/urls.py
index a45e85d..fe7eab1 100644 (file)
--- a/qcg/urls.py
+++ b/qcg/urls.py
@@ -1,9 +1,13 @@
+from django.conf import settings
 from django.conf.urls import patterns, url
 
 from qcg import views
 
+login_url = url(r'^login/', 'django.contrib.auth.views.login', {'template_name': 'admin/login.html'}, name='login') \
+    if settings.DEBUG else url(r'^openid/login/', views.openid_begin, name='login')
+
 urlpatterns = patterns('',
-    url(r'^openid/login/', views.openid_begin, name='openid-login'),
+    login_url,
     url(r'^openid/complete/', 'django_openid_auth.views.login_complete', name='openid-complete'),
     url(r'^openid/logout/', 'django.contrib.auth.views.logout', {'template_name': 'qcg/logout.html'}, name='logout'),