From e6446a608817e7ccbab0967f347be25eb5967e1f Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Tue, 17 Feb 2026 17:28:49 +0100 Subject: [PATCH 1/9] change tooltip to existing Dictionary key --- .../main/webapp/templates/celMacros/userAdmin/col_sendMail.vm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm index dd285bc9..a70ce611 100644 --- a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm +++ b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm @@ -1,4 +1,6 @@ #set($userFN = $services.reference.serialize($doc.getDocumentReference())) #set($userAdminDocRef = $services.reference.create().space('Content').doc('UserAdmin').build()) #set($params = "xpage=celements_ajax&ajax_mode=userAdmin/sendActivationMail&user=$userFN") - + + + From c113cb4bee6ba837ae0c9a3ce68d9a9579b41321 Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Tue, 17 Feb 2026 17:29:32 +0100 Subject: [PATCH 2/9] hide subtitle for user search and add max-width to userAdmin --- .../src/main/webapp/resources/celRes/userAdmin/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css index ff152839..1758b607 100644 --- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css +++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css @@ -14,6 +14,7 @@ display: flex; flex-flow: column; margin: 0px 2%; + max-width: 1536px; } #userAdmin *, #userAdminEdit *{ @@ -58,6 +59,9 @@ font-weight: 600; margin: 0px; } +#cell\:celements2web\.\.UserAdmin\.subtitleSearch { + display: none; +} #userAdmin li, #userAdmin a, #userAdminEdit a, From c55643f2c720f8d35178edace23432e3274bfd21 Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Tue, 17 Feb 2026 17:58:53 +0100 Subject: [PATCH 3/9] change spacing and min-width of table --- .../src/main/webapp/resources/celRes/userAdmin/table.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css index 7dc838cc..8c040889 100644 --- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css +++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css @@ -3,7 +3,7 @@ display: flex; flex-flow: column; gap: 3px; - min-width: 930px; + min-width: 975px; } #searchoutput .struct_table ul.struct_table_header, #searchoutput .struct_table ul.struct_table_data { @@ -29,8 +29,8 @@ display: flex; flex-flow: row wrap; align-items: flex-start; - padding: 3px 0px; - gap: 0px 3px; + padding: 5px 0px; + gap: 0px 5px; } #searchoutput .struct_table ul.struct_table_data li.struct_table_row:hover, #searchoutput .struct_table ul.struct_table_data li.struct_table_row.open { From 21de0f588fafa25dc2c95c8df1cb9b7b17030e14 Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Thu, 19 Feb 2026 13:39:54 +0100 Subject: [PATCH 4/9] remove url for disabled link --- .../webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs new file mode 100644 index 00000000..e69de29b From 98506c3a866c9759eb766594219bc2f7d1f4b23a Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Thu, 19 Feb 2026 14:22:36 +0100 Subject: [PATCH 5/9] move col_delete to disc and add disabled class to delete action for logged in user --- .../webapp/templates/celMacros/userAdmin/col_delete.vm | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm diff --git a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm new file mode 100644 index 00000000..eba8e2a0 --- /dev/null +++ b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm @@ -0,0 +1,10 @@ +#set($iconDeleteCssClass = "fa-solid fa-trash-can") +#set($xredirect = "/app/cel/admin/UserAdmin") +#set($xcancel = "/app/cel/admin/UserAdmin") +#set($userDocRef = $services.reference.resolveDocRef(${context.getUser()})) +#if($userDocRef == $doc.getDocumentReference()) + #set($isDisabled = true) +#else + #set($isDisabled = false) +#end +#parse('celStruct/table/col_delete.vm') \ No newline at end of file From 41f0770422654f50ac815e0cdb81ee08e5af6f27 Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Thu, 19 Feb 2026 14:22:54 +0100 Subject: [PATCH 6/9] add css for disabled class on delete action --- .../src/main/webapp/resources/celRes/userAdmin/table.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css index 8c040889..b7365ed4 100644 --- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css +++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css @@ -92,6 +92,10 @@ #searchoutput .struct_table .column_sendMail a.icon-link:hover { color: var(--accent-color); } +#searchoutput .struct_table .column_delete a.icon-link.disabled { + pointer-events: none; + color: gray; +} #searchoutput .struct_table ul li.struct_table_row .editContentRTE { display: flex; flex-flow: column; From 35a8c9137ed0055cfc2538971fc683de9fe61042 Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Thu, 19 Feb 2026 14:43:45 +0100 Subject: [PATCH 7/9] redesign add user button --- .../resources/celRes/userAdmin/buttonRow.css | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css index add11402..5963fb1b 100644 --- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css +++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css @@ -11,19 +11,27 @@ } #userAdminActionRow .actionButtonLarge a { - align-content: center; text-decoration: none; + display: flex; + flex-flow: row; + align-items: center; + gap: 7px; + color: black; +} + +#userAdminActionRow .actionButtonLarge a:hover { + color: var(--accent-color); } #userAdminActionRow .actionButtonLarge a i { - width: 30px; - height: 30px; + width: 26px; + height: 26px; align-content: center; text-align: center; - border-radius: 20px; + border-radius: 13px; border: 2px solid var(--accent-color); color: var(--accent-color); - font-size: 20px; + font-size: 18px; } #userAdminActionRow .actionButtonLarge a:hover i { From 6cd209ea7726e710d9fce72139c7fad636bfa13a Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Thu, 19 Feb 2026 15:20:43 +0100 Subject: [PATCH 8/9] add doubleclickEditAction.mjs --- .../resources/celJS/userAdmin/doubleclickEditAction.mjs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs index e69de29b..88080948 100644 --- a/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs +++ b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs @@ -0,0 +1,8 @@ +const editUser = (li, event) => { + const url = li.querySelector('.column_edit a').href; + window.location.href = url; +}; + +document.querySelectorAll('li.struct_table_row').forEach((li) => { + li.addEventListener('dblclick', (event) => (editUser(li, event))); +}); \ No newline at end of file From 7f0217ba712f2ed054d9aaf545e184a01ffa6ddb Mon Sep 17 00:00:00 2001 From: Chantal Pichler Date: Thu, 19 Feb 2026 15:49:42 +0100 Subject: [PATCH 9/9] add missing eofs --- .../webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs | 2 +- .../src/main/webapp/templates/celMacros/userAdmin/col_delete.vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs index 88080948..0c12ecff 100644 --- a/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs +++ b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs @@ -5,4 +5,4 @@ const editUser = (li, event) => { document.querySelectorAll('li.struct_table_row').forEach((li) => { li.addEventListener('dblclick', (event) => (editUser(li, event))); -}); \ No newline at end of file +}); diff --git a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm index eba8e2a0..2b4eb5ca 100644 --- a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm +++ b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm @@ -7,4 +7,4 @@ #else #set($isDisabled = false) #end -#parse('celStruct/table/col_delete.vm') \ No newline at end of file +#parse('celStruct/table/col_delete.vm')