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 @@ + +

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_module.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_module.html.ep index 8996176..f3cd926 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_module.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_module.html.ep @@ -22,20 +22,22 @@ % end % content_for 'end' => begin -
- content_end +
+ content_end
% end -
+

< %= $title % >


+ <%= $modul %>
-Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam. + Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam. -Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum quidem. Acsi aliquip eu ex iaceo natu populus quae scisco si. + Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum quidem. Acsi aliquip eu ex iaceo natu populus quae scisco si. -Aliquam autem blandit decet in jus loquor quidne saluto te. Eu meus voco wisi. Abico defui euismod huic jumentum lobortis mos vulpes. Causa eros feugiat hendrerit illum luctus nimis quidem valetudo. Elit ex obruo tation usitas vero. Abigo dolus hendrerit huic iriure jumentum letalis lobortis melior nulla. Blandit causa immitto iriure metuo nutus pagus ut voco. + Aliquam autem blandit decet in jus loquor quidne saluto te. Eu meus voco wisi. Abico defui euismod huic jumentum lobortis mos vulpes. Causa eros feugiat hendrerit illum luctus nimis quidem valetudo. Elit ex obruo tation usitas vero. Abigo dolus hendrerit huic iriure jumentum letalis lobortis melior nulla. Blandit causa immitto iriure metuo nutus pagus ut voco.
+

%= link_to Welcome => '/'

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep index 33c584a..2e3ff0c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep @@ -63,39 +63,43 @@
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name'; - + <%= 'ups@'. $nut_data->{'localip'} %> +
+
+ +
+
+ <%= l ('nut_SlaveUPS_User') %> +
+
+ <%= 'upssecondary' %> +
+
+ +
+
+ %=l('nut_SlaveUPS_Password') +
+
+ <%= $nut_data->{'SlaveUPS_Pass'}%>

-
-
- -
-
- % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password'; - -
- - -

-

UPS Model

+

<%= l ('nut_UPS_Device') %>


- <%= l ('nut_UPS_Model') %> +
% my @UPS_Model_options = $c->get_model_options(); @@ -143,7 +147,7 @@
% param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User'; - +
@@ -151,13 +155,12 @@
- +
% param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass'; - +
-
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_user_menu.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_user_menu.html.ep index c71b98b..05f305e 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_user_menu.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_user_menu.html.ep @@ -12,18 +12,18 @@
  • USER
  • - + Current User: <%= session 'username' %>
    • % my $cc = 300; - % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) + % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) { % my ($classNew, $target, $href) = ''; % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) { - % next if ($_->{'MENUCAT'} ne 'U' ); # menu User + % next if ($_->{'MENUCAT'} ne 'U' ); # menu User % if ( $_->{'FILENAME'} =~ m/^2\// ) { % $target = '_self'; % (my $file2 = $_->{'FILENAME'}) =~ s|^2/||; diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep index ded8677..9973a9b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep @@ -40,14 +40,14 @@ % if (!($url =~ /https:/)) { % $url = 'https://' . $url; - %} + % }
    roundcube?_user=<%= $username %>"> - <%= $c->stash('title') %> not found + <%= $c->stash('title') %> not found
    diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep index b789bcb..2f888de 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep @@ -4,69 +4,73 @@
    -

    Index on line - Welcome page -
    -

    -

    -Cogo diam enim ibidem paulatim pertineo velit. Comis patria pertineo secundum. Aliquip laoreet quibus zelus. Gravis incassum interdico iustum lucidus neo os paratus. Autem causa haero pneum similis sudo vindico. Iusto molior neque oppeto. Ideo minim nibh refoveo veniam vereor virtus. Appellatio pala scisco. +

    Index on line - Welcome page
    -Caecus esse exputo ideo laoreet valde. Appellatio feugiat haero jus lucidus tum valetudo vulputate. Amet illum imputo volutpat. Acsi adipiscing brevitas facilisi illum laoreet lobortis lucidus sagaciter uxor. Defui dolor hos luptatum quadrum saluto verto vicis wisi. +
    + Cogo diam enim ibidem paulatim pertineo velit. Comis patria pertineo secundum. Aliquip laoreet quibus zelus. Gravis incassum interdico iustum lucidus neo os paratus. Autem causa haero pneum similis sudo vindico. Iusto molior neque oppeto. Ideo minim nibh refoveo veniam vereor virtus. Appellatio pala scisco. -Acsi ideo pagus ymo. Ea jugis lobortis nimis utrum veniam vereor. Aliquip amet autem gilvus hos iaceo loquor natu pagus refoveo. Adipiscing laoreet probo tation tum vero. Enim minim ymo. Dolore imputo iusto iustum lobortis meus molior vulputate. Dolor immitto iustum jumentum olim pagus saluto uxor zelus. Capto commodo eu euismod. Duis ille nunc premo quidem tamen ulciscor wisi. + Caecus esse exputo ideo laoreet valde. Appellatio feugiat haero jus lucidus tum valetudo vulputate. Amet illum imputo volutpat. Acsi adipiscing brevitas facilisi illum laoreet lobortis lucidus sagaciter uxor. Defui dolor hos luptatum quadrum saluto verto vicis wisi. -Abdo abico damnum dolor et facilisi incassum melior populus saepius. Commodo conventio ex exputo pagus quae valetudo. Eligo jumentum lobortis suscipit tamen torqueo validus venio voco. Letalis molior tego tincidunt tum. Bene iriure melior natu obruo os te voco. Ea oppeto refoveo tum. Consectetuer dolus ut. + Acsi ideo pagus ymo. Ea jugis lobortis nimis utrum veniam vereor. Aliquip amet autem gilvus hos iaceo loquor natu pagus refoveo. Adipiscing laoreet probo tation tum vero. Enim minim ymo. Dolore imputo iusto iustum lobortis meus molior vulputate. Dolor immitto iustum jumentum olim pagus saluto uxor zelus. Capto commodo eu euismod. Duis ille nunc premo quidem tamen ulciscor wisi. + + Abdo abico damnum dolor et facilisi incassum melior populus saepius. Commodo conventio ex exputo pagus quae valetudo. Eligo jumentum lobortis suscipit tamen torqueo validus venio voco. Letalis molior tego tincidunt tum. Bene iriure melior natu obruo os te voco. Ea oppeto refoveo tum. Consectetuer dolus ut. + + Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio genitus neo nulla patria pneum saluto velit voco. Abigo defui dolore humo nulla nunc. Autem commodo erat gemino nisl olim pecus ratis tego. Fere luctus nunc sit. Bene humo imputo paulatim suscipit. Aliquam diam dolor feugiat gravis imputo lucidus modo nulla obruo. Ea macto melior neo qui ratis velit. +
    + + <%= l ('MESS_TEST','toto') %> + +
    + <%= link_to Initial => '/' %> +
    + +
    + <%= link_to Manual => '/manual' %> +
    + +
    + <%= link_to Welcome => '/welcome' %> + Accueil +
    + + % use SrvMngr::Navigation2; + % my %nav = %{SrvMngr::navigation2->getNavigation( $c->languages() )}; -Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio genitus neo nulla patria pneum saluto velit voco. Abigo defui dolore humo nulla nunc. Autem commodo erat gemino nisl olim pecus ratis tego. Fere luctus nunc sit. Bene humo imputo paulatim suscipit. Aliquam diam dolor feugiat gravis imputo lucidus modo nulla obruo. Ea macto melior neo qui ratis velit. -

    - %= l ('MESS_TEST','toto') -

    - %= link_to Initial => '/' -

    -

    - %= link_to Manual => '/manual' -

    -

    - %= link_to Welcome => '/welcome' - Accueil. -

    - -% use SrvMngr::Navigation2; -% my %nav = %{SrvMngr::navigation2->getNavigation( $c->languages() )};
    -% foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) -% <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) { + % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) + % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
    - %= $h - % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) { - % my ($target, $classNew) = ( $_->{'FILENAME'} =~ m/^2\// ) ? - % ('_self',' accent') : - % ('main','') ; - - % my $href = '/server-manager' . $_->{'FILENAME'}; - - - % $c++; - % } + <%= $h %> -% } + % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) { + % my ($target, $classNew) = ( $_->{'FILENAME'} =~ m/^2\// ) ? + % ('_self',' accent') : + % ('main','') ; + + % my $href = '/server-manager' . $_->{'FILENAME'}; + + + % $c++; + % } + + % }
    -
    % end \ No newline at end of file diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 8606ebb..46a057e 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 44 +%define release 45 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} @@ -29,6 +29,10 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Mon Jul 07 2025 John Crisp 11.0.0-45.sme +- Tidy up Nut panels more +- other general formatting + * Sun Jul 06 2025 John Crisp 11.0.0-44.sme - Tidy up Nut panels