Update clamav. Modify ibayupd,ln list, start remoteaccess

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

@@ -5,40 +5,45 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <div>
+    <pre>
-        (DBG)route: <%= $c->current_route %><br>
+        Route: <%= dumper $c->current_route %><br>
-        (DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>
+        FsS stat: <%= dumper $clm_datas->{FilesystemScan}%> <br>
-        (DBG)Quar stat: <%=$clm_datas->{Quarantine} %>
+        Quar stat: <%= dumper $clm_datas->{Quarantine} %>
-    </div>
+    </pre>
     % }
 
     <h1><%= $title %></h1>
-    <br>
+    <!-- reetp This $module should be split ijto two lines -->
-
+    <%= $modul %> 
-    <%= $modul %>
+    
-
-    <%  my $btn = l('SAVE'); %>
     <br><br>
+    
     <form action="/smanager/clamav" method="POST">
-
+        
         <div class="row g-3 align-items-center">
-            <div class="col-auto">
+            <div class="col-md-2">
-                <h6><%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>:</h6>
+                <%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>:
+            </div>
+            <div class="col-md-2">
                 % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
                 <%= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => "form-select" %>
             </div>
         </div>
+        
         <br>
+        
         <div class="row g-3 align-items-center">
-            <br>
+            <div class="col-md-2">
-            <div class="col-auto">
+                <%= l 'clm_LABEL_QUARANTINE' %>:
-                <h6><%= l 'clm_LABEL_QUARANTINE' %>:</h6>
+            </div>
+            <div class="col-md-2">
                 % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine';
                 <%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
-            <br>
             </div>
         </div>
-
+        
+        <br>
+        
         <div>
             <div>
                 <h6><%= l 'clm_LABEL_CLAM_VERSIONS' %>:</h6>
@@ -47,7 +52,11 @@
                 <%= $clm_datas->{clam_versions} %>
             </div>
         </div>
+        
         <br>
+
+        <%  my $btn = l('SAVE'); %>
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>

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

@@ -5,7 +5,6 @@
 
     <form action="/smanager/ibaysd" method="POST">
 
-
     <div>
         <h2><%=l 'iba_ADD_TITLE' %></h2>
     </div>
@@ -36,7 +35,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-            <label for="inputIbayDesc" class="col-form-label"><%= l 'DESCRIPTION' %></label>
+                <label for="inputIbayDesc" class="col-form-label"><%= l 'DESCRIPTION' %></label>
             </div>
             <div class="col-auto">
                 % param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc';
@@ -50,7 +49,6 @@
             <div class="col-md-2">
                 <%= l 'GROUP' %>
             </div>
-
             <div class="col-auto">
                 % param 'group' => $iba_datas->{group} unless param 'group';
                 %= select_field 'group' => $c->group_list_m(), class => "form-select"
@@ -63,7 +61,6 @@
             <div class="col-md-2">
                <%= l 'iba_USER_ACCESS' %>
             </div>
-
             <div class="col-auto">
                 % param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess';
                 %= select_field 'userAccess' => $c->userAccess_list_m(), class => "form-select"
@@ -76,7 +73,6 @@
             <div class="col-md-2">
               %=l 'iba_PUBLIC_ACCESS'
             </div>
-
             <div class="col-auto">
                 % param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess';
                 %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => "form-select"
@@ -89,7 +85,6 @@
             <div class="col-md-2">
                 <%=l 'iba_ALLOW_DYNAMIC_CONTENT' %>
             </div>
-
             <div class="col-auto">
                 % param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin';
                 %= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select"
@@ -102,7 +97,6 @@
             <div class="col-md-2">
                 <%=l 'iba_HTTPS_Only' %>
             </div>
-
             <div class="col-auto">
                 % param 'SSL' => $iba_datas->{SSL} unless param 'SSL';
                 %= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select"

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

@@ -1,29 +1,28 @@
 <div>
-    % my $btn = l('ln_LOCALNETWORK_ADD');
 
     <form action="/smanager/localnetworksa" method="POST">
 
         <br>
 
-        % my $retref= $c->stash("ret");
+        % my $retref = $c->stash("ret");
         % my %ret;
         % unless (length($retref)) {%ret = (ret=>"");}
         % else {%ret = %$retref;}
+        
+        <!-- So at this point the next section is only relevant it ret is not defined -->
 
-        % if (config->{debug} == 1) {
+        %# my $element_count = scalar(@ret);
-            <div>
-                %= dumper "Ret:".$ret{ret};
-            </div>
-        % }
 
-        % my @vars = split(",",$ret{vars});
+        %# if (length $element_count == 0) {
-        % my $var1 = @vars[0];
+            % my @vars = split(",",$ret{vars});
-        % my $var2 = @vars[1];
+            % my $var1 = $vars[0];
-        % my $var3 = @vars[2];
+            % my $var2 = $vars[1];
-        % my $var4 = @vars[3];
+            % my $var3 = $vars[2];
-        % my $var5 = @vars[4];
+            % my $var4 = $vars[3];
-        % my $var6 = @vars[5];
+            % my $var5 = $vars[4];
-        % my $var7 = @vars[6];
+            % my $var6 = $vars[5];
+            % my $var7 = $vars[6];
+        %# }
 
         %if ($ret{ret} eq "") {
             <%= l "ln_FIRSTPAGE_DESC" %>
@@ -41,60 +40,63 @@
         % }
 
         <br><br>
-
+        
+        % my $btn = l('ln_LOCALNETWORK_ADD');
+        
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
 
-    </form>
-
-    <br>
-    % my $numlocalnetworks = @$localnetworks;
-    % if ($numlocalnetworks == 0) {
-        <%= l 'ln_LOCAL_NETWORK_NONE' %>
-    % } else {
         <br>
-        <table class="table table-bordered">
+    
-            <thead>
+        % my $numlocalnetworks = @$localnetworks;
-                <tr>
+        % if ($numlocalnetworks == 0) {
-                    <th><%= l 'NETWORK' %></th>
+            <%= l 'ln_LOCAL_NETWORK_NONE' %>
-                    <th><%= l 'ln_SUBNET_MASK' %></th>
+        % } else {
-                    <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
+            <br>
-                    <th><%= l 'ROUTER' %></th>
+            <table class="table table-bordered">
-                    <th><%= l 'ACTION' %></th>
+                <thead>
-                </tr>
+                    <tr>
-            </thead>
+                        <th><%= l 'NETWORK' %></th>
-            <tbody>
+                        <th><%= l 'ln_SUBNET_MASK' %></th>
-                % foreach my $localnetwork (@$localnetworks ) {
+                        <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
-                    % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
+                        <th><%= l 'ROUTER' %></th>
-                    % my $removable = $localnetwork->prop('Removable') || "yes";
+                        <th><%= l 'ACTION' %></th>
-                    % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
+                    </tr>
-                    % if ( $system eq "yes" ) { $removable = "no"; }
+                </thead>
-                        <tr>
+                <tbody>
-                            <td><%= $localnetwork->key %>
+                    % foreach my $localnetwork (@$localnetworks ) {
-                            <td><%= $localnetwork->prop('Mask') %>
+                        % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
-                            <td><%= $num_hosts %>
+                        % my $removable = $localnetwork->prop('Removable') || "yes";
-                            <td><%= $localnetwork->prop('Router') %>
+                        % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
-                            % my $actionRemove = '&nbsp;';
+                        % if ( $system eq "yes" ) { $removable = "no"; }
-                            % if ($removable eq "yes") {
+                            <tr>
-                                %my $remove_text = l('REMOVE');  # Localized text
+                                <td><%= $localnetwork->key %>
-                                %my $local_network_entry = $localnetwork->key;
+                                <td><%= $localnetwork->prop('Mask') %>
-                                %my $csrf_token = "TOKEN";  # CSRF token for security
+                                <td><%= $num_hosts %>
-                                %$actionRemove = qq{
+                                <td><%= $localnetwork->prop('Router') %>
-                                % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
+                                % my $actionRemove = '&nbsp;';
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                % if ($removable eq "yes") {
-                                %       $remove_text
+                                    %my $remove_text = l('REMOVE');  # Localized text
-                                %   </button>
+                                    %my $local_network_entry = $localnetwork->key;
-                                % </a>
+                                    %my $csrf_token = "TOKEN";  # CSRF token for security
-                                %};
+                                    %$actionRemove = qq{
-                            % }
+                                    % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
-                            <td><%= $c->render_to_string(inline => $actionRemove) %></td>
+                                    %   <button type='button' class="btn btn-primary" title='$remove_text' >
-                        </tr>
+                                    %       $remove_text
-                    % }
+                                    %   </button>
-            </tbody>
+                                    % </a>
-        </table>
+                                    %};
-        <%= hidden_field 'trt' => $ln_datas->{trt} %>
+                                % }
-    % }
+                                <td><%= $c->render_to_string(inline => $actionRemove) %></td>
+                            </tr>
+                        % }
+                </tbody>
+            </table>
+            <%= hidden_field 'trt' => $ln_datas->{trt} %>
+        % }
+    
+    </form>
 </div>

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

@@ -5,100 +5,99 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $rma_datas
+        <%= dumper $rma_datas %>
-    </p>
+        </pre>
     % }
+
     <h1><%= $title%></h1>
+
     % if ( $notif ) {
-    <br>
+        <br>
-    <span class="">
+        <div>
-    <%= $c->render_to_string(inline => $notif) %>
+            <%= $c->render_to_string(inline => $notif) %>
-    </span>
+        </div>
     %}
 
     <!--<hr class="" />-->
 
     <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'remoteaccess' => (method => 'POST') => begin
+    
+    <form action="/smanager/remoteaccess" method="POST">
 
     % my $ipsec = $c->get_ipsecrw_status();
     % if ( $ipsec ) {
-    <p>
+    
-    <h2>
+        <h2><%= l 'rma_TITLE_IPSECRW' %></h2>
-    %=l 'rma_TITLE_IPSECRW'
+        <div>
-    </h2><br>
+            <%= l 'rma_DESC_IPSECRW' %>
-
+        </div>
-    %=l 'rma_DESC_IPSECRW'
+        <div>
-    <br>
+            <%= l 'rma_LABEL_IPSECRW_SESS' %>
-
+        </div>
-    <span class="">
+        <div>
-    %=l 'rma_LABEL_IPSECRW_SESS'
+            % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
-    </span>
+            <%= text_field 'IpsecrwSess', class => "" %>
-    <span class="">
+        </div>
-    % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
+        <br>
-    %= text_field 'IpsecrwSess', class => ""
+    
-    </span>
+        <div>
-    <br>
+            <%= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));  %>
-
+        </div>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));
+        <br>
-    <br>
+        <div>
-    <span class="">
+            <%= l 'rma_LABEL_IPSECRW_RESET' %>
-    %=l 'rma_LABEL_IPSECRW_RESET'
+        </div>
-    </span>
+        <div>
-    <span class="">
+            <%= check_box 'IpsecrwReset',class => "" %>
-    %= check_box 'IpsecrwReset',class => ""
+        </div>
-    </span>
+        <br><br>
-    <br><br>
-
     <!--<hr class="" />-->
 
     %}
 
     <!-- percequ include 'partials/_rma_pptp' -->
 
-    <h2>
+    <h2><%= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT')); %></h2>
-    %= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT'));
+    
-    </h2><br>
+    <br>
-    %=l 'rma_VALIDFROM_DESC'
+    
+    <div>
+        <%= l 'rma_VALIDFROM_DESC' %>
+    </div>
+
     <br><br>
 
     % my @vals = $self->_get_valid_from();
     % if (@vals) {
-    <table class="table table-bordered">
+        <table class="table table-bordered">
-    <thead>
+            <thead>
-    <tr>
+                <tr>
-    <th class="">
+                    <th><%= l 'NETWORK' %></th>
-            %=l 'NETWORK'
+                    <th><%= l 'rma_SUBNET_MASK' %></th>
-            </th><th class="">
+                    <th><%= l 'rma_NUM_OF_HOSTS' %></th>
-            %=l 'SUBNET_MASK'
+                    <th><%= l 'REMOVE' %></th>
-            </th><th class="">
+                </tr>
-            %=l 'NUM_OF_HOSTS'
+            </thead>
-            </th><th class="">
+            <tbody>
-            %=l 'REMOVE'
+        
-        </th>
+            % foreach my $val ( @vals ) {
-        </tr>
+            %     my ($net, $mask) = split '/', $val;
-        </thead>
+            %     $mask = '255.255.255.255' unless ($mask);
-        </tbody>
+            %     my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
-
+                <tr>
-    %    foreach my $val ( @vals )
+                    <td><%= $net %></td>
-    %    {
+                    <td><%= $mask %></td>
-    %        my ($net, $mask) = split '/', $val;
+                    <td><%= $numhosts %></td>
-    %        $mask = '255.255.255.255' unless ($mask);
+                    <td>
-    %        my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
+                    <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
-        <tr>
+                    </td>
-            %= t td => (class => "") => $net
+                </tr>
-            %= t td => (class => "") => $mask
+            %    }
-            %= t td => (class => "") => $numhosts
+        
-            <td class="">
+            </tbody>
-            <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
-            </td>
-        </tr>
-    %    }
-
-        </tbody>
         </table>    
 
     <!-- my @cbGroup = $q->checkbox_group(-name => 'validFromRemove',
@@ -106,126 +105,172 @@
             foreach my $val (@vals)
             { esmith::cgi::genSmallCell($q, shift(@cbGroup), } -->
     % } else {
-    <br><b>
+        <br>
-        %= l('rma_NO_ENTRIES_YET');
+        <b><%= l('rma_NO_ENTRIES_YET'); %></b>
-    </b>
+    % }
-    %}
+
-    %=l 'rma_DESC_VALID_FROM_ENTRIES'
+    <%= l 'rma_DESC_VALID_FROM_ENTRIES' %>
+    
     <br><br>
-    <span class="">
+    
-    %=l 'NETWORK'
+    <div class="row g-3 align-items-center">
-    </span>
+         <div class="col-md-2">
-    <span class="">
+            <%= l 'NETWORK' %>
-    %= text_field 'ValidFromNetwork', class => ""
+        </div>
-    </span>
+        <div class="col-auto">
+            <%= text_field 'ValidFromNetwork', class => "" %>
+        </div>
+    </div>
+
     <br>
-    <span class="">
+
-    %=l 'rma_SUBNET_MASK'
+    <div class="row g-3 align-items-center">
-    </span>
+         <div class="col-md-2">
-    <span class="">
+            <%= l 'rma_SUBNET_MASK' %>
-    %= text_field 'ValidFromMask', class => ""
+        </div>
-    </span>
+        <div class="col-auto">
+            <%= text_field 'ValidFromMask', class => "" %>
+        </div>
+    </div>
 
     <!--<hr class="" />-->
 
-    <h2>
+    <h2><%= l 'rma_TITLE_SSH' %></h2>
-    %=l 'rma_TITLE_SSH'
+    
-    </h2><br>
-    %=l 'rma_DESC_SSH'
-    <br><br>
-    <span class="">
-    %=l 'rma_LABEL_SSH'
-    </span>
-    <span class="">
-    % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess';
-    %= select_field 'SshAccess' => $c->networkAccess_list(), class => ""
-    </span>
     <br>
     
-    <span class="">
+    <div>
-    %=l 'rma_LABEL_SSH_ADMIN'
+        <%= l 'rma_DESC_SSH' %>
-    </span>
+    </div>
-    <span class="">
+
-    % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
+    <br><br>
-    %= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
+
-    </span>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_SSH' %>
+        </div>
+        <div class="col-md-2">
+        % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess';
+        <%= select_field 'SshAccess' => $c->networkAccess_list(), class => "form-select" %>
+        </div>
+    </div>
+
+    <br>
+    
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_SSH_ADMIN' %>
+        </div>
+        <div class="col-auto">
+            % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
+            <%= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
+        </div>
+    </div>
+
     <br>
 
-    <span class="">
+    <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_SSH_PASSWORD_ACCESS'
+        <div class="col-md-2">
-    </span>
+            <%= l 'rma_LABEL_SSH_PASSWORD_ACCESS' %>
-    <span class="">
+        </div>
-    % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
+        <div class="col-auto">
-    %= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
+            % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
-    </span>
+            <%= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
+        </div>
+    </div>
+    
     <br>
 
-    <span class="">
+    <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_SSH_PORT'
+        <div class="col-md-2">
-    </span>
+            <%= l 'rma_LABEL_SSH_PORT' %>
-    <span class="">
+        </div>
-    % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
+        <div class="col-auto">
-    %= text_field 'SshTCPPort', class => ""
+            % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
-    </span>
+            <%= text_field 'SshTCPPort' %>
+        </div>
+    </div>
+
     <br>
 
     <!--<hr class="" />-->
 
-    <h2>
+    <h2><%= l 'rma_TITLE_FTP_ACCESS' %></h2>
-    %=l 'rma_TITLE_FTP_ACCESS'
-    </h2><br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS'));
-
     <br>
-    <span class="">
+    <div>
-    %=l 'rma_LABEL_FTP_ACCESS'
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS')); %>
-    </span>
+    </div>
-    <span class="">
+    
-    % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess';
-    %= select_field 'FtpAccess' => $c->networkAccess_list(), class => ""
-    </span>
     <br>
 
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_FTP_ACCESS' %>
+        </div>
+        <div class="col-auto">
+            % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess';
+            <%= select_field 'FtpAccess' => $c->networkAccess_list(), class => "form-select" %>
+        </div>
+    </div>
+    
     <br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN'));
     <br>
-    <span class="">
+    
-    %=l 'rma_LABEL_FTP_LOGIN'
+    <div>
-    </span>
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN')); %>
-    <span class="">
+    </div>
-    % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess';
+
-    %= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => ""
+    <br>
-    </span>
+    
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_FTP_LOGIN' %>
+        </div>
+        <div class="col-auto">
+            % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess';
+            <%= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => "form-select" %>
+        </div>
+    <div>
+
     <br>
 
     % my $mode = $c->get_telnet_mode();
     % if ( $mode ne 'off') {
-    <!--<hr class="" />-->
+        <!--<hr class="" />-->
+    
+        <h2><%= l 'rma_TITLE_TELNET_ACCESS' %></h2>
+            
+        <br>
+        
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rma_DESC_TELNET_ACCESS' %>
+            </div>
+        <div>
+    
+        <br><br>
+        
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rma_LABEL_TELNET_ACCESS' %>
+            </div>
+            <div class="col-auto">
+                % param 'TelnetAccess' => $mode unless param 'TelnetAccess';
+                <%= select_field 'TelnetAccess' => $c->networkAccess_list(), class => "form-select" %>
+            </div>
+        </div>
 
-    <h2>
+        <br>
-    %=l 'rma_TITLE_TELNET_ACCESS'
-    </h2><br>
 
-    <span class="">
+    % }
-    %=l 'rma_DESC_TELNET_ACCESS'
-    </span>
-    <br><br>
-
-    <span class="">
-    %=l 'rma_LABEL_TELNET_ACCESS'
-    </span>
-    <span class="">
-    % param 'TelnetAccess' => $mode unless param 'TelnetAccess';
-    %= select_field 'TelnetAccess' => $c->networkAccess_list(), class => ""
-    </span>
-    <br>
-
-    %}
 
     <br>
-    %= submit_button "$btn", class => ""
 
-    % end
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
 
 </div>