From c9af737962022609d272bd0a1799314cc7c5f32c Mon Sep 17 00:00:00 2001
From: Linty <lintydev@gmail.com>
Date: Thu, 26 Mar 2026 10:10:20 +0100
Subject: [PATCH] fixes #2544 improve AddUser UI layout

Hide AddUser error block on close and make the AddUser popin scrollable with layout fixes. Also refine two French translations (password and login key).
---
 admin/themes/default/js/user_list.js        |  4 +++-
 admin/themes/default/template/user_list.tpl | 25 +++++++++++++++++++--
 language/fr_FR/admin.lang.php               |  2 +-
 language/fr_FR/common.lang.php              |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/admin/themes/default/js/user_list.js b/admin/themes/default/js/user_list.js
index d51c852ca..39479c374 100644
--- a/admin/themes/default/js/user_list.js
+++ b/admin/themes/default/js/user_list.js
@@ -804,7 +804,9 @@ function gen_password() {
 }
 
 function add_user_close() {
-    $("#AddUser").fadeOut();
+    $("#AddUser").fadeOut(() => {
+        $("#AddUser .AddUserErrors").css("visibility", "hidden");
+    });
 }
 
 function add_user_open() {
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index bf57a5b29..e12607768 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -1146,7 +1146,7 @@ $(document).ready(function() {
 <div id="AddUser" class="UserListPopIn">
   <div class="AddUserPopInContainer">
     <a class="icon-cancel CloseUserList CloseAddUser"></a>
-    
+    <div class="AddUserScrollableContent">
     <div class="AddIconContainer">
       <span class="AddIcon icon-blue icon-plus-circled"></span>
     </div>
@@ -1268,6 +1268,7 @@ $(document).ready(function() {
       </div>
       <p class="icon-button" id="AddUserButton"><span class="icon-ok"></span> {'Ok'|@translate}</p>
     </div>
+    </div>
 
   </div>
 </div>
@@ -1920,8 +1921,12 @@ $(document).ready(function() {
   margin-left: 418px;
 }
 
+#AddUser .user-property-select-container {
+  position: relative;
+}
 #AddUser .user-property-select-container::before {
-  margin-left: 328px;
+  margin-left: 0;
+  right: 10px;
 }
 
 .user-action-select-container {
@@ -1953,6 +1958,10 @@ $(document).ready(function() {
   align-self: start;
 }
 
+#AddUser .select-checkbox {
+  position: relative;
+}
+
 /* summary section */
 .edit-user-icons {
   width: 100%;
@@ -2633,6 +2642,18 @@ $(document).ready(function() {
     border-radius:15px;
     align-items:center;
     width: 350px;
+    max-height: 85vh;
+}
+
+.AddUserScrollableContent {
+    overflow-y: auto;
+    overflow-x: hidden;
+    flex: 1;
+    min-height: 0;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 }
 
 #AddUserFieldContainer {
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index d65411763..8a44fd3a4 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -520,7 +520,7 @@ $lang['Subscribe %s'] = "Abonner %s";
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
 $lang['Purge search history'] = "Purger l'historique des recherches";
 $lang['Hide'] = "Masquer";
-$lang['Password is missing. Please enter the password.'] = "Le mot de passe manque. Veuillez saisir le mot de passe.";
+$lang['Password is missing. Please enter the password.'] = 'Veuillez saisir un mot de passe.';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = "La confirmation du mot de passe manque. Veuillez confirmer le mot de passe choisi.";
 $lang['Allow users to edit their own comments'] = "Autoriser les utilisateurs à modifier leurs propres commentaires";
 $lang['Allow users to delete their own comments'] = "Autoriser les utilisateurs à supprimer leurs propres commentaires";
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 132e4623e..df58054ef 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -233,7 +233,7 @@ $lang['Photos posted within the last %d days.'] = 'N\'afficher que les photos r
 $lang['Piwigo Help'] = 'Aide de Piwigo';
 $lang['Play of slideshow'] = 'Lecture du diaporama';
 $lang['Please enter your username or email address.'] = 'Merci d\'entrer votre nom d\'utilisateur ou votre adresse email.';
-$lang['Please, enter a login'] = 'S\'il vous plaît, entrez un nom d\'utilisateur';
+$lang['Please, enter a login'] = 'Veuillez saisir un nom d\'utilisateur.';
 $lang['Post date'] = 'Date d\'ajout';
 $lang['posted after %s (%s)'] = 'mis en ligne après le %s (%s)';
 $lang['posted before %s (%s)'] = 'mis en ligne avant le %s (%s)';