From f571879414b14dc93a4a1eaa5ff5e288d412a711 Mon Sep 17 00:00:00 2001 From: John Crisp Date: Mon, 7 Jul 2025 17:24:24 +0200 Subject: [PATCH] Tidy Nut UPS more and general formatting --- .../AdminLTE/templates/embedded.html.ep | 8 +- .../AdminLTE/templates/partials/_info.html.ep | 63 +++++++---- .../templates/partials/_login.html.ep | 2 + .../templates/partials/_module.html.ep | 14 +-- .../templates/partials/_nut_CONFIG.html.ep | 45 ++++---- .../partials/_sidebar_user_menu.html.ep | 6 +- .../AdminLTE/templates/roundcube.html.ep | 4 +- .../themes/AdminLTE/templates/welcome.html.ep | 100 +++++++++--------- smeserver-manager-AdminLTE.spec | 6 +- 9 files changed, 141 insertions(+), 107 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep index 8c0e28c..d687ae2 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep @@ -12,15 +12,17 @@ % if ( stash 'error' ) {
- %= $c->render_to_string(inline => stash 'error') + %= $c->render_to_string(inline => stash 'error')
%}

Embedded - <%=$title %>


-

If the legacy panel does not appear, then you may not be logged into the original Server manager.
You can log in by clicking here. Or by clicking on the "Legacy SM" button at the top of the window.

+
If the legacy panel does not appear, then you may not be logged into the original Server manager.
You can log in by clicking here. Or by clicking on the "Legacy SM" button at the top of the window.
+ % my $height = $c->stash('height') | '600px'; % if ($height !~ /px$/) { $height = $height.'px';} - <%= $c->stash('title') %> not found + + <%= $c->stash('title') %> not found %end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_info.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_info.html.ep index eacf529..59ae02b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_info.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_info.html.ep @@ -1,25 +1,42 @@ -<% use POSIX qw(strftime); %> -
- <% if (! $c->session->{PwdSet} ) { %> -
- Warning: you have not yet changed the default system password.
- <% } %> - <% if ( $c->is_unsafe ) { %> -
- Warning: a reconfigure and reboot is required before proceeding! Failure to do so now - may leave your system in an unknown state!
- <% } %> - <% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %> -
- Warning: Development or debug mode enabled AND public access is offered ! -
- <% } %> +% use POSIX qw(strftime); + +
+ % if (! $c->session->{PwdSet} ) { +
+
+ Warning: you have not yet changed the default system password. +
+
+ % } + + % if ( $c->is_unsafe ) { +
+
+ Warning: a reconfigure and reboot is required before proceeding!
+ Failure to do so now may leave your system in an unknown state! +
+
+ % } + + % if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { +
+
+ Warning: Development or debug mode enabled AND public access is offered ! +
+
+ % } + <% my $curdate = strftime '%Y%m%d', localtime; %> - <% if ( "$curdate" >= "20290531" ) { %> -
- URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE. NO support will be offered for any issue found with this installed version. - Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version. Failure to upgrade may lead to the compromise of this server. -
Please, consult https://wiki.koozali.org/SME_Server:Download to get the latest version -
- <% } %> + + % if ( "$curdate" >= "20290531" ) { +
+
+ URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE.
+ NO support will be offered for any issue found with this installed version.
+ Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version.
+ Failure to upgrade may lead to the compromise of this server.
+ Please, consult https://wiki.koozali.org/SME_Server:Download to get the latest version +
+
+ % }
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_login.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_login.html.ep index 103ca31..ddc8be8 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_login.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_login.html.ep @@ -1,3 +1,5 @@ + +