diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Userpassword/userpassword_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Userpassword/userpassword_en.lex index 9b8f7f6..299a0af 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Userpassword/userpassword_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Userpassword/userpassword_en.lex @@ -19,3 +19,5 @@ 'pwd_PASSWORD_CHANGE_SUCCESS' => 'Your password has been successfully changed.', 'pwd_DESCRIPTION' => '

To change your account password, please fill out the following form. You will need to provide the name of your account, your old password, and your desired new password. (You must type the new password twice.)

If you cannot change your password because you have forgotten the old one, your local system administrator can reset your password using the server manager.

', 'pwd_DESCRIPTION_RESET' => '

To reset your account password, please fill out the following form. You will need to provide your desired new password. (You must type it twice.)

In cas of problem, your local system administrator can reset your password using the server manager.

', +'pwd_PASSWORD_DESCRIPTION' => 'The password must be composed of at least twelve characters with uppercase and lowercase letters, numbers and non-alphanumeric characters.', +'pwd_PASSWORD_WIKI' => "If you want to know more about passwords, then please refer to the Wiki", \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep index 240dc36..946db50 100644 --- a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep +++ b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep @@ -25,6 +25,12 @@ % my $btn = l('pwd_PASSWORD_CHANGE'); % my $url = '/userpassword'; %= $c->render_to_string( inline => l('pwd_DESCRIPTION')); + +

+ <%= $c->render_to_string( inline => l('pwd_PASSWORD_DESCRIPTION')) %>
+ <%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI')) %> +

+ % if ( $pwd_datas->{trt} eq 'RESET' ) { % $btn = l('pwd_PASSWORD_RESET'); % $url = '/userpasswordr'; diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 200fcef..cd30d12 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 107 +%define release 108 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -146,6 +146,9 @@ true %defattr(-,root,root) %changelog +* Wed Jul 16 2025 Brian Read 11.0.0-108.sme +- Password change panel - add extra descriptive text [SME: 13081] + * Tue Jul 15 2025 Brian Read 11.0.0-107.sme - Email Settings panel: Fix lex strings with long names and no prefix [SME: 13080]