diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep index 87f0ce4..b5a5804 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep @@ -1,14 +1,14 @@ -
+
- -% if ( $c->is_logged_in && $c->is_admin) { - SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II - % my $mode; - % if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';} - (Mojo:<%= Mojolicious->VERSION %><%= $mode %>) -% } -
Copyright 1999-2006 Mitel Corporation
-%= session 'copyRight' -
Copyright (c) 2013-2024 Koozali Foundation Inc.
+ + % if ( $c->is_logged_in && $c->is_admin) { + SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II + % my $mode; + % if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';} + (Mojo:<%= Mojolicious->VERSION %><%= $mode %>) + % } +
Copyright 1999-2006 Mitel Corporation
+ %= session 'copyRight' +
Copyright (c) 2013-2024 Koozali Foundation Inc.
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep index f9103e5..85c52d5 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep @@ -141,7 +141,7 @@ %=l 'usr_GROUP_MEMBERSHIPS' - +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep index 4134802..69384ed 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep @@ -1,182 +1,32 @@ % layout 'AdminLTE', title => 'Sme server 2 - Review'; % content_for 'module' => begin -
-

<%= $title %>

- <%= $modul %>

- %= form_for 'review' => begin - - %=l 'rvw_NETWORKING_PARAMS' -
+%#= include 'partials/_panel_card_top' +%#= include 'partials/_panel_card_header' + + +
+ +

<%= $title %>

+ + %= $modul + + % if (config->{debug} == 1) {

- - %=l 'rvw_SERVER_MODE' - - %= $rvw_datas->{servermode} + %= dumper $c->current_route + %= dumper $rvw_datas

- -

- - %=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' - - %= $rvw_datas->{localip} -

- - % if ( $rvw_datas->{publicip} ) { -

- %=l 'rvw_INTERNET_VISIBLE_ADDRESS' - - %= $rvw_datas->{publicip} -

% } - -

- - %=l 'rvw_GATEWAY' - - %= $rvw_datas->{gateway} - %= $rvw_datas->{serveronly} -

- -

- - - - - -
- - - %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} ); -
-

- -

- - - - - -
- - %=l 'rvw_DHCP_SERVER' - - - %= $rvw_datas->{dhcpserver} - -
-

- +

- - %=l 'rvw_SERVER_NAMES' - -
-

- - %=l 'rvw_DNS_SERVER' - - %= $rvw_datas->{dnsserver} -

- -

- - %=l 'rvw_WEB_SERVER' - - %= $rvw_datas->{webserver} -

- -

- - %=l 'rvw_PROXY_SERVER' - - %= $rvw_datas->{proxyserver} -

- -

- - %=l 'rvw_FTP_SERVER' - - %= $rvw_datas->{ftpserver} -

- -

- - %=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' - - %= $rvw_datas->{smtpserver} -

- -

- - %=l 'rvw_DOMAIN_INFORMATION' - -
- -

- - %=l 'rvw_PRIMARY_DOMAIN' - - %= $rvw_datas->{domainname} -

- - -

- - - - - -
- %=l 'rvw_VIRTUAL_DOMAINS' - - - %= $rvw_datas->{virtualdomains} -
-

- - -

- - %=l 'rvw_PRIMARY_WEB_SITE' - - %= $rvw_datas->{primarywebsite} -

- -

- - %=l 'rvw_SERVER_MANAGER' - - %= $rvw_datas->{servermanager} -

- -

- - %=l 'rvw_USER_PASSWORD_PANEL' - - %= $rvw_datas->{usermanager} -

- -

- - - - - -
- %=l 'rvw_EMAIL_ADDRESSES' - - %= $rvw_datas->{emailaddresses} -
-

- - % end + %= include 'partials/_rvw_content'
+%#= include 'partials/_panel_card_footer' +%#= include 'partials/_panel_card_bottom' + % end \ No newline at end of file diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index b80f583..2e9eb51 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 6 +%define release 7 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,6 +26,10 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Thu Apr 17 2025 John Crisp 11.0.0-7.sme +- Clean up review template (but footer in the wrong place) +- Fix typo tabel + * Wed Apr 16 2025 John Crisp 11.0.0-6.sme - Remove old template - Update breadcrumbs