From f7ed56768dd4c697766b89bb751eeecc8bfe92d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Wed, 30 May 2012 11:21:12 -0400
Subject: [PATCH] SAML links

---
 CHANGES                                |    5 +++++
 auf/django/skin/templates/actions.html |    5 +++--
 setup.py                               |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9ea1b6f..0cf4620 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2.0
+---
+
+* TPL avec lien SAML
+
 1.5
 ---
 
diff --git a/auf/django/skin/templates/actions.html b/auf/django/skin/templates/actions.html
index 135ed03..47ff041 100755
--- a/auf/django/skin/templates/actions.html
+++ b/auf/django/skin/templates/actions.html
@@ -1,9 +1,10 @@
+{% load saml %}
 <ul>
     {% if user.is_authenticated %}
     <li class="username">{{ user }}</li>
       <li><a href="{% url admin:index %}">Administration</a></li>
-      <li><a href="{% url django.contrib.auth.views.logout %}?next=/">Déconnexion</a></li>
+      <li><a href="{% mellon_logout_url %}">Déconnexion</a></li>
     {% else %}
-      <li><a href="{% url django.contrib.auth.views.login %}?next={{request.path}}">Connexion</a></li>
+      <li><a href="{% mellon_login_url request.get_full_path %}">Connexion</a></li>
     {% endif %}
 </ul>
diff --git a/setup.py b/setup.py
index 79f259a..7f11497 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 import sys, os
 
 name = 'auf.django.skin'
-version = '1.5'
+version = '2.0'
 
 setup(name=name,
       version=version,
-- 
1.7.10.4