fixes #1244 easier exit

easier exit out of the group list window via escp or right click outside, also added clearer message of whichi user is added when adding a user inside a group
This commit is contained in:
Louis
2020-10-27 18:20:12 +01:00
parent f8f219b6ee
commit 5b352275be
3 changed files with 17 additions and 2 deletions
+4 -1
View File
@@ -822,6 +822,7 @@ var getUserDisplay = function(username, user_id, grp_id) {
dissociateUserInfo.find("p").html(str);
dissociateUserInfo.fadeIn()
$(".UsernameBlock").css("margin-right", "10px").css("border", "none");
userBlock.remove()
updateUserSearch();
@@ -884,7 +885,9 @@ $(".AddUserBlock button").on("click", function () {
let userBlock = getUserDisplay(username, id, grp_id).prependTo(".UsersInGroupList");
dissociateUserInfo.fadeOut()
$(".UsernameBlock:first").css("margin-right", "0px").css("border", "2px solid #c2f5c2");
$(".UsernameBlock").slice(1).css("margin-right", "10px").css("border", "none");
associateUserInfo.remove()
associateUserInfo.insertAfter(userBlock);
associateUserInfo.find("p").html(str_user_associated);
@@ -22,6 +22,17 @@ var str_other_copy = '{' (copy %s)'|@translate}'
var serverKey = '{$CACHE_KEYS.users}'
var serverId = '{$CACHE_KEYS._hash}'
var rootUrl = '{$ROOT_URL}'
$(document).on('keydown', function (e) {
if ( e.keyCode === 27) { // ESC button
$("#UserList").fadeOut();
}
})
$(document).on('click', function (e) {
if ($(e.target).closest(".UserListPopInContainer").length === 0) {
$("#UserList").fadeOut();
}
});
{/footer_script}
{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
+2 -1
View File
@@ -4268,7 +4268,8 @@ input:checked + .slider:before {
font-size:12px;
text-align:left;
padding: 4px 6px;
border-radius:10px;
border-top-right-radius:10px;
border-bottom-right-radius:10px;
margin-left:-5px;
margin-right:10px;
}