From 55b5ebc90a0e028bc74610701b5f4e61a033c285 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 8 Dec 2014 14:24:33 +0100
Subject: [PATCH] Update login.html

---
 authentic2/static/pratic2                  |  1 -
 authentic2/templates/authentic2/login.html | 28 +++++++++-------------
 2 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 120000 authentic2/static/pratic2

diff --git a/authentic2/static/pratic2 b/authentic2/static/pratic2
deleted file mode 120000
index babe817..0000000
--- a/authentic2/static/pratic2
+++ /dev/null
@@ -1 +0,0 @@
-../../portail-citoyen2/static/pratic2/
\ No newline at end of file
diff --git a/authentic2/templates/authentic2/login.html b/authentic2/templates/authentic2/login.html
index b868379..e62fa81 100644
--- a/authentic2/templates/authentic2/login.html
+++ b/authentic2/templates/authentic2/login.html
@@ -1,32 +1,26 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n sekizai_tags gadjo %}
 
 {% block title %}
 {% trans "Log in" %}
 {% endblock %}
 
-{% block breadcrumb %}
-<p id="breadcrumb"><a href="/">Accueil</a> &gt; <a href="/login">Connexion</a></p>
-{% endblock %}
-
 {% block content %}
 
 <div id="info-box">
   <h1>Connexion</h1>
 </div>
 
-{% for name, content in methods %}
-<div id="tabs-{{ forloop.counter }}">
-{{ content|safe }}
-</div>
+{% for id, login_block in blocks.iteritems %}
+  <div id="tabs-{{id}}">
+    {{ login_block.content|safe }}
+  </div>
 {% endfor %}
-
 <div id="infocookie"><p>&nbsp;&nbsp;Vous devez accepter les cookies pour vous identifier.</p></div>
-{% endblock %}
-
-{% block extra_scripts %}
-<script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery.cookie.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery-ui.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery.simplemodal.js"></script>
+{% addtoblock "css" %}<link rel="stylesheet" href="{{ STATIC_URL }}jquery/css/jquery-ui.custom.css" />{% endaddtoblock %}
+{% addtoblock "css" %}<link rel="stylesheet" href="{{ STATIC_URL }}ulx/css/ulx.css" />{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% xstatic 'jquery-ui' 'jquery-ui.min.js' %}"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery.cookie.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery.simplemodal.js"></script>{% endaddtoblock %}
 {% endblock %}