Fix form syntax issues and more cleaning

root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep

@@ -18,7 +18,7 @@
     %=l 'PASSWORD_NEW', class => ""
     </span>
     <span class="">
-    %= password_field 'newPass', class => "" , class="">'sme-password'
+    %= password_field 'newPass', class => "" , class=> 'sme-password'
     </span>
     </p>
 
@@ -27,7 +27,7 @@
     %=l 'PASSWORD_VERIFY_NEW', class => ""
     </span>
     <span class="">
-    %= password_field 'newPassVerify', class => "", class="">'sme-password'
+    %= password_field 'newPassVerify', class => "", class=> 'sme-password'
     </span>
     </p>
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep

@@ -25,19 +25,19 @@
 		<a href='letsencryptd?trt=PARAMS' class="">
 			%= l('lets_CONFIG')
 		</a>
-		%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class="">'link link2'
+		%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
 	
 	
 		<a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
 			%= l('lets_CHECK_ALL_DOMAINS')
 		</a>
-		%#= 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'
 	
 	
 		<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
 			%= l('lets_CHECK_ALL_ENABLED_DOMAINS')
 		</a>
-		%#= 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'
 	
 	
 		</div>
@@ -105,7 +105,8 @@
 		<p>
 		<span class="">
 			%=l('lets_Not_Before')
-		</span><span class="">
+		</span>
+                <span class="">
 			% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
 			%= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
 		<br>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep

@@ -29,7 +29,8 @@
 		<p>
 		<span class="">
 			%=l('lets_SERVICE_STATUS')
-		</span><span class="">
+		</span>
+                <span class="">
 			%# 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 @@
 		<p>
 		<span class="">
 			%=l('lets_API_STATUS')
-		</span><span class="">
+		</span>
+                <span class="">
 			% my @API_options = [['2' => '2']];
 			% param 'API' => $lets_data->{API} unless param 'API';
 			%= select_field 'API' => @API_options, class => ""

root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep

@@ -26,7 +26,7 @@
 		<a href='nutupsd?trt=CONFIG' class="">
 			%= l('nut_Configure_NutUPS')
 		</a>
-		%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class="">'link link1'
+		%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1'
 	
 	
 		</div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep

@@ -18,7 +18,7 @@
     <span class="">
     %=l 'PASSWORD_NEW', class => ""
     </span><span class="">
-    %= password_field 'newPass', class => "", class="">'sme-password'
+    %= password_field 'newPass', class => "", class=> 'sme-password'
     </span>
     </p>
 
@@ -27,7 +27,7 @@
     %=l 'PASSWORD_VERIFY_NEW', class => ""
     </span>
     <span class="">
-    %= password_field 'newPassVerify', class => "", class="">'sme-password'
+    %= password_field 'newPassVerify', class => "", class=> 'sme-password'
     </span>
     </p>
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep

@@ -12,7 +12,7 @@
     %=l 'usr_CURRENT_SYSTEM_PASSWORD', class => ""
     </span>
     <span class="">
-    %= password_field 'CurPass', class => "", class="">'sme-password'
+    %= password_field 'CurPass', class => "", class=> 'sme-password'
     </span>
     </p>
 
@@ -21,7 +21,7 @@
     %=l 'usr_NEW_SYSTEM_PASSWORD', class => ""
     </span>
     <span class="">
-    %= password_field 'Pass', class => "", class="">'sme-password'
+    %= password_field 'Pass', class => "", class=> 'sme-password'
     </span>
     </p>
 
@@ -30,7 +30,7 @@
     %=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => ""
     </span>
     <span class="">
-    %= password_field 'PassVerify', class => "", class="">'sme-password'
+    %= password_field 'PassVerify', class => "", class=> 'sme-password'
     </span>
     </p>
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep

@@ -29,7 +29,8 @@
     <p>
     <span class="">
     %=l 'usr_FIRSTNAME'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
     %= text_field 'FirstName', class => ""
     </span>
@@ -64,7 +65,8 @@
     <p>
     <span class="">
     %=l 'usr_STREET_ADDRESS'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'Street' => $usr_datas->{street} unless param 'Street';
     %= text_field 'Street', class => ""
     </span>
@@ -141,7 +143,8 @@
     <span class="">
     <table class="tabel table-bordered">
     <thead>
-    <tr><th class="">
+      <tr>
+        <th class="">
             %=l 'usr_MEMBER'
             </th><th class="">
             %=l 'GROUP'
@@ -149,7 +152,8 @@
             %=l 'DESCRIPTION'
         </th>
       </tr>
-        </thead><tbody>
+    </thead>
+    <tbody>
         
     %    foreach my $g ( @groups) {
     %        my $user = $usr_datas->{user};

root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep

@@ -19,7 +19,8 @@
     <br><br>
     <span class="">
     %=l 'prx_HTTP_PROXY_STATUS_LABEL'
-    </span><span class="">
+    </span>
+    <span class="">
     % 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 => ""
     </span>

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'
-<div id="" class="">
+<div>
     %if (config->{debug} == 1) {
     <p>
     (DBG)route: <%= $c->current_route %><br>
@@ -15,7 +15,8 @@
         <p>
         <span class="">
         %=l 'qma_REPORT_TYPE'
-        </span><span class="">
+        </span>
+        <span class="">
         <!-- (to be sorted) -->
         %= select_field 'report_type' => $c->reportType_list(), id => ""
         </span>
@@ -25,7 +26,8 @@
         <div id="">
             <span class="">
             %= label_for message_id => 'Message ID:'
-            </span><span class="">
+            </span>
+            <span class="">
             %= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => ""
             </span>
         </div>
@@ -33,7 +35,8 @@
         <div id="">
             <span class="">
             %= label_for email_address => 'Email Address:'
-            </span><span class="">
+            </span>
+            <span class="">
             %= email_field 'email_address', placeholder => 'Enter email address', id => ""
             </span>
         </div>

root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep

@@ -111,7 +111,8 @@
     <br><br>
     <span class="">
     %=l 'NETWORK'
-    </span><span class="">
+    </span>
+    <span class="">
     %= text_field 'ValidFromNetwork', class => ""
     </span>
     <br>

root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep

@@ -10,13 +10,15 @@
     %=l 'rvw_NETWORKING_PARAMS'
     </b><br>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_SERVER_MODE'
     </span>
     %= $rvw_datas->{servermode}
     </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
     </span>
     %= $rvw_datas->{localip}
@@ -30,105 +32,148 @@
         </p>
     % }
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_GATEWAY'
     </span>
     %= $rvw_datas->{gateway}
     %= $rvw_datas->{serveronly}
     </p>
 
-    <p><table width='100%'><tr><td class=""><!--span class="">
+    <p>
+    <table width='100%'>
+    <tr>
+    <td class="">
+    <!--span class="">
     %=l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
-    <!--/span--></td><td>
+    <!--/span-->
+    </td>
+    <td>
     %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );
-    </td></tr></table>
+    </td>
+    </tr>
+    </table>
     </p>
 
-    <p><table width='100%'><tr><td class="">
+    <p>
+    <table width='100%'>
+    <tr>
+    <td class="">
     <!--<p><span class="">-->
     %=l 'rvw_DHCP_SERVER'
     <!--</span>-->
-    </td><td>
+    </td>
+    <td>
     %= $rvw_datas->{dhcpserver}
     <!--</p>-->
-    </td></tr></table></p>
+    </td>
+    </tr>
+    </table>
+    </p>
 
-    <br><br><b>
+    <br><br>
+    <b>
     %=l 'rvw_SERVER_NAMES'
-    </b><br>
+    </b>
+    <br>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_DNS_SERVER'
     </span>
     %= $rvw_datas->{dnsserver}
     </p>
     
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_WEB_SERVER'
     </span>
     %= $rvw_datas->{webserver}
     </p>
     
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_PROXY_SERVER'
     </span>
     %= $rvw_datas->{proxyserver}
     </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_FTP_SERVER'
     </span>
     %= $rvw_datas->{ftpserver}
     </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
     </span>
     %= $rvw_datas->{smtpserver}
     </p>
 
-    <br><br><b>
+    <br><br>
+    <b>
     %=l 'rvw_DOMAIN_INFORMATION'
-    </b><br>
+    </b>
+    <br>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_PRIMARY_DOMAIN'
     </span>
     %= $rvw_datas->{domainname}
     </p>
 
     <!---<p><span class="">-->
-    <p><table width='100%'><tr><td class="">
+    <p>
+    <table width='100%'>
+    <tr>
+    <td class="">
     %=l 'rvw_VIRTUAL_DOMAINS'
-    </td><td>
+    </td>
+    <td>
     <!--</span>-->
     %= $rvw_datas->{virtualdomains}
-    </td></tr></table></p>
+    </td>
+    </tr>
+    </table>
+    </p>
     <!--</p>-->
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_PRIMARY_WEB_SITE'
     </span>
     %= $rvw_datas->{primarywebsite}
     </p>
     
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_SERVER_MANAGER'
     </span>
     %= $rvw_datas->{servermanager}
     </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'rvw_USER_PASSWORD_PANEL'
     </span>
     %= $rvw_datas->{usermanager}
     </p>
 
-    <p><table width='100%'><tr><td class="">
+    <p>
+    <table width='100%'>
+    <tr>
+    <td class="">
     %=l 'rvw_EMAIL_ADDRESSES'
-    </td><td>
+    </td>
+    <td>
     %= $rvw_datas->{emailaddresses}
-    </td></tr></table></p>
+    </td>
+    </tr>
+    </table>
+    </p>
 
     % end
 

root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep

@@ -53,7 +53,7 @@
     %= l 'pwd_PASSWORD_OLD'
     </span>
     <span class="">
-    %= password_field 'Oldpass', class => "", class="">'sme-password'
+    %= password_field 'Oldpass', class => "", class=> 'sme-password'
     </span>
     <br><br>
     </p>
@@ -64,7 +64,7 @@
     %=l 'pwd_PASSWORD_NEW'
     </span>
     <span class="">
-    %= password_field 'Pass', class => "", class="">'sme-password'
+    %= password_field 'Pass', class => "", class=> 'sme-password'
     </span>
     <br><br>
     </p>
@@ -74,7 +74,7 @@
     %=l 'pwd_PASSWORD_VERIFY_NEW'
     </span>
     <span class="">
-    %= password_field 'Passverify', class => "", class="">'sme-password'
+    %= password_field 'Passverify', class => "", class=> 'sme-password'
     </span>
     <br><br>
     </p>

root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep

@@ -22,13 +22,15 @@
 
     %=l 'yum_DESC_AVAILABLE_UPDATES'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'yum_LABEL_AVAILABLE_UPDATES'
     </span>
     <span class="">
     % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
     %= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "", multiple => "1"
-    </span></p>
+    </span>
+    </p>
 
         <!-- $c->print_skip_header() -->
 

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 <jcrisp@safeandsoundit.co.uk> 11.0.0-4.sme
+- More template cleanign
+- Fix Password syntax errors
+
 * Tue Apr 15 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-3.sme
 - Finish template tidy