Local networks plus a few tweaks

Domains plus a few tweaks
More domains
2025-05-19 17:27:13 +02:00 · 2025-05-19 01:12:51 +02:00 · 2025-05-19 00:39:15 +02:00 · 2025-05-19 00:19:42 +02:00
20 changed files with 545 additions and 475 deletions
--- a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep
@@ -6,8 +6,8 @@

    % if (config->{debug} == 1) {
    <div>
-        %= dumper $c->current_route
-        %= dumper $dom_datas
+        <%= dumper $c->current_route %>
+        <%= dumper $dom_datas %>
    </div>
    % }

--- a/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep
@@ -5,16 +5,17 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    %= dumper $c->param("localnetwork");
-    %= dumper $c->stash("ln_datas");
-    %= dumper $c->param("deletehost");
-    </p>
+        <div>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+            <%= dumper $c->param("localnetwork") %>
+            <%= dumper $c->stash("ln_datas") %>
+            <%= dumper $c->param("deletehost") %>
+        </div>
    % }
-    
+
    <h1><%= $title%></h1>
+
     %= $modul

    % if ($ln_datas->{trt} eq 'ADD') {
@@ -30,4 +31,5 @@
    %}

 </div>
+
 %end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep
@@ -1,29 +1,38 @@
 <div>

-    %   my $btn = l('REMOVE');
-    %= form_for '/domains2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'dom_REMOVE_TITLE'
-    </h2>
-    </p>
+    % my $btn = l('REMOVE');

-    <p>
-    %= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
-    </p>
-    
-    <p><b>
-    %= l('dom_ABOUT_TO_REMOVE')
-    <b></p>
+    <form action="/smanager/domain2" method="POST">

-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+         <br>

-        %= hidden_field 'trt' => $dom_datas->{trt}
-        %= hidden_field 'Domain' => $dom_datas->{domain}
+         <div>
+             <h2><%=l 'dom_REMOVE_TITLE' %></h2>
+         </div>

-    % end    
+         <br>
+
+         <div>
+              <%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); %>
+         </div>
+
+         <br>
+
+         <div class="text-danger">
+             <%= l('dom_ABOUT_TO_REMOVE') %>
+         </div>
+
+         <br>
+
+         <div class="row g-3 align-items-center">
+             <div class="col-md-2">
+                 <button type="submit" class="btn btn-danger"><%= $btn %></button>
+             </div>
+         </div>
+
+         <%= hidden_field 'trt' => $dom_datas->{trt} %>
+         <%= hidden_field 'Domain' => $dom_datas->{domain} %>
+
+    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep
@@ -1,127 +1,123 @@
 <div>

    % my $btn = l('dom_ADD_DOMAIN');
+    <%= l('dom_FORM_DESCRIPTION'); %>

-
-    %= form_for '/domains' => (method => 'POST') => begin
-
-        %= l('dom_FORM_DESCRIPTION');
-        
-        <p>
+    <form action="/smanager/domains" method="POST">
        <br>
-        %= submit_button "$btn", class => ""
-        </p>
+        <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 'trt' => 'ADD' %>
+    </form>

-        %= hidden_field 'trt' => 'ADD'
-    
-    % end
+    <br>
+
+    <div>
+        <h2><%=l 'dom_CURRENT_DOMAINS' %></h2>
+    </div>
+
+    <br>

-    <h2>
-        %=l 'dom_CURRENT_DOMAINS'
-    </h2>
    <table class="table table-bordered">
-    <thead>
-    <tr>
-        <th class="">
-            %=l 'DOMAIN_NAME'
-        </th>
-        <th class="">
-            %=l 'DESCRIPTION_BRIEF'
-        </th>
-        <th class="">
-            %=l 'dom_CONTENT'
-        </th>
-        <th class="">
-            %=l 'dom_LABEL_NAMESERVERS'
-        </th>
-        <th class="">
-            %=l 'ACTION'
-        </th>
-    </tr>
-    </thead>
-    <tbody>
+        <thead>
+            <tr>
+                <th class="col-sm"><%=l 'DOMAIN_NAME' %></th>
+                <th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
+                <th class="col-sm"><%=l 'dom_CONTENT' %></th>
+                <th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
+                <th class="col-sm user-valign-center" colspan="2"><%=l 'ACTION' %></th>
+            </tr>
+        </thead>

-    % foreach my $domain ( @$domains ) {
-        <tr>
-            %= t td => (class => "") => $domain->{Domain}
-            %= t td => (class => "") => $domain->{'Description'}
-            %= t td => (class => "") => $domain->{'Content'}
-            %= t td => (class => "") => l('dom_' . $domain->{'Nameservers'})
+        <tbody>

-        %#  my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>"; 
-            %my $modify_text = l('MODIFY');  # Localized text
-            %my $csrf_token = "TOKEN";  # CSRF token for security
-            %my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
-            %my $actionModify = qq{
-                        %       <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
-            %   <button type='button' class="" title='$modify_text' >
-            %       $modify_text
-            %   </button>
-                        %       </a>
-            %};
-            %my $removable = ($domain->{Removable} || 'yes');
-            %my $actionRemove = '&nbsp;';
-            %if ($removable eq 'yes')  { 
-                    %my $remove_text = l('REMOVE');  # Localized text
-                    %my $csrf_token = "TOKEN";  # CSRF token for security
-                    %my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
-                    %$actionRemove = qq{
-                                                %       <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
-                        %   <button type='button' class="" title='$remove_text' >
-                        %       $remove_text
-                        %   </button>
-                                                %       </a>
+            % foreach my $domain ( @$domains ) {
+                <tr>
+                    <td><%= $domain->{Domain} %></td>
+                    <td><%= $domain->{'Description'} %></td>
+                    <td><%= $domain->{'Content'} %></td>
+                    <td><%= l('dom_' . $domain->{'Nameservers'}) %></td>
+
+                    %#  my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
+                    % my $modify_text = l('MODIFY');  # Localized text
+                    % my $csrf_token = "TOKEN";  # CSRF token for security
+                    % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+                    % my $actionModify = qq{
+                    % <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
+                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                    %       $modify_text
+                    %   </button>
+                    % </a>
                    %};
-                %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>"; 
-            %};
-            <td class="" style="min-width:15em">
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-            </td>
-        </tr>
-    %   }
+                    % my $removable = ($domain->{Removable} || 'yes');
+                    % my $actionRemove = '&nbsp;';
+                    % if ($removable eq 'yes')  {
+                            % my $remove_text = l('REMOVE');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+                            % $actionRemove = qq{
+                                % <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                            %};
+                        %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
+                    %};
+                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                </tr>
+            % }

-    </tbody>
+        </tbody>
    </table>

-    %= hidden_field 'trt' => 'ADD'
+    <%= hidden_field 'trt' => 'ADD' %>

-    %= form_for '/domains' => (method => 'POST') => begin
+    <form action="/smanager/domains" method="POST">

        <!-- <HR class="">-->
        <br>

        % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');

-        <h3>
-            %= l 'dom_DESC_CORPORATE_DNS_CURRENT'
-            </h3>
+        <h3><%= l 'dom_DESC_CORPORATE_DNS_CURRENT' %></h3>

-        <p>
-        <span class="">
-        %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
-        </span>
-        <span class="">
-        %= $dom_datas->{forwarder}
-        </span>
-        </p>
-
-        % if ($dom_datas->{forwarder2}) {
-        <p>
-        <span class="">
-        %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
-        </span>
-        <span class="">
-        %= $dom_datas->{forwarder2}
-        </span>
-        </p>
+        % if ($dom_datas->{forwarder}) {
+        <div class="row g-3 align-items-center">
+            <div class="col-md-3">
+                <%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %>
+            </div>
+            <div class="col-auto">
+                <%= $dom_datas->{forwarder} %>
+            </div>
+        </div>
        % }

-        <p>
-        %= submit_button "$btn2", class => ""
-        </p>
-        %= hidden_field 'trt' => 'UP2'
-    % end
+        % if ($dom_datas->{forwarder2}) {
+            <div class="row g-3 align-items-center">
+                <div class="col-md-3">
+                     <%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %>
+                </div>
+                <div class="col-auto">
+                     <%= $dom_datas->{forwarder2} %>
+                </div>
+            </div>
+        % }

+        <br>

+        <div class="row g-3 align-items-center">
+            <div class="col-md-auto">
+                <button type="submit" class="btn btn-primary"><%= $btn2 %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => 'UP2' %>
+
+    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
@@ -1,39 +1,46 @@
 <div>

-    %   my $btn = l('SAVE');
+    % my $btn = l('SAVE');

-    %= form_for '/domains2' => (method => 'POST') => begin
+    <form action="/smanager/domains2" method="POST">

-    <p><br>
-    %=l 'dom_DESC_CORPORATE_DNS'
-    </p>
+        <div>
+            <%=l 'dom_DESC_CORPORATE_DNS' %>
+        </div>

-    <p>
-    <span class="">
-    %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
-    </span>
-    <span class="">
-    % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
-    %= text_field 'Forwarder', class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => ""
-    </span>
-    <span class="">
-    % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
-    %= text_field 'Forwarder2',  class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-3">
+                <label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
+                <input type="text" name="Forwarder" id="inputCorpDNSPrimary" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{forwarder} %>">
+            </div>
+       </div>

-    <p>
-    %= submit_button "$btn", class => ""
-    </p>
+        <br>

-    %= hidden_field 'trt' => $dom_datas->{trt}
-    
-    %end
+        <div class="row g-3 align-items-center">
+            <div class="col-md-3">
+               <label for="inputCorpDNSSecondary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %></label>
+            </div>
+            <div class="col-auto">
+               % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
+               <input type="text" name="Forwarder2" id="inputCorpDNSSecondary" class="form-control" aria-describedby="inputCorpDNSSecondary" value="<%= $dom_datas->{forwarder2} %>">
+            </div>
+        </div>
+
+       <br>
+
+        <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 'trt' => $dom_datas->{trt} %>
+
+    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
@@ -1,74 +1,88 @@
 <div>

-    %   my $btn = l('ADD');
+    % my $btn = l('ADD');

-    %= form_for '/domains2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    % if ( $dom_datas->{trt} eq "ADD" ) {
-    %=l 'dom_CREATE_TITLE'
-    % } else {
-    %=l 'dom_MODIFY_TITLE'
-    %   $btn = l('MODIFY');
-    % }
-    </h2>
-    </p>
+    <form action="/smanager/domains2" method="POST">

-    <p><br>
-    <span class="">
-    %=l 'DOMAIN_NAME', class => ""
-    </span>
-    <span class="">
-    % if ( $dom_datas->{trt} eq "ADD" ) {
-    % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
-    %= text_field 'Domain', class => ""
-    % } else {
-        %= hidden_field 'Domain' => $dom_datas->{domain}
-    %= $dom_datas->{domain}, class => ""
-    % }
-    </span>
-    </p>
+        <br>

-    <p><br>
-    <span class="">
-    %=l 'DESCRIPTION_BRIEF', class => ""
-    </span>
-    <span class="">
-    % param 'Description' => $dom_datas->{description} unless param 'Description';
-    %= text_field 'Description', class => ""
-    </span>
-    </p>
+        <div>
+            <h2>
+            % if ( $dom_datas->{trt} eq "ADD" ) {
+                <%=l 'dom_CREATE_TITLE' %>
+            % } else {
+                <%=l 'dom_MODIFY_TITLE' %>
+                % $btn = l('MODIFY');
+            % }
+            </h2>
+        </div>

-    <p><br>
-    %=l 'dom_CONTENT_FIELD_DESCRIPTION'
-    <br>
-    <span class="">
-    %= $c->l('dom_CONTENT', '');
-    </span>
-    <span class="">
-    % param 'Content' => $dom_datas->{content} unless param 'Content';
-    %= select_field 'Content', $c->content_options_list(), class => ""
-    </span>
-    </p>
+        <br>

-    <p><br>
-    %=l 'dom_DESC_NAMESERVERS'
-    <br>
-    <span class="">
-    %=l 'dom_LABEL_NAMESERVERS', class => ""
-    </span>
-    <span class="">
-    % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
-    %= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
-    </span>
-    </p>
+        <div class="row g-3 algn-items-center">
+            <div class="col-md-2">
+                        <label for="Domain" class="col-form-label"><%=l 'DOMAIN_NAME' %></label>
+            </div>
+            <div class="col-auto">
+            % if ( $dom_datas->{trt} eq "ADD" ) {
+                % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
+                <input type="text" name="Domain" id="Domain" class="form-control" aria-describedby="inputDomain" value="<%= $dom_datas->{domain} %>">
+            % } else {
+                <%= hidden_field 'Domain' => $dom_datas->{domain} %>
+                <%= $dom_datas->{domain} %>
+            % }
+            </div>
+        </div>

-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <br>

-    %= hidden_field 'trt' => $dom_datas->{trt}
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Description' => $dom_datas->{description} unless param 'Description';
+                <input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
+            </div>
+        </div>

-    %end
+        <br>
+        <%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Content' => $dom_datas->{content} unless param 'Content';
+                <%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
+            </div>
+        </div>
+
+        <br>
+        <%=l 'dom_DESC_NAMESERVERS' %>
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
+                <%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
+            </div>
+        </div>
+
+        <br>
+
+        <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 'trt' => $dom_datas->{trt} %>
+
+    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
@@ -59,12 +59,12 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
            </div>
        </div>

-        %= hidden_field 'trt' => $grp_datas->{trt}
-        %= hidden_field 'groupName' => $grp_datas->{group}
+        <%= hidden_field 'trt' => $grp_datas->{trt} %>
+        <%= hidden_field 'groupName' => $grp_datas->{group} %>

      </form>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
@@ -7,6 +7,7 @@
        <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 'trt' => 'ADD' %>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep
@@ -22,7 +22,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
@@ -20,7 +20,7 @@

        <table class="table table-bordered">
            <thead>
-                <tr class="user-valign-center">
+                <tr class="">
                    <th class="col-sm"><%= l 'hos_HOSTNAME' %></th>
                    <th class="col-auto"><%= l 'hos_HOSTTYPE' %></th>
                    <th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep
@@ -5,50 +5,58 @@

    <form action="/smanager/hostentriesd" method="POST">

-        <h2>
        % if ( $hos_datas->{trt} eq "ALC" ) {
-            <h2><%=l 'hos_CREATE_TYPE'  %></h2>
-            % } else {
-            <h2><%=l 'hos_MODIFY_TYPE' %></h2>
+            <h2><%= l 'hos_CREATE_TYPE'  %></h2>
+        % } else {
+            <h2><%= l 'hos_MODIFY_TYPE' %></h2>
            % $btn = l('MODIFY');
        % }
-    
+
        <div>
            <%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
        </div>
-    
        <div>
            <%= l 'hos_LOCAL_IP_DESCRIPTION' %>
        </div>

-        <div>
-            <%= l 'hos_LOCAL_IP' %>
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'hos_LOCAL_IP' %>
+            </div>
+            <div class="col-auto">
+                % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
+                <%= text_field 'Internalip' %>
+            </div>
        </div>
-        
-        <div>
-            % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
-            <%= text_field 'Internalip' %>
-        </div>
-    
+
+        <br>
+
        <div>
            <%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
        </div>
-        
-        <div>
-            <%= l 'hos_ETHERNET_ADDRESS' %>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'hos_ETHERNET_ADDRESS' %>
+            </div>
+            <div class="col-auto">
+                % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
+                <%= text_field 'Macaddress' %>
+            </div>
        </div>
-    
-        <div>
-            % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
-            <%= text_field 'Macaddress' %>
-        </div>
-    
+
+        <br>
+
        <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 'trt' => $hos_datas->{trt} %>
        <%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
        <%= hidden_field 'Name' => $hos_datas->{name} %>
@@ -56,7 +64,8 @@
        <%= hidden_field 'Comment'=> $hos_datas->{comment} %>
        <%= hidden_field 'Hosttype'=> $hos_datas->{hosttype} %>
        <%= hidden_field 'Externalip' => $hos_datas->{externalip} %>
-    
+
+
    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep
@@ -18,17 +18,14 @@

        <br>

-
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
            </div>
        </div>

-        %= hidden_field 'trt' => $iba_datas->{trt}
-        %= hidden_field 'ibay' => $iba_datas->{ibay}
+        <%= hidden_field 'trt' => $iba_datas->{trt} %>
+        <%= hidden_field 'ibay' => $iba_datas->{ibay} %>
    </form>

-<br><br>
-
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
@@ -5,8 +5,10 @@

    <form action="/smanager/ibays" method="POST">
        <br>
-        <div>
-            <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+        <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 'trt' => 'ADD'; %>
    </form>
--- 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
@@ -4,7 +4,7 @@
    % my %ret;
    % unless (length($retref)) {%ret = (ret=>"");}
    % else {%ret = %$retref;}
-    
+
    % my @vars = split(",",$ret{vars});
    % my $var1 = @vars[0];
    % my $var2 = @vars[1];
@@ -14,63 +14,80 @@
    % my $var6 = @vars[5];

    %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);
+            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
        </div>
-       %} else { 
+       %} else {
       <div class="">
           <h2> Operation Status Report - Error</h2>
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
        </div>
    %}
    <br />
    % my $btn = l('ADD');
    % my $network_db = esmith::NetworksDB->open();
-    
+
   % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    </p>
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $c->stash("ret") %>
+    </div>
    % }
-     
-    %= form_for '/localnetworksb' => (method => 'POST') => begin
-        <h2>
-        %=l "ln_ADD_TITLE"
-        </h2>
-            <p>
-            %= $c->render_to_string(inline => l('ln_ADD_DESC'));
-            </p>
-            <br>
-            <span class="">
-                %=l "NETWORK"
-            </span>
-            <span class="">
-                %=text_field  'networkAddress'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "ln_SUBNET_MASK"
-            </span>
-            <span class="">
-                %=text_field 'networkMask'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "ROUTER"
-            </span>
-            <span class="">
-                %=text_field 'networkRouter'
-            </span>
-            <br><br>
-            <p>
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>
-    %end
+
+
+    <form action="/smanager/localnetworksb" method="POST">
+        <div>
+            <h2><%=l "ln_ADD_TITLE" %></h2>
+        </div>
+        <br>
+        <div>
+            <%= $c->render_to_string(inline => l('ln_ADD_DESC')); %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" >
+            </div>
+        </div>
+
+        <br><br>
+
+        <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
@@ -4,62 +4,85 @@
    % my $deletehosts = $ln_datas->{deletehosts};
    % my $subnet = $ln_datas->{subnet};
    % my $router = $ln_datas->{router};
-    
+
   % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    %= dumper %$ln_datas
-    %= dumper $deletehosts
-    </p>
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $c->stash("ret") %>
+        <%= dumper %$ln_datas %>
+        <%= dumper $deletehosts %>
+    </div>
    % }

-    %= form_for '/localnetworkse' => (method => 'POST') => begin
-        <h2>
-        %=l "ln_REMOVE_TITLE"
-        </h2>
-            <p>
-            %=l "ln_REMOVE_DESC"
-            </p>
-            <br>
-            <span class="">
-                %=l "NETWORK"
-            </span>
-            <span class="">
-                %=$localnetwork
-            </span>
-            <br><br>
-            <span class="">
-                %=l "ln_SUBNET_MASK"
-            </span>
-            <span class="">
-                %= $subnet
-            </span>
-            <br><br>
-            <span class="">
-                %=l "ROUTER"
-            </span>
-            <span class="">
-                %= $router
-            </span>
-            <br><br>
-            % if($deletehosts) {
-            <br>
-            %=$c->l("ln_REMOVE_HOSTS_DESC")
-            <br>
-            <span class="">
-                %= $c->l("ln_REMOVE_HOSTS_LABEL")
-            </span>
-            <span class="">
-                %=check_box deletehost=>1, checked=>1
-            </span>
-            <br><br>
-            %}
-            %= hidden_field localnetwork=>$localnetwork
-            <p>
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>
-    %end
+    <form action="/smanager/localnetworkse" method="POST">
+
+        <div>
+            <h2><%=l "ln_REMOVE_TITLE" %></h2>
+        </div>
+
+        <div>
+            <%=l "ln_REMOVE_DESC" %>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" value="<%= $localnetwork %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" value="<%= $subnet %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" value="<%= $router %>">
+            </div>
+        </div>
+
+        <br>
+
+        % if ($deletehosts) {
+        <br>
+
+        <b>tell me if you find this!</b>
+
+        <%=$c->l("ln_REMOVE_HOSTS_DESC") %>
+        <br>
+        <span class="">
+            <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
+        </span>
+        <span class="">
+            <%=check_box deletehost=>1, checked=>1 %>
+        </span>
+        <br><br>
+        % }
+
+        <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/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
@@ -1,108 +1,100 @@
 <div>
    % my $btn = l('ln_LOCALNETWORK_ADD');
-    %= form_for '/localnetworksa' => (method => 'POST') => begin

-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
+    <form action="/smanager/localnetworksa" method="POST">

-    % if (config->{debug} == 1) {
-    <p>
-        %= dumper "Ret:".$ret{ret};
-    </p>    
-    %}
+        <br>

-    % 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];
-    % my $var7 = @vars[6];
+        % my $retref= $c->stash("ret");
+        % my %ret;
+        % unless (length($retref)) {%ret = (ret=>"");}
+        % else {%ret = %$retref;}

+        % if (config->{debug} == 1) {
+            <div>
+                %= dumper "Ret:".$ret{ret};
+            </div>
+        % }

-    %if ($ret{ret} eq "") {
-        %=l "ln_FIRSTPAGE_DESC"
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <h2> Operation Status Report</h2>
-        %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
+        % 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];
+        % my $var7 = @vars[6];
+
+        %if ($ret{ret} eq "") {
+            <%= l "ln_FIRSTPAGE_DESC" %>
+        % } elsif (index($ret{ret},"SUCCESS") != -1) {
+            <br>
+            <div>
+                <h2> Operation Status Report</h2>
+                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+            </div>
+        % } else {
+            <div>
+                <h2> Operation Status Report - Error</h2>
+                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+            </div>
+        % }
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
        </div>
-       %} else { 
-       <div class="">
-           <h2> Operation Status Report - Error</h2>
-        %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-        </div>
-    %}

-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
-
-    % end    
+    </form>

    <br>
    % my $numlocalnetworks = @$localnetworks;
-    %   if ($numlocalnetworks == 0){
-        %=l 'ln_LOCAL_NETWORK_NONE'
-    %   } else {
+    % if ($numlocalnetworks == 0) {
+        <%= l 'ln_LOCAL_NETWORK_NONE' %>
+    % } else {
        <br>
        <table class="table table-bordered">
-        <thead>
-        <tr>
-            <th class="">
-                %=l 'NETWORK'
-            </th>
-            <th class="">
-                %=l 'ln_SUBNET_MASK'
-            </th>
-
-            <th class="">
-                %=l 'ln_NUMBER_OF_HOSTS'
-            </th>
-
-            <th class="">
-                %=l 'ROUTER'
-            </th>
-
-            <th class="">
-                %=l 'ACTION'
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-        %    foreach my $localnetwork (@$localnetworks )
-        %    {
-        %       my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
-        %       my $removable = $localnetwork->prop('Removable') || "yes";
-        %           my $system       = $localnetwork->prop('SystemLocalNetwork') || "no";
-        %           if ( $system eq "yes" ) { $removable = "no"; }
-                    <tr>
-                    %= t td => (class => "") => $localnetwork->key
-                    %= t td => (class => "") => $localnetwork->prop('Mask')
-                    %= t td => (class => "") => $num_hosts
-                    %= t td => (class => "") => $localnetwork->prop('Router')
-                    %my $actionRemove = '&nbsp;';
-                    %if ($removable eq "yes") {
-                        %my $remove_text = l('REMOVE');  # Localized text
-                        %my $local_network_entry = $localnetwork->key;
-                        %my $csrf_token = "TOKEN";  # CSRF token for security
-                        %$actionRemove = qq{
-                                                %       <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
-                        %   <button type='button' class="" title='$remove_text' >
-                        %       $remove_text
-                        %   </button>
-                                                %       </a>
-                        %};
+            <thead>
+                <tr>
+                    <th><%= l 'NETWORK' %></th>
+                    <th><%= l 'ln_SUBNET_MASK' %></th>
+                    <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
+                    <th><%= l 'ROUTER' %></th>
+                    <th><%= l 'ACTION' %></th>
+                </tr>
+            </thead>
+            <tbody>
+                % foreach my $localnetwork (@$localnetworks ) {
+                    % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
+                    % my $removable = $localnetwork->prop('Removable') || "yes";
+                    % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
+                    % if ( $system eq "yes" ) { $removable = "no"; }
+                        <tr>
+                            <td><%= $localnetwork->key %>
+                            <td><%= $localnetwork->prop('Mask') %>
+                            <td><%= $num_hosts %>
+                            <td><%= $localnetwork->prop('Router') %>
+                            % my $actionRemove = '&nbsp;';
+                            % if ($removable eq "yes") {
+                                %my $remove_text = l('REMOVE');  # Localized text
+                                %my $local_network_entry = $localnetwork->key;
+                                %my $csrf_token = "TOKEN";  # CSRF token for security
+                                %$actionRemove = qq{
+                                % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                                %};
+                            % }
+                            <td><%= $c->render_to_string(inline => $actionRemove) %></td>
+                        </tr>
                    % }
-                    <td class=""><%= $c->render_to_string(inline => $actionRemove) %></td>
-                    </tr>
-        %  } 
-        </tbody>
+            </tbody>
        </table>
-        %= hidden_field 'trt' => $ln_datas->{trt}
-    %}
+        <%= hidden_field 'trt' => $ln_datas->{trt} %>
+    % }
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep
@@ -14,11 +14,11 @@
        <br><br>
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
            </div>
        </div>

-        %= hidden_field 'trt' => $pse_datas->{trt}
-        %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
+        <%= hidden_field 'trt' => $pse_datas->{trt} %>
+        <%= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} %>
    </form>
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
@@ -2,19 +2,16 @@

    % my $btn = l('pse_CLICK_TO_CREATE');

-    %= $c->render_to_string(inline => l('pse_DESCRIPTION'));
-
-    %= form_for '/pseudonyms' => (method => 'POST') => begin
-
-        %= hidden_field 'trt' => 'ADD'
-
-         <div class="row g-3 align-items-center">
+    <form action="/smanager/pseudonyms" method="POST">
+        <%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
+        <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 'trt' => 'ADD' %>
+    </form>

-    % end
    <br>
    <h2><%= l 'pse_CURRENT_PSEUDONYMS' %></h2>
    <br>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
@@ -3,8 +3,7 @@
    % my $btn = l('REMOVE');

    <form action="/smanager/useraccountsd" method="POST">
-    %#= form_for '/useraccountsd' => (method => 'POST') => begin
-        
+
        <div>
            <h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
        </div>
@@ -14,9 +13,9 @@
        <br>
        %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
        </div>
-    
+
        <br><br>
-    
+
        <table class="table table-bordered user-table-max-wdith">
            <thead>
                <tr>
@@ -35,22 +34,21 @@
               </tr>
           </tbody>
        </table>
-    
+
        <br>
        %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
            </div>
        </div>
-    
-        %= hidden_field 'trt' => $usr_datas->{trt}
-        %= hidden_field 'user' => $usr_datas->{user}
-        %= hidden_field 'name' => $usr_datas->{name}
-        
-    %# end 
+
+        <%= hidden_field 'trt' => $usr_datas->{trt} %>
+        <%= hidden_field 'user' => $usr_datas->{user} %>
+        <%= hidden_field 'name' => $usr_datas->{name} %>
+
    </form>
-       
+

 </div>
--- 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 22
+%define release 24
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,12 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip

 %changelog
+* Mon May 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-24.sme
+- Local Networks and a few odd tidies
+
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-23.sme
+- Domains done plus more tweaks
+
 * Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-22.sme
 - Hosts done and a few tweaks
Author	SHA1	Message	Date
John Crisp	12f8be6936	Local networks plus a few tweaks	2025-05-19 17:27:13 +02:00
John Crisp	12ea3b7c0b	Domains plus a few tweaks	2025-05-19 01:12:51 +02:00
John Crisp	76fc62002e	More domains	2025-05-19 00:39:15 +02:00
John Crisp	85d5927cd7	Domains nearly done and a few tweaks	2025-05-19 00:19:42 +02:00