From 6d3c045d00eeccc44756a589d2a4c638e57f5f51 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 22 Nov 2021 16:31:06 +0100 Subject: [PATCH 1/5] Add Copy to clipboard button to shell user account and emailboxes --- interface/web/mail/templates/mail_user_mailbox_edit.htm | 3 +++ interface/web/sites/templates/shell_user_edit.htm | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 170ab15db0..6132790388 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -11,6 +11,9 @@
+ + + diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index c1c23965f1..286d185f6c 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -17,7 +17,11 @@
{tmpl_var name='username_prefix'} - + + + + +
-- GitLab From f10ff6121b472055ed9442b7d966772302e688c7 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 15 Jan 2022 21:45:59 +0100 Subject: [PATCH 2/5] Add translation for !1543 --- interface/lib/lang/ar.lng | 1 + interface/lib/lang/bg.lng | 1 + interface/lib/lang/br.lng | 1 + interface/lib/lang/ca.lng | 3 ++- interface/lib/lang/cz.lng | 1 + interface/lib/lang/de.lng | 3 ++- interface/lib/lang/dk.lng | 3 ++- interface/lib/lang/el.lng | 3 ++- interface/lib/lang/en.lng | 3 ++- interface/lib/lang/es.lng | 1 + interface/lib/lang/fi.lng | 3 ++- interface/lib/lang/fr.lng | 3 ++- interface/lib/lang/hr.lng | 3 ++- interface/lib/lang/hu.lng | 3 ++- interface/lib/lang/id.lng | 3 ++- interface/lib/lang/it.lng | 1 + interface/lib/lang/ja.lng | 3 ++- interface/lib/lang/nl.lng | 1 + interface/lib/lang/pl.lng | 3 ++- interface/lib/lang/pt.lng | 3 ++- interface/lib/lang/ro.lng | 3 ++- interface/lib/lang/ru.lng | 3 ++- interface/lib/lang/se.lng | 3 ++- interface/lib/lang/sk.lng | 3 ++- interface/lib/lang/tr.lng | 3 ++- interface/web/mail/templates/mail_user_mailbox_edit.htm | 2 +- interface/web/sites/templates/shell_user_edit.htm | 2 +- 27 files changed, 45 insertions(+), 20 deletions(-) diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng index 2763f8e82b..45236683fa 100644 --- a/interface/lib/lang/ar.lng +++ b/interface/lib/lang/ar.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; ?> diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng index 94dfaa8ad1..baf5ce64f9 100644 --- a/interface/lib/lang/bg.lng +++ b/interface/lib/lang/bg.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Изтрий XMPP потребител'; $wb['unlimited_txt'] = 'Неограничен'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; ?> diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng index e47df8250d..4485ba15f6 100644 --- a/interface/lib/lang/br.lng +++ b/interface/lib/lang/br.lng @@ -172,3 +172,4 @@ $wb['select_master_directive_snippet_txt'] = 'Diretiva mestre de trechos de cód $wb['unlimited_txt'] = 'Ilimitado'; $wb['server_id_0_error_txt'] = 'Por favor, selecione um servidor válido. O ID do servidor deve ser > 0.'; $wb['datalog_changes_close_txt'] = 'Fechar'; +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng index c57185fd10..c53d3566dd 100644 --- a/interface/lib/lang/ca.lng +++ b/interface/lib/lang/ca.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Illimité'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 04ad86178c..3605e716ff 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -172,3 +172,4 @@ $wb['datalog_status_d_xmpp_user'] = 'Smazat XMPP uživatele'; $wb['unlimited_txt'] = 'Neomezený'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index 11a5e21a5d..684135e9d7 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -172,4 +172,5 @@ $wb['select_master_directive_snippet_txt'] = 'Master Direktiven Schnipsel'; $wb['unlimited_txt'] = 'unlimitiert'; $wb['server_id_0_error_txt'] = 'Bitte Server auswählen. Server ID muss > als 0 sein.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/dk.lng b/interface/lib/lang/dk.lng index 9d09f1dc8d..da6fa6e385 100644 --- a/interface/lib/lang/dk.lng +++ b/interface/lib/lang/dk.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Ubegrænset'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index 31829d5f93..984ed1802e 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Απεριόριστα'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index dbffc95b8c..a9c700e887 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -173,4 +173,5 @@ $wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng index 3a421e7af5..c9d0a8359a 100644 --- a/interface/lib/lang/es.lng +++ b/interface/lib/lang/es.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Borrar usuario XMPP'; $wb['unlimited_txt'] = 'Ilimitado'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Cerrar'; +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; ?> diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng index f6648e88c6..956bf97197 100644 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng index 15e8294e0c..dff165d44b 100644 --- a/interface/lib/lang/fr.lng +++ b/interface/lib/lang/fr.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Illimité'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng index fdb09cbff5..8008a206a4 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'neograničeno'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng index 8e65d4c974..4119b7d792 100644 --- a/interface/lib/lang/hu.lng +++ b/interface/lib/lang/hu.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Korlátlan'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng index 693ca49015..69af657768 100644 --- a/interface/lib/lang/id.lng +++ b/interface/lib/lang/id.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Tak terbatas'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng index 1333cc907f..1f9b2dc475 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Elimina utente XMPP'; $wb['unlimited_txt'] = 'illimitati'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Chiudi'; +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; ?> diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng index 2d24f9a1f7..6ba56d3720 100644 --- a/interface/lib/lang/ja.lng +++ b/interface/lib/lang/ja.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index 3af436ca48..2fa026b293 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Ongelimiteerd'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Sluiten'; +$wb['copy_to_clipboard_txt'] = 'Kopieer naar klembord'; ?> diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index 4a1cd0384e..fbbf8fee52 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'nielimitowane'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng index 86d4442c42..5caa31bde0 100644 --- a/interface/lib/lang/pt.lng +++ b/interface/lib/lang/pt.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng index 4f032832eb..d96e9c67ae 100644 --- a/interface/lib/lang/ro.lng +++ b/interface/lib/lang/ro.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng index 2d18c9f628..199f64420c 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Удалить пользователя XMP $wb['unlimited_txt'] = 'Безлимитный'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng index 5e8b3c7123..4d9de1d535 100644 --- a/interface/lib/lang/se.lng +++ b/interface/lib/lang/se.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Obegränsat'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng index cab3ea1f8f..33d742b213 100644 --- a/interface/lib/lang/sk.lng +++ b/interface/lib/lang/sk.lng @@ -172,4 +172,5 @@ $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user'; $wb['unlimited_txt'] = 'Unlimited'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng index 041c8d7103..29df3800ce 100644 --- a/interface/lib/lang/tr.lng +++ b/interface/lib/lang/tr.lng @@ -173,4 +173,5 @@ $wb['select_master_directive_snippet_txt'] = 'Ana Komut Parçaları'; $wb['unlimited_txt'] = 'Sınırsız'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +$wb['copy_to_clipboard_txt'] = 'Copy to clipboard'; +?> diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 6132790388..20e7ac16ad 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -11,7 +11,7 @@
- + diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 286d185f6c..5e5a07a482 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -18,7 +18,7 @@
{tmpl_var name='username_prefix'} - + -- GitLab From 25734a972b42268764f857dfc514fad36c5543d0 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 16 Jan 2022 12:26:04 +0100 Subject: [PATCH 3/5] Use font-awesome --- interface/web/mail/templates/mail_user_mailbox_edit.htm | 2 +- interface/web/sites/templates/shell_user_edit.htm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 20e7ac16ad..6804677f44 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -12,7 +12,7 @@
- + diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 5e5a07a482..e96986a9fd 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -19,7 +19,7 @@ {tmpl_var name='username_prefix'} - + -- GitLab From 4a9f875f19157b620245a711099d229937569d0f Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 17 Feb 2022 23:27:32 +0100 Subject: [PATCH 4/5] Replace the separate button by an onCLick event on the @ This works around the styling issue. --- interface/web/mail/templates/mail_user_mailbox_edit.htm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 6804677f44..4e1cbc522d 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -7,13 +7,10 @@
- @ + @
- - -
-- GitLab From fe25cf93770c252d777fc983b6cbea91bfee0fd4 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Tue, 17 May 2022 23:16:47 +0200 Subject: [PATCH 5/5] Back to a button, now with proper styling thanks to @pixcept --- interface/web/mail/templates/mail_user_mailbox_edit.htm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 4e1cbc522d..4b47b9ecc5 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -7,10 +7,15 @@
- @ + @
+
+ i + + +
-- GitLab