11.0.0-49 Update with latest changed from smeserver-smanager

This commit is contained in:
John Crisp
2025-07-29 15:23:25 +02:00
parent 0811200222
commit d2f484eedd
6 changed files with 43 additions and 11 deletions

View File

@@ -112,7 +112,7 @@
% my $smtp_mesg;
% $smtp_mesg=l('SMTP port %u allow client to authenticate:');
% $smtp_mesg=l('mai_SMTP_port_authenticate');
<div class="row g-3 align-items-center">
<div class="col-md-2">
@@ -123,7 +123,7 @@
</div>
</div>
% $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
% $smtp_mesg=l('mai_SMTPS_SSL/TLS');
<div class="row g-3 align-items-center">
<div class="col-md-2">
@@ -134,7 +134,7 @@
</div>
</div>
% $smtp_mesg=l 'Submission port %u status:';
% $smtp_mesg=l 'mai_Submission_port';
<div class="row g-3 align-items-center">
<div class="col-md-2">

View File

@@ -54,7 +54,7 @@
<b><i>Note - this first line was disabled?</b></i>
<br>
<%= l 'mai_DESC_SMTP_AUTH_CONTROL' %>
<%= l 'mai_DESC_SMTP_AUTH_CONTROL' %>
<br>
<b><i>/end</b></i>
</div>
@@ -62,19 +62,19 @@
<br>
<div>
<%= 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)" %>
</div>
<br>
<div>
<%= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %>
<%= l "mai_SMTPS_port_(465)" %>
</div>
<br>
<div>
<%= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." %>
<%= %= l "mai_SMTP_Submission" %>
</div>
</div>

View File

@@ -43,7 +43,16 @@
<%= l 'usr_RESET_DESC2' %>
</div>
<br><br>
<br>
<div>
% my $strength = uc($usr_datas->{passwdstrength});
<%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %>
<br>
<%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI')) %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">

View File

@@ -16,6 +16,16 @@
<br>
<div>
% my $strength = uc($usr_datas->{passwdstrength});
<%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %>
<br>
<%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI')) %>
</div>
<br>
<div>
<%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
</div>

View File

@@ -28,6 +28,14 @@
<%= $c->render_to_string( inline => l('pwd_DESCRIPTION')); %>
</div>
<div>
% my $strength = uc($pwd_datas->{passwdstrength});
<%= $c->render_to_string( inline => l('pwd_'.$strength.'_PASSWORD_DESCRIPTION',$pwd_datas->{passwdlength})) %>
<br />
<%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI')) %>
</div>
% if ( $pwd_datas->{trt} eq 'RESET' ) {
% my $btn = l('pwd_PASSWORD_RESET');
% my $url = '/userpasswordr';

View File

@@ -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 <jcrisp@safeandsoundit.co.uk> 11.0.0-49.sme
- Password text [SME:13081]
- Email settings[SME: 13080]
- Busy cursor [SME: 13064]
* Wed Jul 23 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-48.sme
- Update to AdminLTE 4.0.0-rc4