From 2a189307eb0a6693a8d64b62e3845ca87c58d1eb Mon Sep 17 00:00:00 2001 From: ftimme Date: Fri, 18 May 2012 12:34:18 +0000 Subject: [PATCH] - Added "Repeat Password" field to all forms where a password has to be set. --- interface/web/admin/lib/lang/de_remote_user.lng | 3 +++ interface/web/admin/lib/lang/de_users.lng | 3 +++ interface/web/admin/lib/lang/en_remote_user.lng | 3 +++ interface/web/admin/lib/lang/en_users.lng | 3 +++ .../web/admin/templates/remote_user_edit.htm | 8 +++++++- .../web/admin/templates/users_user_edit.htm | 8 +++++++- interface/web/client/lib/lang/de_client.lng | 3 +++ interface/web/client/lib/lang/de_reseller.lng | 3 +++ interface/web/client/lib/lang/en_client.lng | 3 +++ interface/web/client/lib/lang/en_reseller.lng | 3 +++ .../client/templates/client_edit_address.htm | 8 +++++++- .../client/templates/reseller_edit_address.htm | 8 +++++++- interface/web/js/scrigo.js.php | 17 +++++++++++++++++ .../web/mail/lib/lang/de_mail_mailinglist.lng | 3 +++ interface/web/mail/lib/lang/de_mail_user.lng | 7 +++++-- .../web/mail/lib/lang/en_mail_mailinglist.lng | 3 +++ interface/web/mail/lib/lang/en_mail_user.lng | 3 +++ .../mail/templates/mail_mailinglist_edit.htm | 8 +++++++- .../mail/templates/mail_user_mailbox_edit.htm | 8 +++++++- .../mailuser/lib/lang/en_mail_user_password.lng | 4 ++++ .../templates/mail_user_password_edit.htm | 8 +++++++- interface/web/sites/lib/lang/de_database.lng | 2 ++ interface/web/sites/lib/lang/de_ftp_user.lng | 3 +++ interface/web/sites/lib/lang/de_shell_user.lng | 3 +++ interface/web/sites/lib/lang/de_web_domain.lng | 3 +++ .../web/sites/lib/lang/de_web_folder_user.lng | 3 +++ interface/web/sites/lib/lang/de_webdav_user.lng | 3 +++ interface/web/sites/lib/lang/en_database.lng | 3 +++ interface/web/sites/lib/lang/en_ftp_user.lng | 3 +++ interface/web/sites/lib/lang/en_shell_user.lng | 3 +++ interface/web/sites/lib/lang/en_web_domain.lng | 3 +++ .../web/sites/lib/lang/en_web_folder_user.lng | 3 +++ interface/web/sites/lib/lang/en_webdav_user.lng | 3 +++ interface/web/sites/templates/database_edit.htm | 8 +++++++- interface/web/sites/templates/ftp_user_edit.htm | 8 +++++++- .../web/sites/templates/shell_user_edit.htm | 8 +++++++- .../web/sites/templates/web_domain_stats.htm | 8 +++++++- .../sites/templates/web_folder_user_edit.htm | 8 +++++++- .../web/sites/templates/webdav_user_edit.htm | 8 +++++++- .../web/themes/default/css/screen/uni-form.css | 4 ++-- .../web/tools/lib/lang/de_usersettings.lng | 3 +++ .../web/tools/lib/lang/en_usersettings.lng | 3 +++ interface/web/tools/templates/user_settings.htm | 12 +++++++----- interface/web/tools/user_settings.php | 2 +- interface/web/vm/lib/lang/de_openvz_vm.lng | 1 - interface/web/vm/lib/lang/en_openvz_vm.lng | 1 - interface/web/vm/templates/openvz_vm_edit.htm | 2 +- 47 files changed, 202 insertions(+), 26 deletions(-) diff --git a/interface/web/admin/lib/lang/de_remote_user.lng b/interface/web/admin/lib/lang/de_remote_user.lng index 3bf7e6219..036eda2c6 100644 --- a/interface/web/admin/lib/lang/de_remote_user.lng +++ b/interface/web/admin/lib/lang/de_remote_user.lng @@ -41,4 +41,7 @@ $wb['DNS srv functions'] = 'DNS srv Funktionen'; $wb['DNS txt functions'] = 'DNS txt Funktionen'; $wb['Mail mailing list functions'] = 'Mail mailinglist functions'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng index 6145d1f6a..1ead952e5 100644 --- a/interface/web/admin/lib/lang/de_users.lng +++ b/interface/web/admin/lib/lang/de_users.lng @@ -26,4 +26,7 @@ $wb['username_unique'] = 'Es gibt bereits einen Benutzer mit diesem Namen'; $wb['startmodule_err'] = 'Start Modul ist nicht innerhalb der Module.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/admin/lib/lang/en_remote_user.lng b/interface/web/admin/lib/lang/en_remote_user.lng index 6883c11de..c488f6551 100644 --- a/interface/web/admin/lib/lang/en_remote_user.lng +++ b/interface/web/admin/lib/lang/en_remote_user.lng @@ -41,4 +41,7 @@ $wb['DNS rp functions'] = 'DNS rp functions'; $wb['DNS srv functions'] = 'DNS srv functions'; $wb['DNS txt functions'] = 'DNS txt functions'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng index 573f18a67..c6a418e0f 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -26,4 +26,7 @@ $wb["groups_txt"] = 'Groups'; $wb["default_group_txt"] = 'Default Group'; $wb["startmodule_err"] = 'Start module is not within modules.'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/admin/templates/remote_user_edit.htm b/interface/web/admin/templates/remote_user_edit.htm index 945a29714..6aa3a31b3 100644 --- a/interface/web/admin/templates/remote_user_edit.htm +++ b/interface/web/admin/templates/remote_user_edit.htm @@ -13,13 +13,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +

{tmpl_var name='function_txt'}

diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm index 40622ef25..fffb766bb 100644 --- a/interface/web/admin/templates/users_user_edit.htm +++ b/interface/web/admin/templates/users_user_edit.htm @@ -11,13 +11,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +

{tmpl_var name='modules_txt'}

diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 88adbff4b..d2b5201db 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -119,4 +119,7 @@ $wb["cron_job_limits_txt"] = 'Cron Job-Limits'; $wb["dns_limits_txt"] = 'DNS-Limits'; $wb["virtualization_limits_txt"] = 'Virtualisierungs-Limits'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index e938cde18..8fe5e4264 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -114,4 +114,7 @@ $wb["cron_job_limits_txt"] = 'Cron Job-Limits'; $wb["dns_limits_txt"] = 'DNS-Limits'; $wb["virtualization_limits_txt"] = 'Virtualisierungs-Limits'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index d8b3c2c88..d809fcb64 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -122,4 +122,7 @@ $wb["cron_job_limits_txt"] = 'Cron Job Limits'; $wb["dns_limits_txt"] = 'DNS Limits'; $wb["virtualization_limits_txt"] = 'Virtualization Limits'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index ba2e7bbdd..433721605 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -116,4 +116,7 @@ $wb["cron_job_limits_txt"] = 'Cron Job Limits'; $wb["dns_limits_txt"] = 'DNS Limits'; $wb["virtualization_limits_txt"] = 'Virtualization Limits'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm index 5799d863d..2c37a97df 100644 --- a/interface/web/client/templates/client_edit_address.htm +++ b/interface/web/client/templates/client_edit_address.htm @@ -23,13 +23,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +
 {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +
 {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ + diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 9a89f1e7f..0bc7d87d0 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -23,13 +23,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +

 MB

diff --git a/interface/web/mailuser/lib/lang/en_mail_user_password.lng b/interface/web/mailuser/lib/lang/en_mail_user_password.lng index 77e68419d..43c114a81 100644 --- a/interface/web/mailuser/lib/lang/en_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/en_mail_user_password.lng @@ -3,4 +3,8 @@ $wb["mailbox_password_txt"] = 'Mailbox password'; $wb["password_txt"] = 'Password'; $wb["password_strength_txt"] = 'Password strength'; $wb["email_txt"] = 'Email'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> \ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm index c8f5ba9b8..ed1d7ce75 100644 --- a/interface/web/mailuser/templates/mail_user_password_edit.htm +++ b/interface/web/mailuser/templates/mail_user_password_edit.htm @@ -11,13 +11,19 @@
- +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ + diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index dce54bb3c..778346eb1 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -23,4 +23,6 @@ $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['database_name_error_len'] = 'Datenbank Name - {db} - zu lang. Die max. Datenbank Namen Länge inkl. Präfix ist 64 Zeichen.'; $wb['database_user_error_len'] = 'Datenbank Benutzername - {user}- zu lang. Die max. Datenbank Benutzernamen Länge inkl. Präfix ist 16 Zeichen.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb["btn_save_txt"] = 'Speichern'; +$wb["btn_cancel_txt"] = 'Abbrechen'; ?> diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng index 13af04924..c977b658f 100644 --- a/interface/web/sites/lib/lang/de_ftp_user.lng +++ b/interface/web/sites/lib/lang/de_ftp_user.lng @@ -28,4 +28,7 @@ $wb['quota_size_error_regex'] = 'Quota: Geben Sie -1 ein für unlimitiert oder e $wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.'; $wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng index fb0a33038..ccf204b76 100644 --- a/interface/web/sites/lib/lang/de_shell_user.lng +++ b/interface/web/sites/lib/lang/de_shell_user.lng @@ -23,4 +23,7 @@ $wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (für key-basierte Logins)'; $wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.'; $wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 4fb8bed33..15d7d1987 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -99,4 +99,7 @@ $wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout mu $wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.'; $wb["pm_ondemand_hint_txt"] = 'Bitte beachten Sie, daß Ihre PHP-Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP-Version auswählen, wird PHP nicht mehr starten!'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/sites/lib/lang/de_web_folder_user.lng b/interface/web/sites/lib/lang/de_web_folder_user.lng index e53e00733..1bea0dc86 100644 --- a/interface/web/sites/lib/lang/de_web_folder_user.lng +++ b/interface/web/sites/lib/lang/de_web_folder_user.lng @@ -5,4 +5,7 @@ $wb['password_txt'] = 'Passwort'; $wb['active_txt'] = 'Aktiv'; $wb['folder_error_empty'] = 'Kein Web-Ordner ausgewählt.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/sites/lib/lang/de_webdav_user.lng b/interface/web/sites/lib/lang/de_webdav_user.lng index e69877556..6eef2e7ba 100644 --- a/interface/web/sites/lib/lang/de_webdav_user.lng +++ b/interface/web/sites/lib/lang/de_webdav_user.lng @@ -15,4 +15,7 @@ $wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.'; $wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.'; $wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng index 8c12d1101..3d21df9d0 100644 --- a/interface/web/sites/lib/lang/en_database.lng +++ b/interface/web/sites/lib/lang/en_database.lng @@ -28,4 +28,7 @@ $wb["select_site_txt"] = '- Select Site -'; $wb["btn_save_txt"] = 'Save'; $wb["btn_cancel_txt"] = 'Cancel'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/sites/lib/lang/en_ftp_user.lng b/interface/web/sites/lib/lang/en_ftp_user.lng index 580f8294d..a515cf843 100644 --- a/interface/web/sites/lib/lang/en_ftp_user.lng +++ b/interface/web/sites/lib/lang/en_ftp_user.lng @@ -29,4 +29,7 @@ $wb["quota_size_error_regex"] = 'Quota: enter a -1 for unlimited or a number > 0 $wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/sites/lib/lang/en_shell_user.lng b/interface/web/sites/lib/lang/en_shell_user.lng index 1f7d61e40..296019a7d 100644 --- a/interface/web/sites/lib/lang/en_shell_user.lng +++ b/interface/web/sites/lib/lang/en_shell_user.lng @@ -24,4 +24,7 @@ $wb["ssh_rsa_txt"] = 'SSH-RSA Public Key (for key-based logins)'; $wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index a6169ce90..49a38d185 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -99,4 +99,7 @@ $wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout mu $wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; $wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_folder_user.lng b/interface/web/sites/lib/lang/en_web_folder_user.lng index 684c0e92f..c2a67105e 100644 --- a/interface/web/sites/lib/lang/en_web_folder_user.lng +++ b/interface/web/sites/lib/lang/en_web_folder_user.lng @@ -5,4 +5,7 @@ $wb["password_txt"] = 'Password'; $wb["active_txt"] = 'Active'; $wb["folder_error_empty"] = 'No web folder selecetd.'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_webdav_user.lng b/interface/web/sites/lib/lang/en_webdav_user.lng index af84617f8..099226c1c 100644 --- a/interface/web/sites/lib/lang/en_webdav_user.lng +++ b/interface/web/sites/lib/lang/en_webdav_user.lng @@ -16,4 +16,7 @@ $wb['password_strength_txt'] = 'Password strength'; $wb['dir_dot_error'] = 'No .. in path allowed.'; $wb['dir_slashdot_error'] = 'No ./ in path allowed.'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 9b0cd22eb..558e31110 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -50,13 +50,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm index e07526fe2..9f9c6b1d8 100644 --- a/interface/web/sites/templates/ftp_user_edit.htm +++ b/interface/web/sites/templates/ftp_user_edit.htm @@ -18,13 +18,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +

 MB

diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 0f2bc11f3..c138a8620 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -26,13 +26,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

+
+ + +
+ +
 {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}
+ + +
+ + +
 {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}
+
+ + +
+ +

{tmpl_var name='active_txt'}

diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm index 5bd7f82a8..0668d2ee6 100644 --- a/interface/web/sites/templates/webdav_user_edit.htm +++ b/interface/web/sites/templates/webdav_user_edit.htm @@ -26,7 +26,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -34,6 +34,12 @@

 

+ + +
+ + +

{tmpl_var name='active_txt'}

{tmpl_var name='active'} diff --git a/interface/web/themes/default/css/screen/uni-form.css b/interface/web/themes/default/css/screen/uni-form.css index e9e592fe6..3411d56e4 100644 --- a/interface/web/themes/default/css/screen/uni-form.css +++ b/interface/web/themes/default/css/screen/uni-form.css @@ -100,7 +100,7 @@ .uniForm .col.last{ width: 39%; /* <- Required property */ float: right; clear: none; margin-right: 0; } /* Messages */ -.uniForm #errorMsg{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; } +.uniForm #errorMsg, .confirmpassworderror{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; } .uniForm .error{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; } .uniForm #errorMsg dt, .uniForm #errorMsg h3{ margin: 0 0 .5em 0; font-size: 100%; line-height: 100%; font-weight: bold; } @@ -109,7 +109,7 @@ .uniForm #errorMsg ol li{ margin: 0; padding: 2px; list-style-position: inside; border-bottom: 1px dotted #df7d7d; position: relative; } .uniForm .errorField{ color: #af4c4c; margin: 0 0 6px 0; padding: 4px; background: #ffbfbf; } -.uniForm #OKMsg{ background: #C8FFBF; border: 1px solid #A2EF95; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; } +.uniForm #OKMsg, .confirmpasswordok{ background: #C8FFBF; border: 1px solid #A2EF95; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; } .uniForm #OKMsg p{ margin: 0; } /* diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng index 1b09f3675..5783680d8 100644 --- a/interface/web/tools/lib/lang/de_usersettings.lng +++ b/interface/web/tools/lib/lang/de_usersettings.lng @@ -6,4 +6,7 @@ $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['Form to edit the user password and language.'] = 'Formular, um das Benutzerpasswort und die Sprache zu bearbeiten.'; $wb['Settings'] = 'Einstellungen'; $wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> diff --git a/interface/web/tools/lib/lang/en_usersettings.lng b/interface/web/tools/lib/lang/en_usersettings.lng index f864944fd..efbe6c38d 100644 --- a/interface/web/tools/lib/lang/en_usersettings.lng +++ b/interface/web/tools/lib/lang/en_usersettings.lng @@ -6,4 +6,7 @@ $wb["password_mismatch"] = 'The password in the second password field does not m $wb["Form to edit the user password and language."] = 'Form to edit the user password and language.'; $wb["Settings"] = 'Settings'; $wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; ?> diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm index e7c014479..773a0c368 100644 --- a/interface/web/tools/templates/user_settings.htm +++ b/interface/web/tools/templates/user_settings.htm @@ -7,17 +7,19 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

 

-
- - -
+
+ + +
+ +
 {tmpl_var name='generate_password_txt'} +

{tmpl_var name='start_boot_txt'}

-- GitLab