11.0.0-38.sme More formatting

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

@@ -13,24 +13,23 @@
     % }
 
 	% if ($ret{ret} eq "") {
-		<br>
+		<div>
             <%= l "ln_FIRSTPAGE_DESC" %>
-        <BR>
+        </div>
         % } elsif (index($ret{ret},"SUCCESS") != -1) {
-           <div class="">
+           <div>
-               <h2> Operation Status Report</h2>
+               <!-- <h2> Operation Status Report</h2> -->
-                <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
             </div>
         % } else {
-           <div class="">
+           <div class="text-danger">
-               <h2> Operation Status Report - Error</h2>
+               <!-- <h2> Operation Status Report - Error</h2> -->
-                <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
             </div>
     % }
 
     <br>
 
-    % my $btn = l('ADD');
     % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
 
     % if (config->{debug} == 1) {
@@ -84,11 +83,14 @@
 
         <br><br>
 
+        % my $btn = l('ADD');
+
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
+
     </form>
 
 </div>

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

@@ -6,12 +6,12 @@
     % my $router = $ln_datas->{router};
 
    % if (config->{debug} == 1) {
-    <div>
+    <pre>
         <%= dumper $c->current_route %>
         <%= dumper $c->stash("ret") %>
         <%= dumper %$ln_datas %>
         <%= dumper $deletehosts %>
-    </div>
+    </pre>
     % }
 
     <form action="/smanager/localnetworkse" method="POST">
@@ -62,28 +62,24 @@
         % if ($deletehosts) {
             <br>
 
-            <b>tell me if you find this!</b>
+            <div>
-            <b>Please opoen a bug and tell me</b>
-
                 <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
             <br>
-            <span class="">
+            <div class="text-danger align-bottom">
-                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
-            </span>
+            </div>
-            <span class="">
-                <%= check_box deletehost=>1, checked=>1 %>
-            </span>
             <br><br>
         % }
 
+        <%= hidden_field localnetwork=>$localnetwork %>
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
 
-        <%= hidden_field localnetwork=>$localnetwork %>
-
     </form>
 
 </div>

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

@@ -1,95 +1,122 @@
 <div>
 
-    % my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-    % my %ret;
+    % my %ret = $retref ? %$retref : (ret => "");
-    % unless (length($retref)) {%ret = (ret=>"");}
+    % my @vars = split(/,/, $ret{vars} // '');
-    % else {%ret = %$retref;}
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
-    
-    % my @vars = split(",",$ret{vars});
-    % my $var1 = @vars[0];
-    % my $var2 = @vars[1];
-    % my $var3 = @vars[2];
-    % my $var4 = @vars[3];
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
 
     <br>
-    %if ($ret{'ret'} eq "") {
-    
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-       %} else { 
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-    %}
-    <br />
-    % my $btn = l('ADD');
 
    % if (config->{debug} == 1) {
-    <p>
+    <pre>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $c->stash("ret")
+        <%= dumper $c->stash("ret") %>
-    </p>
+    </pre>
     % }
 
-    %= form_for '/portforwardingb' => (method => 'POST') => begin
+    % if ($ret{'ret'} eq "") {
-        <h2>
+        <div>
-        %=l "pf_CREATE_RULE"
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
-        </h2>
+        </div>
-            <p>
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
-                %=l "pf_SUMMARY_ADD_DESC"
+       <div>
-            </p><br>
+           <!--<h2> Operation Status Report</h2>-->
-            <span class="">
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-                %=l "pf_LABEL_PROTOCOL"
+        </div>
-            </span>
+    % } else {
-            <span class="">
+       <div class="text-danger">
-                %=select_field  'proto'=>["TCP","UDP"]
+           <!--<h2> Operation Status Report - Error</h2>-->
-            </span><br><br>
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-            <span class="">
+        </div>
-                %=l "pf_LABEL_SOURCE_PORT"
+    % }
-            </span>
-            <span class="">
-                %=text_field 'sport'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_PORT"
-            </span>
-            <span class="">
-                %=text_field 'dport'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_HOST"
-            </span>
-            <span class="">
-                %=text_field 'dhost'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_ALLOW_HOSTS"
-            </span>
-            <span class="">
-                %=text_field 'allow'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_RULE_COMMENT"
-            </span>
-            <span class="">
-                %=text_field 'cmmnt'
-            </span>
-            <br><br>
-            <p>
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>
 
-    %end
+    <br>
+
+    <h2><%= l "pf_CREATE_RULE" %></h2>
+
+      <form action="/smanager/portforwardingb" method="POST">
+
+        <br>
+        <div>
+            <%= l "pf_SUMMARY_ADD_DESC" %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l "pf_LABEL_PROTOCOL" %>
+            </div>
+            <div class="col-auto">
+                <%=select_field  'proto'=>["TCP","UDP"], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSourcePort" class="col-form-label"><%= l "pf_LABEL_SOURCE_PORT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="sport" id="inputSourcePort" class="form-control" aria-describedby="Source Port">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputDestinationPort" class="col-form-label"><%= l "pf_LABEL_DESTINATION_PORT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="port" id="inputDestinationPort" class="form-control" aria-describedby="Destination Port">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputDestinationHost" class="col-form-label"><%= l "pf_LABEL_DESTINATION_HOST" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="dhost" id="inputDestinationHost" class="form-control" aria-describedby="Destination Host">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputAllowHosts" class="col-form-label"><%= l "pf_ALLOW_HOSTS" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="allow" id="inputAllowHosts" class="form-control" aria-describedby="Allow Hosts">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputRuleComment" class="col-form-label"><%= l "pf_RULE_COMMENT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="cmmnt" id="inputRuleComment" class="form-control" aria-describedby="Comment">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('ADD');
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

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

@@ -1,6 +1,5 @@
 <div>
 
-    % my $btn = l('REMOVE');
     % my $proto = $pf_datas->{proto};
     % my $sport = $pf_datas->{sport};
     % my $dport = $pf_datas->{dport};
@@ -8,7 +7,7 @@
     % my $cmmnt = $pf_datas->{cmmnt};
     % my $allow = $pf_datas->{allow};
 
-   % if (config->{debug} == 0) {
+   % if (config->{debug} == 1) {
         <pre>
             <%= dumper $c->current_route %>
             <%= dumper $c->stash("ret") %>
@@ -23,11 +22,17 @@
             <%= l 'pf_SUMMARY_REMOVE_DESC' %>
         </div>
 
+        <br>
+
         <table>
+        <thead>
+            <th class="col-md-4">&nbsp</th>
+            <th class="col-md-4">&nbsp</th>
+        </thead>
             <tbody>
-                <tr>
+                <tr >
                     <td>
-                        <% l 'pf_LABEL_PROTOCOL' %>
+                        <%= l 'pf_LABEL_PROTOCOL' %>
                     </td>
                     <td>
                        <%= $proto %>
@@ -35,7 +40,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_LABEL_SOURCE_PORT' %>
+                        <%= l 'pf_LABEL_SOURCE_PORT' %>
                     </td>
                     <td>
                        <%= $sport %>
@@ -43,7 +48,7 @@
                 <tr>
                 <tr>
                     <td>
-                        <% l 'pf_LABEL_DESTINATION_HOST' %>
+                        <%= l 'pf_LABEL_DESTINATION_HOST' %>
                     </td>
                     <td>
                        <%= $dport %>
@@ -51,7 +56,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_LABEL_DESTINATION_PORT' %>
+                        <%= l 'pf_LABEL_DESTINATION_PORT' %>
                     </td>
                     <td>
                        <%= $dhost %>
@@ -59,7 +64,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_RULE_COMMENT' %>
+                        <%= l 'pf_RULE_COMMENT' %>
                     </td>
                     <td>
                         <%= $cmmnt %>
@@ -67,7 +72,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_ALLOW_HOSTS' %>
+                        <%= l 'pf_ALLOW_HOSTS' %>
                     </td>
                     <td>
                         <%= $allow %>
@@ -76,9 +81,13 @@
             </tbody>
         </table>
 
+        <br>
+
         <%= hidden_field sport=>$sport %>
         <%= hidden_field proto=>$proto %>
 
+        % my $btn = l('REMOVE');
+
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>

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

@@ -1,45 +1,41 @@
 <div>
 
-
+    % my $retref = $c->stash("ret");
-
+    % my %ret = $retref ? %$retref : (ret => "");
-    <form action="/smanager/portforwardinga" method="POST">
+    % my @vars = split(/,/, $ret{vars} // '');
-
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
-    <br>
-
-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
 
     % my $numtcpforwards = @$tcpforwards;
     % my $numudpforwards = @$udpforwards;
 
-    % my @vars = split(",",$ret{vars});
+    % if ($c->app->config->{debug}) {
-    % my $var1 = @vars[0];
+        <pre>
-    % my $var2 = @vars[1];
+            <%= dumper { ret_data => \%ret } %>
-    % my $var3 = @vars[2];
+        </pre>
-    % my $var4 = @vars[3];
+    % }
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
 
     % if ($ret{ret} eq "") {
+        <div>
             <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
     % } elsif (index($ret{ret},"SUCCESS") != -1) {
-        <br>
+
         <div>
            <h2> Operation Status Report</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
         </div>
     % } else {
         <br>
         <div class="text-danger">
            <h2> Operation Status Report - Error</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+           <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
         </div>
     % }
 
     <br>
 
+    <form action="/smanager/portforwardinga" method="POST">
+
     % my $btn = l('pf_CREATE_RULE');
 
     <div class="row g-3 align-items-center">
@@ -50,9 +46,9 @@
 
     </form>
 
+    <br>
 
-
+    % if ($empty) {
-    % if ($empty){
             <br>
             <%= l 'pf_NO_FORWARDS' %>
     % } else {

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

@@ -9,7 +9,7 @@
         <%= dumper "<pf>".$c->current_route %>
         <%= dumper $c->stash("ret") %>
         <%= dumper $c->stash("portforwarding") %>
-        %  my $ref = $pf_datas->{portforwarding}; %>
+        %  my $ref = $pf_datas->{portforwarding};
         <%= dumper $ref->{TCP}->[0]."</pf>" %>
     </pre>
     % }

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 36
+%define release 38
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -16,7 +16,7 @@ BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: smeserver-devtools
 Requires: smeserver-release >= 11.0
-Requires: smeserver-manager >= 11.0.0
+Requires: smeserver-manager >= 11.0.0-91
 Requires: smeserver-lib >= 11.0.0-13
 Requires: e-smith-manager >= 2.4.0-22
 
@@ -28,6 +28,13 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-38.sme
+- More formatting for LocalNetworks
+- More formatting for PortForwards
+
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-37.sme
+- Finish portforwarding to work with [SME:13043]
+
 * Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-36.sme
 - Cosmetic tweaks
 - Localnetworking fix via [SME: 13041]