From e896b5eac7d05b18fbd3cc9136fd0d89dd1887b5 Mon Sep 17 00:00:00 2001
From: Paul Marillonnet <pmarillonnet@entrouvert.com>
Date: Tue, 26 Sep 2017 20:25:49 +0200
Subject: [PATCH] POC Campus Condorcet : adaptation des templates

---
 django/sp_sso/templates/declare_form.html           | 7 ++++---
 django/sp_sso/templates/index.html                  | 1 +
 django/sp_sso/templates/invite/invitation_form.html | 7 +++++--
 django/sp_sso/templates/registration_form.html      | 1 -
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/django/sp_sso/templates/declare_form.html b/django/sp_sso/templates/declare_form.html
index 717d5ed..88f6101 100644
--- a/django/sp_sso/templates/declare_form.html
+++ b/django/sp_sso/templates/declare_form.html
@@ -17,13 +17,14 @@
     {% include "registration_field.html" with field=form.nom %}
     {% include "registration_field.html" with field=form.prenom %}
     {% include "registration_field.html" with field=form.email %}
-    {% include "registration_field.html" with field=form.s_etablissement %}
-    {% include "registration_field.html" with field=form.invite_unite %}
+    {% include "registration_field.html" with field=form.s_etablissement_description %}
+    {% include "registration_field.html" with field=form.s_entite_affectation_principale_description %}
     {% include "registration_field.html" with field=form.ep_primary_affiliation %}
-    {% include "registration_field.html" with field=form.ep_affiliation %}
     {% include "registration_field.html" with field=form.s_emp_corps %}
     {% include "registration_field.html" with field=form.s_liste_rouge %}
     {{ form.ep_principal_name.as_hidden }}
+    {{ form.s_etablissement.as_hidden }}
+    {{ form.s_entite_affectation_principale.as_hidden }}
     <input type="submit" value="{% trans "Submit" %}"/>
 </form>
 {% if form.errors %}
diff --git a/django/sp_sso/templates/index.html b/django/sp_sso/templates/index.html
index f6696e3..02de8a3 100644
--- a/django/sp_sso/templates/index.html
+++ b/django/sp_sso/templates/index.html
@@ -16,6 +16,7 @@
 <p style='text-align:center'>
 <h2 style='color:#21C910'>{% trans "Your are moving in to the Campus" %}</h2>
 <a class='button inline' href="{% url "declare" %}">{% trans "Register using your Campus institution account" %}</a><br/><br/>
+<a class='button inline' href="/invite?type=member">{% trans "Send invites for people to declare their accounts." %}</a><br/><br/>
 <h2 style='color:#109BC9'>{% trans "You have been invited by a member of the Campus" %}</h2>
 <a class='button inline' href="{% url "auth_login" %}">{% trans "Register using your origin institution account" %}</a><br/><br/>
 <a class='button inline' href="{% url "register" %}">{% trans "Register using an empty form" %}</a><br/><br/>
diff --git a/django/sp_sso/templates/invite/invitation_form.html b/django/sp_sso/templates/invite/invitation_form.html
index d710fb1..8646c9a 100644
--- a/django/sp_sso/templates/invite/invitation_form.html
+++ b/django/sp_sso/templates/invite/invitation_form.html
@@ -20,8 +20,11 @@
     {% include "registration_field.html" with field=form.hote_courriel %}
     {% include "registration_field.html" with field=form.hote_nom %}
     {% include "registration_field.html" with field=form.hote_prenom %}
-    {% include "registration_field.html" with field=form.hote_etablissement %}
-    {% include "registration_field.html" with field=form.hote_unite %}
+    {% include "registration_field.html" with field=form.hote_etablissement_description %}
+    {% include "registration_field.html" with field=form.hote_unite_description %}
+    {{ form.hote_etablissement.as_hidden }}
+    {{ form.hote_unite.as_hidden }}
+    {{ form.hote_type.as_hidden }}
     <input type="submit" value="{% trans "Submit" %}"/>
 </form>
 {% if form.errors %}
diff --git a/django/sp_sso/templates/registration_form.html b/django/sp_sso/templates/registration_form.html
index ed2222b..05c04a9 100644
--- a/django/sp_sso/templates/registration_form.html
+++ b/django/sp_sso/templates/registration_form.html
@@ -19,7 +19,6 @@
     {% include "registration_field.html" with field=form.email %}
     {% include "registration_field.html" with field=form.s_etablissement %}
     {% include "registration_field.html" with field=form.ep_primary_affiliation %}
-    {% include "registration_field.html" with field=form.ep_affiliation %}
     {% include "registration_field.html" with field=form.s_emp_corps %}
     {% include "registration_field.html" with field=form.s_liste_rouge %}
     </p>