From a7cd27c95e369be5efb4cd08f7d03bbaa5613032 Mon Sep 17 00:00:00 2001 From: juanifioren Date: Tue, 18 Aug 2015 18:04:59 -0300 Subject: [PATCH] Change styles in example project. --- .../templates/accounts/login.html | 24 ------- .../templates/accounts/logout.html | 12 ---- .../provider_app/templates/base.html | 69 ++++++++----------- .../provider_app/templates/home.html | 23 +++++-- .../provider_app/templates/login.html | 30 ++++++++ example_project/provider_app/urls.py | 4 +- example_project/requirements.txt | 2 +- 7 files changed, 78 insertions(+), 86 deletions(-) delete mode 100644 example_project/provider_app/templates/accounts/login.html delete mode 100644 example_project/provider_app/templates/accounts/logout.html create mode 100644 example_project/provider_app/templates/login.html diff --git a/example_project/provider_app/templates/accounts/login.html b/example_project/provider_app/templates/accounts/login.html deleted file mode 100644 index 6c24774..0000000 --- a/example_project/provider_app/templates/accounts/login.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} - -
-
-
- {% csrf_token %} - - {% if form.errors %} - - {% endif %} -
- -
-
- -
- -
-
-
- -{% endblock %} \ No newline at end of file diff --git a/example_project/provider_app/templates/accounts/logout.html b/example_project/provider_app/templates/accounts/logout.html deleted file mode 100644 index 25aa0f8..0000000 --- a/example_project/provider_app/templates/accounts/logout.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} - -
-
-

Bye!

-

Thanks for spending some quality time with the web site today.

-
-
- -{% endblock %} \ No newline at end of file diff --git a/example_project/provider_app/templates/base.html b/example_project/provider_app/templates/base.html index 6d38b8b..845498f 100644 --- a/example_project/provider_app/templates/base.html +++ b/example_project/provider_app/templates/base.html @@ -1,50 +1,39 @@ +{% load i18n %} +{% load staticfiles %} + - - - - + + + + + + OpenID Provider - - - + + - - - - - -
-
- -

django-oidc-provider

-
- - {% block content %}{% endblock %} - - - -
- + + {% else %} + Login + {% endif %} + + + {% block content %}{% endblock %} - - - + + + + \ No newline at end of file diff --git a/example_project/provider_app/templates/home.html b/example_project/provider_app/templates/home.html index c79d818..a8f6d05 100644 --- a/example_project/provider_app/templates/home.html +++ b/example_project/provider_app/templates/home.html @@ -1,11 +1,20 @@ -{% extends 'base.html' %} +{% extends "base.html" %} +{% load i18n %} +{% load staticfiles %} {% block content %} - -
-

Welcome!

-

Django OIDC Provider can help you providing out of the box all the endpoints, data and logic needed to add OpenID Connect capabilities to your Django projects.

-

View on Github

-
+ +
+
+
+
+
+
+

Welcome!

+

This package help you providing all the endpoints, data and logic needed to add OpenID Connect capabilities to your Django projects.

+ View on Github +
+
+
{% endblock %} \ No newline at end of file diff --git a/example_project/provider_app/templates/login.html b/example_project/provider_app/templates/login.html new file mode 100644 index 0000000..4ff9366 --- /dev/null +++ b/example_project/provider_app/templates/login.html @@ -0,0 +1,30 @@ +{% extends 'base.html' %} + +{% block content %} + +
+
+
+
+ {% csrf_token %} + + {% if form.errors %} +
+

Your username and password didn't match. Please try again.

+
+ {% endif %} +
+ + +
+
+ + +
+ +
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/example_project/provider_app/urls.py b/example_project/provider_app/urls.py index abfb2c4..8f0eee3 100644 --- a/example_project/provider_app/urls.py +++ b/example_project/provider_app/urls.py @@ -6,8 +6,8 @@ from django.views.generic import TemplateView urlpatterns = patterns('', url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'), - url(r'^accounts/login/$', auth_views.login, {'template_name': 'accounts/login.html'}, name='login'), - url(r'^accounts/logout/$', auth_views.logout, {'template_name': 'accounts/logout.html'}, name='logout'), + url(r'^accounts/login/$', auth_views.login, { 'template_name': 'login.html' }, name='login'), + url(r'^accounts/logout/$', auth_views.logout, { 'next_page': '/' }, name='logout'), url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')), diff --git a/example_project/requirements.txt b/example_project/requirements.txt index a5ba3b3..ba797c3 100644 --- a/example_project/requirements.txt +++ b/example_project/requirements.txt @@ -1,2 +1,2 @@ django==1.8 -django-oidc-provider==0.1.2 +https://github.com/juanifioren/django-oidc-provider/archive/v0.2.x.zip