From abaa9c66ce450e1f2ddb182f310013e226a6f858 Mon Sep 17 00:00:00 2001
From: kitoy <kitoy@kitoy.me>
Date: Wed, 19 Jul 2023 01:38:55 +0200
Subject: [PATCH] Correction Formulaire inscription

---
 templates/inscription.html | 31 ++++++++++++++++++-------------
 views/inscription.py       |  6 +++---
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/templates/inscription.html b/templates/inscription.html
index 5f577ba..5f2866f 100644
--- a/templates/inscription.html
+++ b/templates/inscription.html
@@ -27,20 +27,25 @@
             <br>
 
                 {% if signin_enable  %}
-            <form method="POST" action="{{ url_inscription }}">
+            <form method="POST" class="form-horizontal" action="{{ url_inscription }}">
+	      <h4> Choisissez votre nom d'utilisateur pour vous connecter sur le portail pywallter </h4>
                     <input type="text" name="user" id="user" placeholder="Pseudo" class="form-control"><br />
-                    {% if MAIL_SERVER %}
-                    <div class="col-sm-7">
-                        <input type="text" name="mail" id="mail" placeholder="Adresse mail" class="form-control" size="2"> <br/>
-                    </div>
-                    <h4>@{{hostname}}</h4>
-                    <br/>
-                    {% endif %}
-                <input type="password" name="passwd" id="passwd" placeholder="Mot de passe" class="form-control"><br />
-                <input type="password" name="passwdconfirm" id="passwdconfirm" placeholder="Confirmation du mot de passe" class="form-control"><br />
-                <br>
-                <button id="tada" class="btn btn-default btn-primary" type="submit">Envoyer</button>
-                </form>
+                    {% if MAIL_SERVER or XMPP_SERVER %}
+		    <h4> Choisissez votre adresse sur ce serveur (Entrez juste le nom pas besoin de préciser le domaine) </h4>
+	      <p> Par exemple vous voulez toto@{{hostname}}; vous entrez juste toto :) </p>
+	      <div class="form-group">
+	      <div class="col-sm-7">
+		      <input type="text" name="mail" id="mail" placeholder="Adresse mail" class="form-control"> 
+	      </div>
+                   <label class="control-label col-sm-2" for="pwd">@{{ hostname }}</label>
+	  </div>
+		    {% endif %}
+		    
+          <input type="password" name="passwd" id="passwd" placeholder="Mot de passe" class="form-control"><br />
+          <input type="password" name="passwdconfirm" id="passwdconfirm" placeholder="Confirmation du mot de passe" class="form-control"><br />
+          <br>
+          <button id="tada" class="btn btn-default btn-primary" type="submit">Envoyer</button>
+          </form>
                 {% else %}
                 <p class="lead">
                     Désolé les inscriptions ne sont pas activés sur le serveur
diff --git a/views/inscription.py b/views/inscription.py
index 16da26d..fb28204 100644
--- a/views/inscription.py
+++ b/views/inscription.py
@@ -41,7 +41,7 @@ def signin(token) :
                                    signin_enable=app.config['SIGNIN_ENABLE'],
                                    token=token, hostname=hostname,
                                    url_inscription=url_inscription,
-                                   MAIL_SERVER=MAIL_SERVER)
+                                   MAIL_SERVER=MAIL_SERVER, XMPP_SERVER=XMPP_SERVER)
 
 
             if request.method == 'POST':
@@ -57,7 +57,7 @@ def signin(token) :
                                                signin_enable=app.config['SIGNIN_ENABLE'],
                                                token=token, hostname=hostname,
                                                url_inscription=url_inscription,
-                                               MAIL_SERVER=MAIL_SERVER)
+                                               MAIL_SERVER=MAIL_SERVER, XMPP_SEVER=XMPP_SERVER)
                 else:
                    if len(request.form['user']) == 0 or \
                       len(request.form['passwd']) == 0 or \
@@ -68,7 +68,7 @@ def signin(token) :
                                               signin_enable=app.config['SIGNIN_ENABLE'],
                                               token=token, hostname=hostname,
                                               url_inscription=url_inscription,
-                                              MAIL_SERVER=MAIL_SERVER)
+                                              MAIL_SERVER=MAIL_SERVER, XMPP_SERVER=XMPP_SERVER)
 
                 user = request.form['user']
                 passwd = request.form['passwd']