Merge lp:~deeptik/linaro-ci-dashboard/django-openid-changes into lp:linaro-ci-dashboard

[Deepti B. Kalakeri]

Adding open id authencation changes and a welcome page.

[lp:~deeptik/linaro-ci-dashboard/django-openid-changes]

12. By Stevan Radaković on 2012-07-05

Add local urls.py file. Change views to be Class-based.

13. By Stevan Radaković on 2012-07-05

Add local urls.py file. Change views to be Class-based. Add missing files.

14. By Deepti B. Kalakeri on 2012-07-05

Adding changes to views and templates

15. By Deepti B. Kalakeri on 2012-07-05

Using the login_required decorator to for openid login

=== added directory 'dashboard/frontend'
=== added file 'dashboard/frontend/__init__.py'
=== added file 'dashboard/frontend/models.py'
--- dashboard/frontend/models.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/models.py	2012-07-05 15:26:20 +0000
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

=== added file 'dashboard/frontend/tests.py'
--- dashboard/frontend/tests.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/tests.py	2012-07-05 15:26:20 +0000
@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)

=== added file 'dashboard/frontend/urls.py'
--- dashboard/frontend/urls.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/urls.py	2012-07-05 15:26:20 +0000
@@ -0,0 +1,12 @@
+from django.conf.urls.defaults import patterns, include, url
+from frontend.views.home_page_view import HomePageView
+from frontend.views.index_view import IndexView
+
+urlpatterns = patterns('',
+    # url(r'^$', 'dashboard.frontend.views.index'),
+    #url(r'^index$', 'dashboard.frontend.views.index'),
+    #   url(r'^accounts/profile/$', 'dashboard.frontend.views.home_page'),
+    url(r'^$', IndexView.as_view(), name='Index'),
+    url(r'^index/$', IndexView.as_view(), name='Index'),
+    url(r'^accounts/profile/$', HomePageView.as_view(), name='Home'),
+)

=== added directory 'dashboard/frontend/views'
=== added file 'dashboard/frontend/views/__init__.py'
=== added file 'dashboard/frontend/views/home_page_view.py'
--- dashboard/frontend/views/home_page_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/views/home_page_view.py	2012-07-05 15:26:20 +0000
@@ -0,0 +1,10 @@
+from django.views.generic.base import TemplateView
+
+class HomePageView(TemplateView):
+
+    template_name = "home.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(HomePageView, self).get_context_data(**kwargs)
+        context['request'] = self.request
+        return context

=== added file 'dashboard/frontend/views/index_view.py'
--- dashboard/frontend/views/index_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/views/index_view.py	2012-07-05 15:26:20 +0000
@@ -0,0 +1,16 @@
+from django.views.generic.base import TemplateView
+from django.utils.decorators import method_decorator
+from django.contrib.auth.decorators import login_required
+
+class IndexView(TemplateView):
+
+    template_name = "index.html"
+     
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(IndexView, self).dispatch(*args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super(IndexView, self).get_context_data(**kwargs)
+        context['request'] = self.request
+        return context

=== modified file 'dashboard/settings.py'
--- dashboard/settings.py	2012-07-04 13:43:22 +0000
+++ dashboard/settings.py	2012-07-05 15:26:20 +0000
@@ -1,8 +1,11 @@
 # Django settings for dashboard project.
+import os
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
+PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
+
 ADMINS = (
     # ('Your Name', '[e-mail]'),
 )
@@ -12,7 +15,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'dashboard.sqlite3',             # Or path to database file if using sqlite3.
+        'NAME': os.path.join(PROJECT_ROOT, 'dashboard.db'), # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
@@ -106,8 +109,10 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    os.path.join(PROJECT_ROOT, "templates/frontend" ),
 )
 
+
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
@@ -116,12 +121,29 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_openid_auth',
+    'frontend', 
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
 )
 
+AUTHENTICATION_BACKENDS = (
+    'django_openid_auth.auth.OpenIDBackend',
+    'django.contrib.auth.backends.ModelBackend',
+)
+
+#MEDIA_URL = '/static/'
+
+OPENID_CREATE_USERS = True
+LOGIN_URL = '/openid/login/'
+OPENID_SSO_SERVER_URL = 'https://login.launchpad.net/'
+OPENID_LAUNCHPAD_TEAMS_MAPPING = {
+    'linaro': 'linaro',
+}
+
+
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error.

=== added directory 'dashboard/templates'
=== added directory 'dashboard/templates/frontend'
=== added file 'dashboard/templates/frontend/home.html'
--- dashboard/templates/frontend/home.html	1970-01-01 00:00:00 +0000
+++ dashboard/templates/frontend/home.html	2012-07-05 15:26:20 +0000
@@ -0,0 +1,8 @@
+{% if request.user.username %}
+    <ul>
+        <li>Welcome <b>{{ request.user.username }}!!!</b></li>
+        <p><a href="/logout">Sign out</a></p>
+    </ul>
+{% else %}
+    <p>No Profile information available</p>
+{% endif %}

=== added file 'dashboard/templates/frontend/index.html'
--- dashboard/templates/frontend/index.html	1970-01-01 00:00:00 +0000
+++ dashboard/templates/frontend/index.html	2012-07-05 15:26:20 +0000
@@ -0,0 +1,4 @@
+{% block content %}
+<p>You are signed in as <strong>{{request.user.username}}</strong> ({{request.user.get_full_name}}) </p>
+<a href="/logout">Sign out</a>
+{% endblock %}

=== modified file 'dashboard/urls.py'
--- dashboard/urls.py	2012-07-04 13:43:22 +0000
+++ dashboard/urls.py	2012-07-05 15:26:20 +0000
@@ -13,5 +13,11 @@
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
+    # url(r'^$', 'dashboard.frontend.views.index'),
+    #url(r'^index$', 'dashboard.frontend.views.index'),
+    #   url(r'^accounts/profile/$', 'dashboard.frontend.views.home_page'),
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^openid/', include('django_openid_auth.urls')),
+    url(r'^logout/$', 'django.contrib.auth.views.logout'),
+    url(r'^', include('dashboard.frontend.urls')),
 )