From 66a124d842f42202374b8353318144a871ec1f80 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 27 Aug 2020 21:30:37 +0200
Subject: [PATCH] Partial rework of the user create view

---
 src/js/yunohost/controllers/users.js |  4 ++--
 src/locales/en.json                  |  2 +-
 src/views/user/user_create.ms        | 34 ++++++++++++++--------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/js/yunohost/controllers/users.js b/src/js/yunohost/controllers/users.js
index fe70d9d7..803096a2 100644
--- a/src/js/yunohost/controllers/users.js
+++ b/src/js/yunohost/controllers/users.js
@@ -204,8 +204,8 @@
             c.view('user/user_create', data, function(){
                 var usernameField = $('#username');
                 usernameField.on('input', function(){
-                    var emailField = $('#email');
-                    emailField.val(usernameField.val());
+                    var emailLeft = $('#email-left');
+                    emailLeft.html(usernameField.val());
                 });
             });
         });
diff --git a/src/locales/en.json b/src/locales/en.json
index 33c9f225..240184a8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -104,7 +104,6 @@
     "domain_visit": "Visit",
     "domain_visit_url": "Visit %s",
     "domains": "Domains",
-    "email_info": "The main email adress must start with the username, nevertheless you can add additional email adresses (aliases) after creating the user.",
     "enable": "Enable",
     "enabled": "Enabled",
     "error_modify_something": "You should modify something",
@@ -270,6 +269,7 @@
     "system_upgrade_all_applications_btn": "Upgrade all applications",
     "system_upgrade_all_packages_btn": "Upgrade all packages",
     "tcp": "TCP",
+    "tip_about_user_email": "Users are created with an associated email address (and XMPP account) with the format username@domain.tld. Additional email aliases and email forwards can later be added by the admin and the user.",
     "tools": "Tools",
     "tools_adminpw": "Change administration password",
     "tools_adminpw_confirm_placeholder": "Confirm the new password",
diff --git a/src/views/user/user_create.ms b/src/views/user/user_create.ms
index 6334e42d..ff7d34c3 100644
--- a/src/views/user/user_create.ms
+++ b/src/views/user/user_create.ms
@@ -28,11 +28,26 @@
             </div>
         </div>
         <hr>
+        <div class="alert alert-warning col-sm-offset-3 col-sm-9"><i class="fa fa-lock fa-fw"></i> {{t 'good_practices_about_user_password'}}</div>
+        <div class="form-group">
+            <label for="password" class="col-sm-3 control-label">{{t 'password'}}</label>
+            <div class="col-sm-9">
+                <input type="password" id="password" name="password" class="form-control" placeholder="••••••••••" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="confirmation" class="col-sm-3 control-label">{{t 'password_confirmation'}}</label>
+            <div class="col-sm-9">
+                <input type="password" id="confirmation" name="confirmation" class="form-control" placeholder="••••••••••" required>
+            </div>
+        </div>
+        <hr>
+        <div class="alert alert-info col-sm-offset-3 col-sm-9"><i class="fa fa-envelope fa-fw"></i> {{t 'tip_about_user_email'}}</div>
         <div class="form-group">
             <label for="mail" class="col-sm-3 control-label">{{t 'user_email'}}</label>
             <div class="clearfix visible-xs"></div>
             <div class="col-sm-4 col-xs-6">
-                <input type="text" id="email" name="email" class="form-control" placeholder="johndoe" data-toogle="tooltip" data-placement="top" title="{{t 'email_info'}}" disabled>
+                <p id="email-left" class="form-control-static" style="text-align:right;">johndoe</p>
 	    </div>
             <div class="col-sm-5 col-xs-6">
                <select class="form-control" name="domain">
@@ -42,7 +57,6 @@
                </select>
             </div>
         </div>
-        <hr>
         <div class="form-group">
             <label for="mailbox-quota" class="col-sm-3 control-label">{{t 'user_mailbox_quota'}}</label>
             <div class="col-sm-4">
@@ -50,24 +64,10 @@
                     <input type="number" min="0" id="mailbox-quota" name="mailbox_quota" class="form-control" placeholder="{{t 'mailbox_quota_placeholder'}}">
                     <div class="input-group-addon">M</div>
                 </div>
-            </div>
-            <div class="col-sm-5">
                 <div class="help-block quota-help-block">{{t 'mailbox_quota_description'}}</div>
             </div>
         </div>
-        <div class="form-group">
-            <label for="password" class="col-sm-3 control-label">{{t 'password'}}</label>
-            <div class="col-sm-9">
-                <input type="password" id="password" name="password" class="form-control" placeholder="•••••" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label for="confirmation" class="col-sm-3 control-label">{{t 'password_confirmation'}}</label>
-            <div class="col-sm-9">
-                <input type="password" id="confirmation" name="confirmation" class="form-control" placeholder="•••••" required>
-                <div class="help-block">{{t 'good_practices_about_user_password'}}</div>
-            </div>
-        </div>
+
     </div>
 </div>