* Fri Sep 26 2025 Brian Read <brianr@koozali.org> 1.0-26.sme

- Fix remove logic, add in user name to rem panel re-format templates,  add space to list panel [SME: 13168]

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wireguard/wireguard_en.lex

@@ -46,7 +46,7 @@
 'wrg_ERROR_WRONG_ACCT_TYPE' => 'The associated account shoult be a user or admin account.',
 'wrg_ERROR_OCCURED' => 'An error occured',
 'wrg_CLIENTS_ALREADY_CONFIGURED' => 'You can not alter the server ip, mask, private and public key as there are already some clients configured.',
-'wrg_NO_CONF' => 'No configured client',
+'wrg_NO_CONF' => 'No configured clients',
 'wrg_INTERFACE' => 'Interface',
 'wrg_CANCELLED' => 'Operation cancelled',
 'wrg_SUCCESSFULLY_MODIFIED_CONF' => 'Client configuration successfully modified',

root/usr/share/smanager/themes/default/templates/partials/_wrg_list.html.ep

@@ -1,59 +1,60 @@
 <div id='wrg_list'>
 
-    <p><%=l 'wrg_DESC_MAIN_PAGE'%><br></p>
+  <p><%= l 'wrg_DESC_MAIN_PAGE' %><br></p>
 
   %= form_for 'wireguard' => (method => 'POST') => begin
     %= hidden_field 'trt' => 'UPD'
-	    <p><%=l 'wrg_LABEL_CONFIG'%><br><br></p>
+    <p><%= l 'wrg_LABEL_CONFIG' %><br><br></p>
     %= submit_button l('wrg_EDIT_CONFIG'), class => 'action'
   % end
 
   <p><span class=label>
-	%=l 'wrg_INTERFACE'
+      %= l 'wrg_INTERFACE'
     </span> wg0<br></p>
 
   <p><span class=label>
-	%=l 'wrg_LABEL_STATUS'
+      %= l 'wrg_LABEL_STATUS'
     </span>
     %= $wrg_datas->{sstatus}
     <br></p>
 
   <p><span class=label>
-	%=l 'wrg_PUBLIC_KEY'
+      %= l 'wrg_PUBLIC_KEY'
     </span>
     %= $wrg_datas->{wgpub}
     <br></p>
 
   <p><span class=label>
-	%=l 'wrg_IP'
+      %= l 'wrg_IP'
     </span>
     %= $wrg_datas->{wgip}.'/'.$wrg_datas->{wgmask}
     <br></p>
 
   <p><span class=label>
-	%=l 'wrg_PORT'
+      %= l 'wrg_PORT'
     </span>
     %= $wrg_datas->{wgport}
     <br></p>
+  <br />
 
   <table class="sme-border"><tbody>
       <tr>
         <th class='sme-border'>
-    	    %=l 'wrg_PUBLIC_KEY'
+          %= l 'wrg_PUBLIC_KEY'
         </th><th class='sme-border'>
-    	    %=l 'wrg_INFO'
+          %= l 'wrg_INFO'
         </th><th class='sme-border'>
-    	    %=l 'wrg_ENDPOINT'
+          %= l 'wrg_ENDPOINT'
         </th><th class='sme-border'>
-    	    %=l 'wrg_VPN_IP'
+          %= l 'wrg_VPN_IP'
         </th><th class='sme-border'>
-    	    %=l 'wrg_LATEST_HANDSHAKE'
+          %= l 'wrg_LATEST_HANDSHAKE'
         </th><th class='sme-border'>
-    	    %=l 'wrg_RECEIVED'
+          %= l 'wrg_RECEIVED'
         </th><th class='sme-border'>
-    	    %=l 'wrg_SENT'
+          %= l 'wrg_SENT'
         </th><th class='sme-border'>
-    	    %=l 'wrg_KEEPALIVE'
+          %= l 'wrg_KEEPALIVE'
         </th>
       </tr>
 
@@ -83,26 +84,27 @@
 
   %= form_for 'wireguard' => (method => 'POST') => begin
     <hr class='sectionbar'/>
-	<p><%=l 'wrg_LABEL_CLIENTS'%><br><br></p>
+    <p><%= l 'wrg_LABEL_CLIENTS' %><br><br></p>
     %= hidden_field 'trt' => 'NEW'
     %= submit_button l('wrg_ADD_CLIENT'), class => 'action'
   % end
 
   % if ( scalar @$wgconf == 0 ) {
-    	    %=l 'wrg_NO_CONF'
+    %= l 'wrg_NO_CONF'
   % } else {
+  <br />
   <table class="sme-border"><tbody>
       <tr>
         <th class='sme-border'>
-    	    %=l 'wrg_CONF_NAME'
+          %= l 'wrg_CONF_NAME'
         </th><th class='sme-border'>
-    	    %=l 'wrg_USER'
+          %= l 'wrg_USER'
         </th><th class='sme-border'>
-    	    %=l 'wrg_INFO'
+          %= l 'wrg_INFO'
         </th><th class='sme-border'>
-    	    %=l 'wrg_LABEL_STATUS'
+          %= l 'wrg_LABEL_STATUS'
         </th><th class='sme-border' colspan='3'>
-    	    %=l 'ACTION'
+          %= l 'ACTION'
         </th>
       </tr>
       % foreach my $conf (@$wgconf) {
@@ -125,6 +127,6 @@
       % }
     </tbody>
   </table>
-    %}
+  % }
   <hr class='sectionbar'/>
 </div>

root/usr/share/smanager/themes/default/templates/partials/_wrg_mod.html.ep

@@ -1,85 +1,94 @@
+
+Mojolicious Template Code Formatter vmojofmt 0.1.9
+Input data:
+Upload a file:
+(none)
+Remove empty lines from output
+Formatted Output:
+Output Syntax:
+
 <div id='wrg_mod'>
 
   %= form_for '/wireguard2' => (method => 'POST') => begin
     <p>
-	%=l 'wrg_DESC_MODIFY_CLIENT_PAGE'
+      %= l 'wrg_DESC_MODIFY_CLIENT_PAGE'
     </p>
     <hr class='sectionbar'/>
 
     <p>
-	%=l 'wrg_DESC_CONF_NAME'
+      %= l 'wrg_DESC_CONF_NAME'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_CONF_NAME'
+        %= l 'wrg_CONF_NAME'
       </span>
       %= $wrg_datas->{wgconf}
       <br></p>
 
     <p>
-	%=l 'wrg_DESC_SELECT_ACCOUNT'
+      %= l 'wrg_DESC_SELECT_ACCOUNT'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_SELECT_ACCOUNT'
+        %= l 'wrg_SELECT_ACCOUNT'
       </span><span class=data>
         % param 'Account' => $wrg_datas->{account} unless param 'Account';
         %= select_field 'Account' => $c->get_existing_accounts(), class => 'input'
         <br></span></p>
 
     <p>
-	%=l 'wrg_DESC_INFO_ACC_WIREGUARD'
+      %= l 'wrg_DESC_INFO_ACC_WIREGUARD'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_INFO_ACC_WIREGUARD'
+        %= l 'wrg_INFO_ACC_WIREGUARD'
       </span><span class=data>
         % param 'Info' => $wrg_datas->{info} unless param 'Info';
-	%=text_field 'Info' => size => '45', class => 'input'
+        %= text_field 'Info' => size => '45', class => 'input'
         <br></span></p>
 
     <p>
-	%=l 'wrg_DESC_PRIVATE'
+      %= l 'wrg_DESC_PRIVATE'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_LABEL_PRIVATE'
+        %= l 'wrg_LABEL_PRIVATE'
       </span><span class=data>
         % param 'Private' => $wrg_datas->{private} unless param 'Private';
-	%=text_field 'Private' => size => '45', class => 'input'
+        %= text_field 'Private' => size => '45', class => 'input'
         <br></span></p>
 
     <p>
-	%=l 'wrg_DESC_PUBLIC'
+      %= l 'wrg_DESC_PUBLIC'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_LABEL_PUBLIC'
+        %= l 'wrg_LABEL_PUBLIC'
       </span><span class=data>
         % param 'Public' => $wrg_datas->{public} unless param 'Public';
-	%=text_field 'Public' => size => '45', class => 'input'
+        %= text_field 'Public' => size => '45', class => 'input'
         <br></span></p>
 
     <p>
-	%=l 'wrg_DESC_STATUS'
+      %= l 'wrg_DESC_STATUS'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_LABEL_STATUS'
+        %= l 'wrg_LABEL_STATUS'
       </span><span class=data>
         % param 'Status' => $wrg_datas->{status} unless param 'Status';
         %= select_field 'Status' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
         <br></span></p>
 
     <p>
-	%=l 'wrg_DESC_ALLOWEDIPS'
+      %= l 'wrg_DESC_ALLOWEDIPS'
     </p>
 
     <p><span class=label>
-	%=l 'wrg_LABEL_ALLOWEDIPS'
+        %= l 'wrg_LABEL_ALLOWEDIPS'
       </span><span class=data>
         % param 'Allowedips' => $wrg_datas->{allowedips} unless param 'Allowedips';
-	%=text_field 'Allowedips' => size => '45', class => 'input'
+        %= text_field 'Allowedips' => size => '45', class => 'input'
         <br></span></p>
 
     <div class='center'>

root/usr/share/smanager/themes/default/templates/partials/_wrg_rem.html.ep

@@ -2,29 +2,37 @@
 
   %= form_for '/wireguard2' => (method => 'POST') => begin
     <p>
-	%=l 'wrg_DESC_REMOVE_CLIENT'
+      %= l 'wrg_DESC_REMOVE_CLIENT'
     </p>
 
-	<p><br><span class=label>
-	%=l 'wrg_CONF_NAME'
-	</span>
+    <p><span class=label>
+        %= l 'wrg_USER'
+      </span><span class=data>
         %= $wrg_datas->{account}
-	<br></p>
+      </p>
 
       <p><span class=label>
-	%=l 'COMMENT'
+          %= l 'wrg_CONF_NAME'
+        </span><span class=data>
+          %= $wrg_datas->{wgconf}
         </span>
-	%= $wrg_datas->{wgcomment}
-	<br></p>
+      </p>
 
-<div class="center">
+      <p><span class=label>
+          %= l 'COMMENT'
+        </span><span class=data>
+          %= $wrg_datas->{wgcomment}
+        </span>
+      </p>
+
+      <div class="center">
         %= submit_button l('REMOVE'), name => 'remove', class => 'action left-btn'
         %= submit_button l('CANCEL'), name => 'cancel', class => 'action center-btn'
-</div>
+      </div>
 
       %= hidden_field 'trt' => $wrg_datas->{trt}
-    	%= hidden_field 'Wgconf' => $wrg_datas->{account}
+      %= hidden_field 'Wgconf' => $wrg_datas->{wgconf}
 
     % end
 
-</div>
+  </div>

smeserver-wireguard.spec

@@ -1,4 +1,4 @@
-%define release 25
+%define release 26
 %define version 1.0
 %define debug_package %{nil}
 
@@ -61,6 +61,9 @@ fi
 
 
 %changelog
+* Fri Sep 26 2025 Brian Read <brianr@koozali.org> 1.0-26.sme
+- Fix remove logic, add in user name to rem panel re-format templates,  add space to list panel [SME: 13168]
+
 * Thu Sep 25 2025 Brian Read <brianr@koozali.org> 1.0-25.sme
 - Sort outy Remove panel placement and operation of buttons [SME: 13168]