From 5803c76f4d2b9cd289e96ca7bde07b783e22acbe Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Thu, 7 Oct 2021 13:39:05 +0200 Subject: [PATCH] fixes #1505 Smaller add user popin --- admin/themes/clear/theme.css | 2 +- admin/themes/default/js/user_list.js | 12 +++---- admin/themes/default/template/user_list.tpl | 36 ++++++++++++++------- admin/themes/roma/theme.css | 2 +- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index a50a1b5b4..e16d43045 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -27,7 +27,7 @@ input[type="radio"], input[type="checkbox"] { background-color: transparent; } -INPUT[type="text"], INPUT[type="password"], INPUT[type="file"] { +INPUT[type="text"], INPUT[type="file"] { background-color: #ddd; } diff --git a/admin/themes/default/js/user_list.js b/admin/themes/default/js/user_list.js index a156afa10..9a178ba74 100644 --- a/admin/themes/default/js/user_list.js +++ b/admin/themes/default/js/user_list.js @@ -129,12 +129,10 @@ $( document ).ready(function() { $(this).removeClass("icon-eye"); $(this).addClass("icon-eye-off"); $("#AddUserPassword").get(0).type = "text"; - $(this).html(hide_str) } else { $(this).removeClass("icon-eye-off"); $(this).addClass("icon-eye"); $("#AddUserPassword").get(0).type = "password"; - $(this).html(show_str) } }) /* Action */ @@ -1567,9 +1565,9 @@ function add_user() { let ajax_data = { pwg_token: pwg_token, } - ajax_data.username = $('.AddUserLabelUsername .AddUserInput').val(); + ajax_data.username = $('.AddUserLabelUsername .user-property-input').val(); ajax_data.password = $('#AddUserPassword').val(); - ajax_data.email = $(".AddUserLabelEmail .AddUserInput").val(); + ajax_data.email = $(".AddUserLabelEmail .user-property-input").val(); ajax_data.send_password_by_mail = $('.user-list-checkbox[name="send_by_email"]').attr("data-selected") == "1" ? true : false; jQuery.ajax({ url: "ws.php?format=json&method=pwg.users.add", @@ -1577,8 +1575,8 @@ function add_user() { data: ajax_data, beforeSend: function() { $("#AddUser .AddUserErrors").css("visibility", "hidden"); - if ($(".AddUserLabelUsername .AddUserInput").val() == "") { - $("#AddUser .AddUserErrors p").html('✘ '+missingUsername); + if ($(".AddUserLabelUsername .user-property-input").val() == "") { + $("#AddUser .AddUserErrors").html(missingUsername); $("#AddUser .AddUserErrors").css("visibility", "visible"); return false; } @@ -1589,7 +1587,7 @@ function add_user() { let new_user_id = data.result.users[0].id; update_user_list(); add_user_close(); - $("#AddUser .AddUserInput").val(""); + $("#AddUser .user-property-input").val(""); $("#AddUserSuccess .edit-now").unbind("click").click(() => { last_user_id = new_user_id; last_user_index = get_container_index_from_uid(new_user_id); diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index e61ec5c46..6642e57a6 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -856,17 +856,17 @@ $(".icon-help-circled").tipTip({ {'Add a new user'|@translate}
-
- - {'Show'|@translate} + +
- +
{'Generate random password'|@translate} @@ -874,8 +874,8 @@ $(".icon-help-circled").tipTip({
-
@@ -886,8 +886,7 @@ $(".icon-help-circled").tipTip({ {'Send connection settings by email'|translate}
-
-

X

+
@@ -907,6 +906,12 @@ $(".icon-help-circled").tipTip({ cursor: help; } +#show_password { + position: absolute; + left: 240px; + top: 29px; +} + /* general */ .no-flex-grow { flex-grow:0 !important; @@ -1347,6 +1352,10 @@ $(".icon-help-circled").tipTip({ border:none; } +{* .AddUserPopInContainer .user-property-input { + background-color: #F3F3F3; +} *} + .user-property-button { margin-top:0; font-size:1.1em; @@ -1701,14 +1710,15 @@ $(".icon-help-circled").tipTip({ top: 50%; transform:translate(-50%, -48%); text-align:left; - padding:40px; + padding:20px; flex-direction:column; border-radius:15px; align-items:center; - width: min-content; + width: 270px; } .AddIconContainer { + margin-top: 10px; } .AddIcon { @@ -1718,10 +1728,11 @@ $(".icon-help-circled").tipTip({ } .AddIconTitle { - font-size:1.7em; + font-size:1.4em; font-weight:bold; margin-bottom:20px; margin-top:15px; + text-align: center; } .AddUserInputContainer { @@ -1745,6 +1756,7 @@ $(".icon-help-circled").tipTip({ .AddUserPasswordWrapper { display:flex; justify-content:space-between; + position: relative; } .AddUserPasswordWrapper span { diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index c5c5bae58..6986931f3 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -1562,7 +1562,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; } .AddUserPopInContainer { - background-color: #333; + background-color: #444; } .AddUserPopInContainer .AddIconTitle {