From d2f484eedd319e2c62429db737b381653ca98c2c Mon Sep 17 00:00:00 2001 From: John Crisp Date: Tue, 29 Jul 2025 15:23:25 +0200 Subject: [PATCH] 11.0.0-49 Update with latest changed from smeserver-smanager --- .../AdminLTE/templates/partials/_mai_FRONT.html.ep | 6 +++--- .../AdminLTE/templates/partials/_mai_REC.html.ep | 8 ++++---- .../AdminLTE/templates/partials/_usr_pwd.html.ep | 11 ++++++++++- .../AdminLTE/templates/partials/_usr_pwds.html.ep | 12 +++++++++++- .../themes/AdminLTE/templates/userpassword.html.ep | 8 ++++++++ smeserver-manager-AdminLTE.spec | 9 +++++++-- 6 files changed, 43 insertions(+), 11 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_FRONT.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_FRONT.html.ep index 68f4903..698fafe 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_FRONT.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_FRONT.html.ep @@ -112,7 +112,7 @@ % my $smtp_mesg; - % $smtp_mesg=l('SMTP port %u allow client to authenticate:'); + % $smtp_mesg=l('mai_SMTP_port_authenticate');
@@ -123,7 +123,7 @@
- % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); + % $smtp_mesg=l('mai_SMTPS_SSL/TLS');
@@ -134,7 +134,7 @@
- % $smtp_mesg=l 'Submission port %u status:'; + % $smtp_mesg=l 'mai_Submission_port';
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_REC.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_REC.html.ep index 08b81d0..3bc7dee 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_REC.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_mai_REC.html.ep @@ -54,7 +54,7 @@ Note - this first line was disabled?
- <%= l 'mai_DESC_SMTP_AUTH_CONTROL' %> + <%= l 'mai_DESC_SMTP_AUTH_CONTROL' %>
/end
@@ -62,19 +62,19 @@
- <%= l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client." %> + <%= l "mai_SMTP_port_(25)" %>

- <%= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %> + <%= l "mai_SMTPS_port_(465)" %>

- <%= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." %> + <%= %= l "mai_SMTP_Submission" %>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep index bc7435c..3be5c44 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep @@ -43,7 +43,16 @@ <%= l 'usr_RESET_DESC2' %> -

+
+ +
+ % my $strength = uc($usr_datas->{passwdstrength}); + <%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %> +
+ <%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI')) %> +
+ +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep index 5735969..400d6e1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep @@ -15,6 +15,16 @@

+ +
+ % my $strength = uc($usr_datas->{passwdstrength}); + <%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %> +
+ <%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI')) %> +
+ +
+
<%=l 'usr_CURRENT_SYSTEM_PASSWORD' %> @@ -75,4 +85,4 @@ %# end -
\ No newline at end of file +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep index 9467396..91ae97f 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep @@ -28,6 +28,14 @@ <%= $c->render_to_string( inline => l('pwd_DESCRIPTION')); %> +
+ % my $strength = uc($pwd_datas->{passwdstrength}); + <%= $c->render_to_string( inline => l('pwd_'.$strength.'_PASSWORD_DESCRIPTION',$pwd_datas->{passwdlength})) %> +
+ <%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI')) %> +
+ + % if ( $pwd_datas->{trt} eq 'RESET' ) { % my $btn = l('pwd_PASSWORD_RESET'); % my $url = '/userpasswordr'; diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index fa6df9f..9b169ea 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 48 +%define release 49 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} @@ -17,7 +17,7 @@ BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: smeserver-devtools Requires: smeserver-release >= 11.0 -Requires: smeserver-manager >= 11.0.0-104 +Requires: smeserver-manager >= 11.0.0-111 Requires: smeserver-lib >= 11.0.0-13 Requires: e-smith-manager >= 2.4.0-22 @@ -29,6 +29,11 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Tue Jul 29 2025 John Crisp 11.0.0-49.sme +- Password text [SME:13081] +- Email settings[SME: 13080] +- Busy cursor [SME: 13064] + * Wed Jul 23 2025 John Crisp 11.0.0-48.sme - Update to AdminLTE 4.0.0-rc4