11.0.0-38.sme More formatting

More formatting with PortForwards
More formatting with LocalNetworks
2025-06-13 19:55:48 +02:00 · 2025-06-13 19:54:20 +02:00 · 2025-06-13 19:49:28 +02:00
5 changed files with 73 additions and 70 deletions
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep
+++ b/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="">
-               <h2> Operation Status Report</h2>
-                <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+           <div>
+               <!-- <h2> Operation Status Report</h2> -->
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
            </div>
        % } else {
-           <div class="">
-               <h2> Operation Status Report - Error</h2>
-                <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+           <div class="text-danger">
+               <!-- <h2> Operation Status Report - Error</h2> -->
+                <%= $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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep
+++ b/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>
-            <b>Please opoen a bug and tell me</b>
-
+            <div>
                <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
            <br>
-            <span class="">
-                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
-            </span>
-            <span class="">
-                <%= check_box deletehost=>1, checked=>1 %>
-            </span>
+            <div class="text-danger align-bottom">
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
+            </div>
            <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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
@@ -7,20 +7,6 @@

    <br>

-    % if ($ret{'ret'} eq "") {
-
-    % } elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-        </div>
-    % } else {
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-        </div>
-    % }
-
   % if (config->{debug} == 1) {
    <pre>
        <%= dumper $c->current_route %>
@@ -28,6 +14,24 @@
    </pre>
    % }

+    % if ($ret{'ret'} eq "") {
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
+       <div>
+           <!--<h2> Operation Status Report</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % } else {
+       <div class="text-danger">
+           <!--<h2> Operation Status Report - Error</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % }
+
+    <br>
+
    <h2><%= l "pf_CREATE_RULE" %></h2>

      <form action="/smanager/portforwardingb" method="POST">
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
@@ -1,11 +1,5 @@
 <div>

-
-
-    <form action="/smanager/portforwardinga" method="POST">
-
-    <br>
-
    % my $retref = $c->stash("ret");
    % my %ret = $retref ? %$retref : (ret => "");
    % my @vars = split(/,/, $ret{vars} // '');
@@ -16,15 +10,16 @@

    % if ($c->app->config->{debug}) {
        <pre>
-		%= dumper { ret_data => \%ret }
+            <%= dumper { ret_data => \%ret } %>
        </pre>
    % }

    % 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->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
@@ -39,6 +34,8 @@

    <br>

+    <form action="/smanager/portforwardinga" method="POST">
+
    % my $btn = l('pf_CREATE_RULE');

    <div class="row g-3 align-items-center">
@@ -49,7 +46,7 @@

    </form>

-
+    <br>

    % if ($empty) {
            <br>
--- 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 37
+%define release 38
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -28,6 +28,10 @@ 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]
Author	SHA1	Message	Date
John Crisp	1baec827d3	11.0.0-38.sme More formatting	2025-06-13 19:55:48 +02:00
John Crisp	2d6deb9b37	More formatting with PortForwards	2025-06-13 19:54:20 +02:00
John Crisp	f547a5300d	More formatting with LocalNetworks	2025-06-13 19:49:28 +02:00