From 93b8d4cb6fd23dd63f857cfcc7b7b2c44a15b02b Mon Sep 17 00:00:00 2001 From: John Crisp Date: Wed, 16 Apr 2025 18:09:49 +0200 Subject: [PATCH] Fix form syntax issues and more cleaning --- .../templates/partials/_flag_icon.html.ep | 2 +- .../templates/partials/_iba_pwd.html.ep | 6 +- .../templates/partials/_lets_LIST.html.ep | 11 +- .../templates/partials/_lets_PARAMS.html.ep | 6 +- .../templates/partials/_nut_STATUS.html.ep | 4 +- .../templates/partials/_usr_pwd.html.ep | 6 +- .../templates/partials/_usr_pwds.html.ep | 6 +- .../templates/partials/_usr_upd.html.ep | 14 +- .../themes/AdminLTE/templates/proxy.html.ep | 3 +- .../AdminLTE/templates/qmailanalog.html.ep | 11 +- .../AdminLTE/templates/remoteaccess.html.ep | 3 +- .../themes/AdminLTE/templates/review.html.ep | 127 ++++++++++++------ .../AdminLTE/templates/userpassword.html.ep | 6 +- .../AdminLTE/templates/yumupdate.html.ep | 6 +- smeserver-manager-AdminLTE.spec | 6 +- 15 files changed, 140 insertions(+), 77 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_flag_icon.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_flag_icon.html.ep index 9c53f45..50182a0 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_flag_icon.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_flag_icon.html.ep @@ -1,5 +1,5 @@ -
+
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep index 206c08e..f5796b7 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep @@ -18,7 +18,7 @@ %=l 'PASSWORD_NEW', class => "" - %= password_field 'newPass', class => "" , class="">'sme-password' + %= password_field 'newPass', class => "" , class=> 'sme-password'

@@ -27,7 +27,7 @@ %=l 'PASSWORD_VERIFY_NEW', class => "" - %= password_field 'newPassVerify', class => "", class="">'sme-password' + %= password_field 'newPassVerify', class => "", class=> 'sme-password'

@@ -41,4 +41,4 @@ % end -
\ No newline at end of file + diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep index 13e8b4a..2a097e8 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep @@ -25,19 +25,19 @@ %= l('lets_CONFIG') - %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class="">'link link2' + %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2' %= l('lets_CHECK_ALL_DOMAINS') - %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class="">'link link3' + %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3' %= l('lets_CHECK_ALL_ENABLED_DOMAINS') - %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class="">'link link4' + %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4' @@ -105,7 +105,8 @@

%=l('lets_Not_Before') - + + % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore'; %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
@@ -148,4 +149,4 @@ %# Probably finally by a submit. %end - \ No newline at end of file + diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep index 76cf3de..9c4455d 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep @@ -29,7 +29,8 @@

%=l('lets_SERVICE_STATUS') - + + %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']]; % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status}); %# param 'status' => $lets_data->{status} unless param 'status'; @@ -77,7 +78,8 @@

%=l('lets_API_STATUS') - + + % my @API_options = [['2' => '2']]; % param 'API' => $lets_data->{API} unless param 'API'; %= select_field 'API' => @API_options, class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep index ccc4250..a6ce652 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep @@ -26,7 +26,7 @@ %= l('nut_Configure_NutUPS') - %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class="">'link link1' + %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1' @@ -53,4 +53,4 @@ %# Probably finally by a submit. %end - \ No newline at end of file + 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 d464483..9937b2b 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 @@ -18,7 +18,7 @@ %=l 'PASSWORD_NEW', class => "" - %= password_field 'newPass', class => "", class="">'sme-password' + %= password_field 'newPass', class => "", class=> 'sme-password'

@@ -27,7 +27,7 @@ %=l 'PASSWORD_VERIFY_NEW', class => "" - %= password_field 'newPassVerify', class => "", class="">'sme-password' + %= password_field 'newPassVerify', class => "", class=> 'sme-password'

@@ -42,4 +42,4 @@ % end - \ No newline at end of file + 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 058f529..07b92e4 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 @@ -12,7 +12,7 @@ %=l 'usr_CURRENT_SYSTEM_PASSWORD', class => "" - %= password_field 'CurPass', class => "", class="">'sme-password' + %= password_field 'CurPass', class => "", class=> 'sme-password'

@@ -21,7 +21,7 @@ %=l 'usr_NEW_SYSTEM_PASSWORD', class => "" - %= password_field 'Pass', class => "", class="">'sme-password' + %= password_field 'Pass', class => "", class=> 'sme-password'

@@ -30,7 +30,7 @@ %=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => "" - %= password_field 'PassVerify', class => "", class="">'sme-password' + %= password_field 'PassVerify', class => "", class=> 'sme-password'

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 1f4db78..f9103e5 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 @@ -29,7 +29,8 @@

%=l 'usr_FIRSTNAME' - + + % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; %= text_field 'FirstName', class => "" @@ -64,7 +65,8 @@

%=l 'usr_STREET_ADDRESS' - + + % param 'Street' => $usr_datas->{street} unless param 'Street'; %= text_field 'Street', class => "" @@ -141,15 +143,17 @@ - + - - + + + % foreach my $g ( @groups) { % my $user = $usr_datas->{user}; diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep index af12aca..a3b3dac 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep @@ -19,7 +19,8 @@

%=l 'prx_HTTP_PROXY_STATUS_LABEL' - + + % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status'; %= select_field 'http_proxy_status' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "", id => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep index 3f12ad7..56202b0 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - qmailanalog"; % content_for 'module' => begin %= javascript '/js/qmailanalog.js' -
+
%if (config->{debug} == 1) {

(DBG)route: <%= $c->current_route %>
@@ -15,7 +15,8 @@

%=l 'qma_REPORT_TYPE' - + + %= select_field 'report_type' => $c->reportType_list(), id => "" @@ -25,7 +26,8 @@

%= label_for message_id => 'Message ID:' - + + %= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => ""
@@ -33,7 +35,8 @@
%= label_for email_address => 'Email Address:' - + + %= email_field 'email_address', placeholder => 'Enter email address', id => ""
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep index f23507f..879fc05 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep @@ -111,7 +111,8 @@

%=l 'NETWORK' - + + %= text_field 'ValidFromNetwork', class => ""
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 f444a49..4134802 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep @@ -9,19 +9,21 @@ %=l 'rvw_NETWORKING_PARAMS'
- -

+ +

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

- -

+ +

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

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

%=l 'rvw_INTERNET_VISIBLE_ADDRESS' @@ -29,106 +31,149 @@ %= $rvw_datas->{publicip}

% } - -

+ +

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

- -

+
%=l 'usr_MEMBER' %=l 'GROUP' %=l 'DESCRIPTION'
+
+ + %= $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 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 7e6acfb..6cf1266 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep @@ -53,7 +53,7 @@ %= l 'pwd_PASSWORD_OLD' - %= password_field 'Oldpass', class => "", class="">'sme-password' + %= password_field 'Oldpass', class => "", class=> 'sme-password'

@@ -64,7 +64,7 @@ %=l 'pwd_PASSWORD_NEW' - %= password_field 'Pass', class => "", class="">'sme-password' + %= password_field 'Pass', class => "", class=> 'sme-password'

@@ -74,7 +74,7 @@ %=l 'pwd_PASSWORD_VERIFY_NEW' - %= password_field 'Passverify', class => "", class="">'sme-password' + %= password_field 'Passverify', class => "", class=> 'sme-password'

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep index 15ece5a..f502a46 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep @@ -22,13 +22,15 @@ %=l 'yum_DESC_AVAILABLE_UPDATES' -

+

+ %=l 'yum_LABEL_AVAILABLE_UPDATES' % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; %= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "", multiple => "1" -

+ +

diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 8dbbf4d..898c56b 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 3 +%define release 4 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 +* Wed Apr 16 2025 John Crisp 11.0.0-4.sme +- More template cleanign +- Fix Password syntax errors + * Tue Apr 15 2025 John Crisp 11.0.0-3.sme - Finish template tidy