Update version number

Update clamav. Modify ibayupd,ln list, start remoteaccess
Add autocomplete to login. Updates to quota list
2025-06-10 23:10:32 +02:00 · 2025-06-10 23:05:00 +02:00 · 2025-06-10 21:40:12 +02:00 · 2025-06-09 15:27:17 +02:00 · 2025-06-09 13:38:09 +02:00 · 2025-06-06 19:22:25 +02:00
26 changed files with 1390 additions and 1007 deletions
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
@@ -1,3 +1,6 @@
+html {
+    font-size: 14px;
+}

 #busy-indicator {
    display: none;
@@ -50,8 +53,8 @@
 }

 .login-page {
-    min-height: 10vh;
-    vertical-align: top !important;
+    min-height: 60vh !important ;
+    vertical-align: top !important ;
 }

 .nav-icon {
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js
@@ -1,33 +1,22 @@
-// js/sme-password.js
+$(document).ready(function () {
+  const togglePassword = document.querySelector("#togglePassword");
+  const password = document.querySelector("#password");

-$(document).ready(function() {
-/*     // For each password input
-    $('.sme-password').each(function() {
-        // Create a new container
-        //alert("sme-password");
-        var $inputContainer = $('<div class="input-container"></div>');
-        
-        // Move the input into the new container
-        $(this).wrap($inputContainer);
-        
-        // Create the toggle image
-        var $togglePassword = $('<img src="images/visible.png" alt="Show Password" class="toggle-password" />');
-        
-        // Append the toggle image to the container
-        $(this).after($togglePassword);
-    }); */
+  let pass = togglePassword;

-    $('.toggle-password').on('click', function() {
-        // Find the associated password field
-        var input = $(this).siblings('.sme-password');
-
-        // Toggle the type attribute between password and text
-        var inputType = input.attr('type') === 'password' ? 'text' : 'password';
-        input.attr('type', inputType);
-        
-        // Toggle the icon source based on the input type
-        // Check boostrap colours?
-//        var iconSrc = inputType === 'password' ? 'images/visible.png' : 'images/visible-slash.png';
-//        $(this).attr('src', iconSrc);
-    });
-});
+  if (pass) {
+  togglePassword.addEventListener("click", function () {
+    // toggle the type attribute
+    const type = password.getAttribute("type") === "password" ? "text" : "password";
+    password.setAttribute("type", type);
+    // toggle the eye icon
+    if (type === "text") {
+      $(this).removeClass("bi-eye");
+      $(this).addClass("bi-eye-slash");
+    } else {
+      $(this).removeClass("bi-eye-slash");
+      $(this).addClass("bi-eye");
+    }
+  });
+}
+});
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
@@ -4,83 +4,97 @@

 <div class="card-body">
    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%=  dumper $c->current_route %>
+            <%=  dumper $bac_datas %>
+        </pre>
    % }

    % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
+        <br>
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
+        </div>
    %}

    <h1><%= $title%></h1>

-    <h2>
-    %=l 'bac_ENABLE_DISABLE_TAPE'
-    </h2><br>
+    <br>

-    %= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC'))
+    <h2><%= l 'bac_ENABLE_DISABLE_TAPE' %></h2>

-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>

-    <p>
-    <span class="">
-    %=l 'bac_ENABLE_TAPE_BACKUP'
-    </span>
-    <span class="">
-    % if ( $bac_datas->{status} eq 'checked' ) {
-    <input type='checkbox' name='Tapebackup' checked >
-    %} else {
-    %= check_box 'Tapebackup'
-    %}
-    </span>
-    </p>
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC')) %>
+    </div>
+
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_ENABLE_TAPE_BACKUP' %>
+            </div>
+            <div class="col-auto">
+            % if ( $bac_datas->{status} eq 'checked' ) {
+                <input type='checkbox' name='Tapebackup' checked >
+            % } else {
+                <input type='checkbox' name='Tapebackup'>
+            % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_TAPE_BACKUP_TIME' %>
+            </div>
+            <div class="col-auto">
+                % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
+                <%=  text_field 'BackupHour', size => '2' %>
+                % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
+                <%=  text_field 'BackupMin', size => '2' %>
+            </div>
+            <div class="col-auto">
+                % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
+                <%=  select_field 'BackupAMPM' => ['AM', 'PM'], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>


-    <p>
-    <span class="">
-    %=l 'bac_TAPE_BACKUP_TIME'
-    </span>
-    <span class="">
-    % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
-    %= text_field 'BackupHour', size => '2'
-    % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
-    %= text_field 'BackupMin', size => '2'
-    </span>
-    <!--span class="">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
-    % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
-    %= select_field 'BackupAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_LOAD_TAPE_REMINDER_TIME' %>
+            </div>
+            <div class="col-auto">
+                % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
+                <%=  text_field 'ReminderHour', size => '2' %>
+                % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
+                <%=  text_field 'ReminderMin', size => '2' %>
+            </div>
+            <div class="col-auto">
+                % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
+                <%=  select_field 'ReminderAMPM' => ['AM', 'PM'], class => "form-select" %>
+            </div>
+        </div>

-    <p>
-    <span class="">
-    %=l 'bac_LOAD_TAPE_REMINDER_TIME'
-    </span>
-    <span class="">
-    % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
-    %= text_field 'ReminderHour', size => '2'
-    % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
-    %= text_field 'ReminderMin', size => '2'
-    </span>
-    <!--span class="">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
-    % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
-    %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p><br>
+        <br>

-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_UPDATE_CONF'), class => ""
+        <%=  hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_UPDATE_CONF');
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>

-    % end
 </div>
 % end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
@@ -5,34 +5,44 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $bac_datas %>
+    </pre>
    % }

    % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
        </div>
-    %}
+    % }

    <h1><%= $title%></h1>

-    %= form_for '/backupd' => (method => 'POST') => begin
-
-    <h2>
-    %=l 'bac_RESTORE_CONF_FROM_TAPE'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC'))
-
    <br>

-    %= hidden_field 'Function' => $bac_datas->{'function'}
+    <form action="/smanager/backupd" method="POST">

-    %= submit_button $c->l('bac_RESTORE_FROM_TAPE'), class => ""
+        <h2><%=l 'bac_RESTORE_CONF_FROM_TAPE' %></h2>
+
+        <br>
+
+        <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) %>
+
+        <br>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_RESTORE_FROM_TAPE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    <form>

-    % end
 </div>
 % end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
@@ -5,54 +5,68 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+    <pre>
+     <%=  dumper $c->current_route %>
+     <%=  dumper $bac_datas %>
+    </pre>
    % }

    % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br><div class="text-danger">
+         <%=  $c->render_to_string(inline => stash 'error') %>
    </div>
    %}

-    <h1><%= $title%></h1>
+    <h1><%=  $title%></h1>

-    %= form_for '/backup' => (method => 'POST') => begin
-
-    <h2>
-    %=l 'bac_CONFIGURE_WORKSTN_BACKUP'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC'))
-
-    %=l 'bac_WORKSTN_BACKUP_ENABLED'
-    <span class="">
-    %= $bac_datas->{status}
-    </span>
    <br>

-    %= $c->render_to_string(inline => $c->workstnBackupConfig())
+    <form action="/smanager/backup" method="POST">

-    <p>
-    <h3>
-    %= l 'bac_WORKSTATION_BACKUP_SETCONF'
-    </h3>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_VFS_TYPE'
-    </span>
-    <span class="">
-    % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
-    %= select_field 'VFSType' => $c->get_VFSType_options(), class => ""
-    </span>
-    </p>
+        <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>

-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('NEXT'), class => ""
+        <br>

-    % end
+        <%=  $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC')) %>
+
+        <br>
+
+        <div>
+            <%= l 'bac_WORKSTN_BACKUP_ENABLED' %>: <%=  $bac_datas->{status} %>
+        </div>
+
+        <br>
+
+        <%=  $c->render_to_string(inline => $c->workstnBackupConfig()) %>
+
+        <br>
+
+        <h3><%= l 'bac_WORKSTATION_BACKUP_SETCONF' %></h3>
+
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                 <%= l 'bac_SELECT_VFS_TYPE' %>
+            </div>
+            <div class="col-auto">
+                % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
+                 <%=  select_field 'VFSType' => $c->get_VFSType_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%=  hidden_field 'Function' => $bac_datas->{'function'} . '1' %>
+
+        % my $btn = l('NEXT');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>

 </div>

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

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

    % if ( stash 'warning' ) {
        <br>
-        <div>
-        %= $c->render_to_string(inline => stash 'warning') 
+        <div class="col-md-4 bg-info text-center">
+            <%=  $c->render_to_string(inline => stash 'warning') %>
        </div>
-    %}
+        <br>
+    % }
    % if ( stash 'error' ) {
        <br>
-        <div>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error')  %>
        </div>
-    %}
+        <br>
+    % }

    <h1><%= $title%></h1>
+
    <!--br>Still incomplete click here for previous version
    <a href="/server-manager/cgi-bin/backup" target='_blank'><b>(Previous Backup version)</b></a>
-    <br-->
-
-    <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module}, 
-        $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
-
-    <form action="/smanager/backup" method="POST">
-        %#= form_for '/backup' => (method => 'POST') => begin
-    
-    <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
-
-    <div>
-    <%= l 'bac_TAPE_BACKUPS' %>,
-    <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
-
-    % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
-        %= $c->l('bac_BACKUPS_RUN_AT')
-        %=  $bac_datas->{'backupTime'}
-        %= $c->l('bac_REMINDER_MESSAGE_AT')
-        %= $bac_datas->{'reminderTime'}
-    % }
-    </div>
-    
-    <div>
-
-    <%=l 'bac_WORKSTN_BACKUPS' %>,
-    <%= $c->l(uc($bac_datas->{'backupwkStatus'})) . '.' %>
-    % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
-        <%= $c->l('bac_WKBACKUPS_RUN_AT') %>
-        <%= $bac_datas->{'backupwkTime'} %>
-    % }
-    </div>
-
-    <div>
-    <%= l 'bac_SELECT_AN_ACTION' %>
-    % param 'Function' => $bac_datas->{function} unless param 'Function';
-    <%= select_field 'Function' => $c->get_function_options() %>
-    </div>
+    -->

    <br>

-        <%  my $btn = $c->l('PERFORM'); %>
-         <div class="row g-3 align-items-center">
+    <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module},
+    $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
+
+    <form action="/smanager/backup" method="POST">
+        <br>
+
+        <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
+
+        <br>
+
+        <div>
+            <div>
+                <%= l 'bac_TAPE_BACKUPS' %>: <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
+            </div>
+
+
+            % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
+                <div>
+                    <%=  $c->l('bac_BACKUPS_RUN_AT') %>: <%=   $bac_datas->{'backupTime'} %>
+                </div>
+                <br>
+                <div>
+                    <%=  $c->l('bac_REMINDER_MESSAGE_AT') %>: <%=  $bac_datas->{'reminderTime'} %>
+                </div>
+            % }
+        </div>
+
+        <br>
+
+        <div>
+            <div>
+                <%=l 'bac_WORKSTN_BACKUPS' %>:  <%= $c->l(uc($bac_datas->{'backupwkStatus'})) . '.' %>
+            </div>
+            <div>
+                % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
+                    <%= $c->l('bac_WKBACKUPS_RUN_AT') %>: <%= $bac_datas->{'backupwkTime'} %>
+                % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_SELECT_AN_ACTION' %>
+            </div>
+
+            <div class="col-auto">
+                % param 'Function' => $bac_datas->{function} unless param 'Function';
+                <%= select_field 'Function' => $c->get_function_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = $c->l('PERFORM');
+
+        <div class="row g-3 align-items-center">
            <div class="col-md-2">
                <button type="submit" class="btn btn-primary"><%= $btn %></button>
            </div>
        </div>
-    % end
+
+    </form>

 </div>
-
 % end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
@@ -5,40 +5,45 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <div>
-        (DBG)route: <%= $c->current_route %><br>
-        (DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>
-        (DBG)Quar stat: <%=$clm_datas->{Quarantine} %>
-    </div>
+    <pre>
+        Route: <%= dumper $c->current_route %><br>
+        FsS stat: <%= dumper $clm_datas->{FilesystemScan}%> <br>
+        Quar stat: <%= dumper $clm_datas->{Quarantine} %>
+    </pre>
    % }

    <h1><%= $title %></h1>
-    <br>
-
-    <%= $modul %>
-
-    <%  my $btn = l('SAVE'); %>
+    <!-- reetp This $module should be split ijto two lines -->
+    <%= $modul %> 
+    
    <br><br>
+    
    <form action="/smanager/clamav" method="POST">
-
+        
        <div class="row g-3 align-items-center">
-            <div class="col-auto">
-                <h6><%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>:</h6>
+            <div class="col-md-2">
+                <%= 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-auto">
-                <h6><%= l 'clm_LABEL_QUARANTINE' %>:</h6>
+            <div class="col-md-2">
+                <%= l 'clm_LABEL_QUARANTINE' %>:
+            </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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
@@ -5,5 +5,5 @@
 %#= stylesheet 'css/sme-jquery-overrides.css'

 %= stylesheet 'dist/css/adminlte.min.css'
-%= stylesheet 'dist/icons/font/bootstrap-icons.min.css'
-%#= stylesheet 'dist/css/overlayscrollbars.min.css' 
+%= stylesheet 'dist/font/bootstrap-icons.min.css'
+%#= stylesheet 'dist/css/overlayscrollbars.min.css'
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
@@ -5,72 +5,91 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <div>
+    <pre>
        %= dumper $c->current_route
        %= dumper $mai_datas
-    </div>
+    </pre>
    % }
-    
+
    % if ( stash 'error' ) {
        <br>
-        <div class="">
+        <div class="text-danger">
            <%= $c->render_to_string(inline => stash 'error') %>
        </div>
    % }

    <h1><%= $title%></h1>

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

-        <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
-    
        <div>
-            <%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+            <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
        </div>
-        
-        <div>
-            % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
-            <%= select_field 'POPAccess' => $c->get_pop_opt() %>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
+                <%= select_field 'POPAccess' => $c->get_pop_opt(), class => "form-select" %>
+            </div>
        </div>
-    
+
+        <br>
+
        <div>
            <%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
        </div>
-        
-        <div>
-            <%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
+                <%= select_field 'IMAPAccess' => $c->get_imap_opt(), class => "form-select" %>
+            </div>
        </div>
-        
-        <div>
-            % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
-            <%= select_field 'IMAPAccess' => $c->get_imap_opt() %>
-        </div>
-    
+
+        <br>
+
        <div>
            <%= l 'mai_DESC_WEBMAIL' %>
        <div>
-    
-        <div>
-            <%=l 'mai_LABEL_WEBMAIL' %>
-        </div>
-    
-        <div>
-            % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
-            <%= select_field 'WebMail' => $c->get_webmail_opt() %>
-        </div>
-    
-        % 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>
-                </div>
-            </div>
-        %= hidden_field 'trt' => 'ACC'

-    %# end    
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'mai_LABEL_WEBMAIL' %>
+            </div>
+            <div class="col-auto">
+                % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
+                <%= select_field 'WebMail' => $c->get_webmail_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%= hidden_field 'trt' => 'ACC' %>
+
+        <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>
-    
+
+    <br>
+
 </div>
 %end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
@@ -5,108 +5,147 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $mai_datas %>
+        </pre>
    % }
-    
+
+
    % if ( stash 'error' ) {
        <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
        </div>
-    %}
+    % }

-    <h1><%= $title%></h1>
+    <h1><%= $title %></h1>

-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <br>

-    <h2>
-    %=l 'mai_TITLE_UNKNOWN'
-    </h2>
+    <form action="/smanager/emailsettingd" method="POST">

-    %=l 'mai_DESC_UNKNOWN'
+        <h2><%= l 'mai_TITLE_UNKNOWN' %></h2>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_UNKNOWN'
-    </span>
-    <span class="">
-    % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
-    %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => ""
-    </span>
-    </p>
+        <br>

-    <!--<hr class="" />-->
-    <h2>
-    %=l 'mai_TITLE_DELEGATE'
-    </h2>
+        <div>
+            <%= l 'mai_DESC_UNKNOWN' %>
+        </div>

-    %=l 'mai_DESC_DELEGATE'
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_DELEGATE'
-    </span>
-    <span class="">
-    % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
-    %= text_field 'DelegateMailServer', class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_UNKNOWN' %>
+            </div>
+            <div class="col-auto">
+                % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
+                <%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "form-select" %>
+            </div>
+        </div>

-    <!--<hr class="" />-->
-    <h2>
-    %=l 'mai_TITLE_SMARTHOST'
-    </h2>
+        <br>

-    %=l 'mai_DESC_SMARTHOST'
+        <!--<hr class="" />-->
+        <h2><%= l 'mai_TITLE_DELEGATE' %></h2>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST'
-    </span>
-    <span class="">
-    % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
-    %= text_field 'SMTPSmartHost', class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
-    </span>
-    <span class="">
-    % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
-    %= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_DELEGATE' %>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
-    </span>
-    <span class="">
-    % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
-    %= text_field 'SMTPAUTHPROXY_Userid', class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
-    </span>
-    <span class="">
-    % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
-    %= password_field 'SMTPAUTHPROXY_Passwd', class => ""
-    </span>
-    </p>
+        % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';

-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDelegateMailServer" class="col-form-label"><%= l 'mai_LABEL_DELEGATE' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="DelegateMailServer" id="inputDelegateMailServer" class="form-control" aria-describedby="DelegateMailServer" value="<%= $mai_datas->{delegatemailserver} %>">
+            </div>
+        </div>

-    %= hidden_field 'trt' => 'DEL'
-    % end    
+        <br>

+        <!--<hr class="" />-->
+        <h2><%= l 'mai_TITLE_SMARTHOST' %></h2>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SMARTHOST' %>
+        </div>
+
+        <br>
+
+        % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSMTPSmartHost" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SMTPSmartHost" id="inputSMTPSmartHost" class="form-control" aria-describedby="SMTPSmartHost" value="<%= $mai_datas->{smtpsmarthost} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSMTPAuthproxy" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SMTPAUTHPROXY_Userid" id="inputSMTPAuthproxy" class="form-control" aria-describedby="SMTPAuthproxy" value="<%= $mai_datas->{smtpauthproxyuserid} %>">
+            </div>
+        </div>
+
+        <br>
+
+       % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="password" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' %></label>
+            </div>
+           <div class="col-auto">
+                <input type="password" name="SMTPAUTHPROXY_Passwd" id="password" class="form-control" aria-describedby="SMTPAuthProxyPassword" value="<%= $mai_datas->{smtpauthproxypassword} %>">
+            </div>
+            <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%= hidden_field 'trt' => 'DEL' %>
+
+        <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>
 </div>
 %end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
@@ -2,130 +2,174 @@

 % content_for 'module' => begin

-<div class="card-body"
+<div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $mai_datas %>
+        </pre>
    % }

    % if ( stash 'error' ) {
        <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
        </div>
-    %}
+    % }

    <h1><%= $title%></h1>

-    %= form_for '/emailsettingd' => (method => 'POST') => begin
-
-    %=l 'mai_DESC_VIRUS_SCAN'
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_VIRUS_SCAN'
-    </span>
-    <span class="">
-    % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
-    %= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
    <br>
-    </p>

-    %=l 'mai_DESC_SPAM_SCAN'
+    <form action="/smanager/emailsettingd" method="POST">

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SCAN'
-    </span>
-    <span class="">
-    % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
-    %= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_VIRUS_SCAN' %>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SENSITIVITY'
-    </span>
-    <span class="">
-    % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
-    %= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_TAGLEVEL'
-    </span>
-    <span class="">
-    % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
-    %= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                    <%= l 'mai_LABEL_VIRUS_SCAN' %>
+            </div>
+            <div class="col-auto">
+                % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
+                <%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_REJECTLEVEL'
-    </span>
-    <span class="">
-    % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
-    %= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SORTSPAM'
-    </span>
-    <span class="">
-    % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
-    %= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_SPAM_SCAN' %>
+        </div>

-    %=l 'mai_DESC_SPAM_SUBJECT'
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SUBJECTTAG'
-    </span>
-    <span class="">
-    % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
-    %= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_SCAN' %>
+            </div>
+            <div class="col-auto">
+                % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
+                <%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SUBJECT'
-    </span>
-    <span class="">
-    % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
-    %= text_field 'SpamSubject' => class => ""
-    </span>
-    </p>
+        <br>

-    %=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_SENSITIVITY' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
+                <%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "form-select" %>
+            </div>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_CONTENT_TO_BLOCK'
-    </span>
-    <span class="">
-    % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
-    %= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "", multiple => "1"
-    </span>
-    </p>
+        <br>

-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_TAGLEVEL' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
+                <%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "form-select" %>
+            </div>
+        </div>

-    %= hidden_field 'trt' => 'FIL'
-    % end
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_REJECTLEVEL' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
+                <%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SORTSPAM' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
+                 <%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SPAM_SUBJECT' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_SUBJECTTAG' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
+                <%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSpamSubjectTag" class="col-form-label"><%= l 'mai_LABEL_SPAM_SUBJECT' %></label>
+            </div>
+            <div class="col-auto">
+                <!-- text_field 'Soft' -->
+                <input type="text" name="SpamSubject" id="inputSpamSubjectTag" class="form-control" aria-describedby="SpamSubjectTag" value="<%= $mai_datas->{spamsubject} %>">
+            </div>
+        </div>
+
+
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_CONTENT_TO_BLOCK' %>
+            </div>
+            <div class="col-auto">
+                % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
+                <%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "form-select", multiple => "1" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%= hidden_field 'trt' => 'FIL'  %>
+
+        <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>
 %end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
@@ -8,196 +8,279 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    %= dumper $c->param('SMTPAuth')
-    </p>
+        <pre>
+            <<%=  dumper $c->current_route %>
+            <<%=  dumper $mai_datas %>
+            <<%=  dumper $c->param('SMTPAuth') %>
+        </pre>
    % }

    % if ( stash 'error' ) {
        <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <<%=  $c->render_to_string(inline => stash 'error') %>
        </div>
-    %}
-    
-    <h1><%= $title%></h1>
+    % }

-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <h1><%=  $title %></h1>

-    %=l 'mai_DESC_MODE'
+    <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_MODE'
-    </span>
-    <span class="">
-    % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
-<!--
-    <pre>
-        %= dumper $mai_datas->{fetchmailmethod}
-        %= dumper $c->get_retrieval_opt()
-        %= param 'FetchmailMethod'
-    </pre>
-->
-    %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => ""
-    </span>
-    </p>
+    <form action="/smanager/emailsettingd" method="POST">

-    %#=l 'mai_DESC_SMTP_AUTH_CONTROL'
-    <br />
-    %= l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client."
-    <br />
-    %= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send."
-    <br />
-    %= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send."
-    <br />
+        <div>
+            <%= l 'mai_DESC_MODE' %>
+        </div>

-    % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-    </span>
-    <span class="">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_MODE' %>
+            </div>
+            <div class="col-auto">
+                % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
+                <!--
+                <pre>
+                    <%=  dumper $mai_datas->{fetchmailmethod}  %>
+                    <%=  dumper $c->get_retrieval_opt()  %>
+                    <%=  param 'FetchmailMethod'  %>
+                </pre>
+                -->
+                <%=  select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class =>"form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+
+        <div>
+            <div>
+                <b><i>Note - this first line was disabled?</b></i>
+
+                <br>
+                <%= l 'mai_DESC_SMTP_AUTH_CONTROL'  %>
+                <br>
+                <b><i>/end</b></i>
+            </div>
+
+            <br>
+
+            <div>
+                <%=  l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client." %>
+            </div>
+
+            <br>
+
+            <div>
+
+                <%=  l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %>
+            </div>
+
+            <br>
+
+            <div>
+                <%=  l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." %>
+            </div>
+
+        </div>
+
+        <br>
+
+
+
+        % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
        % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
-<!--
-    <pre>
-        %= dumper $c->get_smtp_auth_opt()
-        %= dumper $c->get_current_smtp_auth(FALSE)
-        %= dumper $c->get_db_prop("qpsmtpd","Authentication")
-        %= param 'SMTPAuth'
-    </pre>
-->
-        %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => ""
-    </span>
-    </p>

-    % my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-    </span>
-    <span class="">
-        % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';    
-        %= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=  sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
+            </div>
+            <div class="col-auto">

-    %my $smtp_mesg=l('Submission port %u status:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-    </span>
-    <span class="">
+                <!--
+                <pre>
+                    <%=  dumper $c->get_smtp_auth_opt() %>
+                    <%=  dumper $c->get_current_smtp_auth(FALSE) %>
+                    <%=  dumper $c->get_db_prop("qpsmtpd","Authentication") %>
+                    <%=  param 'SMTPAuth'  %>
+                </pre>
+                -->
+                <%=  select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
+        % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=  sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $smtp_mesg=l('Submission port %u status:');
        % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
-    <!--
-    <pre>
-        %= dumper $c->get_smtp_ssl_auth_opt()
-        %= dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE)
-        %= dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE)
-        %= dumper $c->get_db_prop("uqpsmtpd","access")
-        %= param 'uSMTPAuth'
-    </pre>
-    -->
-    %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
-    </span>
-    </p>

-    <!--<hr class="" />-->
-    <h2>
-    %=l 'mai_TITLE_SECONDARY'
-    </h2>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=  sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
+            </div>
+            <div class="col-auto">
+                <!--
+                <pre>
+                    <%=  dumper $c->get_smtp_ssl_auth_opt() %>
+                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) %>
+                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) %>
+                    <%=  dumper $c->get_db_prop("uqpsmtpd","access") %>
+                    <%=  param 'uSMTPAuth' %>
+                </pre>
+                -->
+                <%=  select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
+            </div>
+        </div>

-    %=l 'mai_DESC_SECONDARY'
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SECONDARY'
-    </span>
-    <span class="">
-    % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
-    %= text_field 'SecondaryMailServer', class => ""
-    </span>
-    </p>
+        <h2><%= l 'mai_TITLE_SECONDARY' %></h2>

-    %=l 'mai_DESC_FETCH_PERIOD'
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_FETCH_PERIOD'
-    </span>
-    <span class="">
-    % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
-    %= select_field 'FreqOffice' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_SECONDARY' %>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
-    </span>
-    <span class="">
-    % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
-    %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
-    </span>
-    <span class="">
-    % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
-    %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
+        % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_ACCOUNT'
-    </span>
-    <span class="">
-    % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
-    %= text_field 'SecondaryMailAccount', class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSecondaryMailServer" class="col-form-label"><%= l 'mai_LABEL_SECONDARY' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SecondaryMailServer" id="inputSecondaryMailServer" class="form-control" aria-describedby="SecondaryMailServer" value="<%= $mai_datas->{secondarymailserver} %>">
+            </div>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_PASS'
-    </span>
-    <span class="">
-    % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
-    %= password_field 'SecondaryMailPassword', class => ""
-    </span>
-    </p>
+        <br>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SORT_METHOD'
-    </span>
-    <span class="">
-    % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
-    %= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_FETCH_PERIOD' %>
+        </div>

-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SORT_HEADER'
-    </span>
-    <span class="">
-    % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
-    %= text_field 'SecondaryMailEnvelope', class => ""
-    </span>
-    </p>
+        % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';

-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_FETCH_PERIOD' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'FreqOffice' => $c->fetchmail_freq(), class => "form-select" %>
+            </div>
+        </div>

-    %= hidden_field 'trt' => 'REC'
-    % end    
+        <br>
+
+        % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_FETCH_PERIOD_NIGHTS' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'FreqOutside' => $c->fetchmail_freq(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'FreqWeekend' => $c->fetchmail_freq(), class => "form-select" %>
+             </div>
+        </div>
+
+        <br>
+
+        % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSecondaryMailAccount" class="col-form-label"><%= l 'mai_LABEL_POP_ACCOUNT' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SecondaryMailAccount" id="inputSecondaryMailAccount" class="form-control" aria-describedby="SecondaryMailAccount" value="<%= $mai_datas->{secondarymailaccount} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="password" class="col-form-label"><%= l 'mai_LABEL_POP_PASS' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="password" name="SecondaryMailPassword" id="password" class="form-control" aria-describedby="SecondaryMailPassword" value="<%= $mai_datas->{secondarymailpassword} %>">
+            </div>
+            <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+        </div>
+
+
+        <br>
+
+        % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SORT_METHOD' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSecondaryMailEnvelope" class="col-form-label"><%= l 'mai_LABEL_SORT_HEADER' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SecondaryMailEnvelope" id="inputSecondaryEnvelope" class="form-control" aria-describedby="SecondaryMailEnvelope" value="<%= $mai_datas->{secondarymailenvelope} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%=  hidden_field 'trt' => 'REC' %>
+
+        <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>

 </div>
-%end
+%end
+
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
@@ -24,8 +24,8 @@
    %}

    <h1><%= $title%></h1>
-    <br>

+    <br>

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

@@ -220,6 +220,8 @@
            </div>
        </div>

+        <br>
+
    </form>
 </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep
@@ -64,12 +64,15 @@
              </div>
              <div class="input-group-text"><span class="bi bi-person-fill"></span></div>
            </div>
+
            <div class="input-group mb-1">
              <div class="form-floating">
-                <input name='Password' id="Password" type="password" class="form-control" placeholder="<%=l 'PASSWORD'%>">
-                <label for="Password">Password</label>
+                <input type="password" name="Password" id="password" class="form-control" placeholder="<%=l 'PASSWORD'%>" autocomplete="on">
+                <label for="password">Password</label>
+              </div>
+              <div class="input-group-text">
+                <span id="togglePassword" class="bi bi-eye"></span>
              </div>
-              <div class="input-group-text"><span class="bi bi-lock-fill"></span></div>
            </div>

            <%= hidden_field 'From' => $c->tx->req->url %>
@@ -94,9 +97,11 @@
            <!--end::Row-->
          </form>
          <br>
+          <!--
          <div class="mb-1 text-center">
              <a href="login2">I forgot my password</a>
          </div>
+          -->
        </div>
        <!-- /.login-card-body -->
      </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep
@@ -9,4 +9,4 @@
    % }
    <br>Copyright 1999-2006 Mitel Corporation<br>
    %= session 'copyRight'
-    <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
+    <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_upd.html.ep
+++ b/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"
--- 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
@@ -28,7 +28,7 @@
    %}
    <br />
    % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB->open();
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";

   % if (config->{debug} == 1) {
    <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,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) {
-            <div>
-                %= dumper "Ret:".$ret{ret};
-            </div>
-        % }
+        %# my $element_count = scalar(@ret);

-        % 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 (length $element_count == 0) {
+            % 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" %>
@@ -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>
-                <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>
-                    % }
-            </tbody>
-        </table>
-        <%= hidden_field 'trt' => $ln_datas->{trt} %>
-    % }
+    
+        % my $numlocalnetworks = @$localnetworks;
+        % if ($numlocalnetworks == 0) {
+            <%= l 'ln_LOCAL_NETWORK_NONE' %>
+        % } else {
+            <br>
+            <table class="table table-bordered">
+                <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>
+                        % }
+                </tbody>
+            </table>
+            <%= hidden_field 'trt' => $ln_datas->{trt} %>
+        % }
+    
+    </form>
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
@@ -4,11 +4,20 @@

    <%= $modul %>

+    % if (config->{debug} == 1) {
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $userAccounts %>
+    </pre>
+    % }
+
    <h2><%= l 'quo_CURRENT_USAGE_AND_SETTINGS' %></h2>

    <br>

    % my $numUsers = @$userAccounts;
+
+
    % if ($numUsers == 0){
        <%= l 'ACCOUNT_USER_NONE' %>
    % } else {
@@ -32,14 +41,21 @@
            <tbody>

            % foreach my $user (@$userAccounts) {
-            %     my $uid = getpwnam($user->key);
-            %     unless ($uid) {
-            %       warn($self->localise('COULD_NOT_GET_UID'),$user->key);
-            %       next;
-            %     }
-            %     my $name = $user->prop("FirstName")." ".$user->prop("LastName");
-            %     my $dev = Quota::getqcarg('/home/e-smith/files');
-            %     my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+
+            % my $uid = getpwnam($user->key);
+
+            % if (config->{debug} == 1) {
+                UID <%= l 'quo_COULD_NOT_GET_UID' %> <%= dumper $user->key %><br>
+            % }
+
+            <br>
+            % unless ($uid) {
+            %     warn (l 'quo_COULD_NOT_GET_UID', $user->key);
+            %     next;
+            % }
+            % my $name = $user->prop("FirstName")." ".$user->prop("LastName");
+            % my $dev = Quota::getqcarg('/home/e-smith/files');
+            % my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);

                <tr>
                    <td><%= $user->key %></td>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
@@ -1,20 +1,20 @@

-<div class="container-sm">
+<div>
    <br>
    <h2><%= l 'usr_P2_TITLE' %></h2>
    <br>
    <%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %>
    <br><br>
-    
-    % my $btn = l('ADD');  
+
+    % my $btn = l('ADD');

    <form action="/smanager/useraccountsd" method="POST">
        %#= form_for '/useraccountsd' => (method => 'POST') => begin
-    
+
        % if ( $usr_datas->{trt} eq 'ADD' ) {
-        
+
        % param 'user' => $usr_datas->{user} unless param 'user';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputAccountName" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
@@ -28,7 +28,7 @@
              </span>
            </div>
        </div>
-    
+
        % } else {
            <!-- If not user set Button Save not Add -->
            % $btn = l('SAVE');
@@ -40,12 +40,12 @@
                <div class="col-auto">
                  <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
                </div>
-        
+
            </div>
        % }
-       
+
        <br>
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
@@ -60,9 +60,9 @@
            </div>
        </div>
        <br>
-    
+
       % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
@@ -77,10 +77,10 @@
            </div>
        </div>
        <br>
-    
-    
+
+
        % param 'Dept' => $usr_datas->{dept} unless param 'Dept';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputDepartment" class="col-form-label"><%= l 'usr_DEPARTMENT' %></label>
@@ -95,10 +95,10 @@
            </div>
        </div>
        <br>
-    
-    
+
+
        % param 'Company' => $usr_datas->{company} unless param 'Company';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputCompany" class="col-form-label"><%= l 'usr_COMPANY' %></label>
@@ -113,10 +113,10 @@
            </div>
        </div>
        <br>
-    
-    
+
+
        % param 'Street' => $usr_datas->{street} unless param 'Street';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputStreet" class="col-form-label"><%= l 'usr_STREET_ADDRESS' %></label>
@@ -131,9 +131,9 @@
            </div>
        </div>
        <br>
-        
+
        % param 'City' => $usr_datas->{city} unless param 'City';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputCity" class="col-form-label"><%= l 'usr_CITY' %></label>
@@ -148,9 +148,9 @@
            </div>
        </div>
        <br>
-       
+
        % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputPhone" class="col-form-label"><%= l 'usr_PHONE_NUMBER' %></label>
@@ -165,9 +165,9 @@
            </div>
        </div>
        <br>
-        
+
        % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
                <label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
@@ -177,9 +177,9 @@
            </div>
        </div>
        <br>
-    
+
        % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
@@ -194,10 +194,10 @@
            </div>
        </div>
        <br>
-    
-    
+
+
        % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
                <label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
@@ -207,10 +207,10 @@
            </div>
        </div>
        <br>
-    
+
        <!-- fix from here -->
-    
-        
+
+
        <!-- Begin if ipsec needs fixing -->
        % if (  $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
            % my $btn2 = $c->l('DOWNLOAD');
@@ -222,22 +222,22 @@
            % end
        % }
        <!-- End if ipsec  -->
-    
-    
+
+
        <!-- Groups begin -->
        <div>
            % my @groups = @{$c->get_groups()};
-            
+
            %#= dumper @groups
-        
+
            % if ( @groups ) {

                <br><br>
-                
+
                %=l 'usr_GROUP_MEMBERSHIPS'
-                
+
                <br><br>
-                
+
                <table class="table table-bordered user-table-max-wdith">
                <thead>
                  <tr>
@@ -247,7 +247,7 @@
                  </tr>
                </thead>
                    <tbody>
-                        
+
                        % foreach my $g ( @groups) {
                            % my $user = $usr_datas->{user};
                            % my $groupname  = $g->key();
@@ -256,7 +256,7 @@
                                % if ( $user and $c->is_user_in_group($user, $groupname) ) {
                                %     $checked = 'checked';
                                % }
-            
+
                            <tr>
                                <td>
                                % if ( $checked eq 'checked' ) {
@@ -269,26 +269,26 @@
                                <td><%= $description %></td>
                            </tr>
                            % }
-        
+
                        </tbody>
                    </table>
-            
+
            % }
        <!-- Groups End -->
        </div>
-    
+
        <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' => $usr_datas->{trt}
-    
+
        % if ( $usr_datas->{trt} eq 'UPD' ) {
                %= hidden_field 'user' => $usr_datas->{user}
        % }
-        
+
    </form>
    %#end
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep
@@ -1,13 +1,12 @@
-% content_for 'module' => begin

-<div class="container-sm">
-    <br>
-    <h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
-     
-    <br><br>
- 
+
+<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
+
+<div>
+  <br><br>
+
    <form action="/smanager/useraccountsd" method="POST">
-    %#= form_for '/useraccountsd' => (method => 'POST') => begin
+

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
@@ -17,10 +16,11 @@
              <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
            </div>
        </div>
-    
+
        <br>
+
        % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
@@ -35,9 +35,9 @@
            </div>
        </div>
        <br>
-    
+
       % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
@@ -51,22 +51,24 @@
              </span>
            </div>
        </div>
+
        <br>
-    
+
        % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
                <label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
            </div>
            <div class="col-auto">
-                %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select"
+                <%= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" %>
            </div>
        </div>
+
        <br>
-        
+
        % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
              <label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
@@ -80,21 +82,26 @@
              </span>
            </div>
        </div>
+
        <br>
-    
+
        % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
                <label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
            </div>
            <div class="col-auto">
-                    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select"
+                    <%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" %>
            </div>
            <br>
        </div>

+        <br>
+
        % my $btn = l('SAVE');
+        %= hidden_field 'trt' => $usr_datas->{trt}
+        %= hidden_field 'user' => $usr_datas->{user}

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
@@ -103,13 +110,6 @@
        </div>


-        trt: <%= dumper $usr_datas->{trt} %>
-        user: <%= dumper $usr_datas->{user} %>
-        
-        %= hidden_field 'trt' => $usr_datas->{trt}
-        %= hidden_field 'user' => $usr_datas->{user}
-        
-    %# end
    </form>
 </div>

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

    % if (config->{debug} == 1) {
-    <div>
-    (DBG)route: <%= $c->current_route %><br>
-    (DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
-    (DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>
-    </div>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $prx_datas->{http_proxy_status} %>
+            <%= dumper $prx_datas->{smtp_proxy_status} %>
+        </pre>
    % }
+
+
    <h1><%= $title %></h1>
+
    <br>
+
    <%= $modul %>

-    <% my $btn = l('SAVE'); %>
-
    <form action="/smanager/hostentriesd" method="POST">
+
+        <br>
+
        <div>
-            <div>
-                <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+           <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+        </div>

-                <br><br>
+        <br>

-                <div>
-                    <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
-                </div>
-
-                <div>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
+            </div>
+            <div class="col-auto">
                    % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status';
-                    <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %>
-                </div>
+                    <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        % if ( $prx_datas->{smtp_proxy_status} ) {
+
+            <br>
+
+            <div>
+                <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
            </div>

-            % if ( $prx_datas->{smtp_proxy_status} ) {
-                <div>
-                    <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
-                <br><br>
-                <div>
-                    <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %>
-                </div>
-                <div>
-                    % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
-                    <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} %>
-                    <br><br>
-                </div>
-            % }
+            <br>

            <div class="row g-3 align-items-center">
                <div class="col-md-2">
-                    <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                    <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %>
+                </div>
+                <div class="col-auto">
+                    % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
+                    <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} , class => "form-select" %>
                </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>
+            </div>
        </div>

+
    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
@@ -4,37 +4,46 @@

 <div class="card-body">

-    %if (config->{debug} == 1) {
-    <p>
-    (DBG)route: <%= $c->current_route %><br>
-    </p>
-    %}
+    % if (config->{debug} == 1) {
+        <pre>
+            <%=  dumper $c->current_route %>
+        </pre>
+    % }
+
+    <h1><%=  $title %></h1>

-    <h1><%= $title %></h1>
    <br>

-    %= $modul
+    <%= $modul %>

-    <%  my $btn = l('PERFORM'); %>
-    %= form_for 'reboot' => (method => 'POST') => begin
+    <form action="/smanager/reboot" method="POST">

-    <p>
-    %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
-    <br><br>
+        <div class="col-md-6">
+            <%= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION')) %>
+        </div>

-    <span class="">
-    %=l 'rbo_LABEL_REBOOT'
-    </span>
-    <span class="">
-    %= select_field 'function' => $c->rebootFunction_list()
-    </span>
-    </p><br>
+        <br>

-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rbo_LABEL_REBOOT' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'function' => $c->rebootFunction_list(), class => "form-select"  %>
+             </div>
+        </div>

-    % end
+        <br>

-    %= hidden_field 'debug' => '1'
+        % my $btn = l('PERFORM');
+        <%= hidden_field 'debug' => '1' %>
+
+        <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>

 </div>
 %end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
@@ -5,100 +5,99 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $rma_datas
-    </p>
+        <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $rma_datas %>
+        </pre>
    % }
+
    <h1><%= $title%></h1>
+
    % if ( $notif ) {
-    <br>
-    <span class="">
-    <%= $c->render_to_string(inline => $notif) %>
-    </span>
+        <br>
+        <div>
+            <%= $c->render_to_string(inline => $notif) %>
+        </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>
-    %=l 'rma_TITLE_IPSECRW'
-    </h2><br>
-
-    %=l 'rma_DESC_IPSECRW'
-    <br>
-
-    <span class="">
-    %=l 'rma_LABEL_IPSECRW_SESS'
-    </span>
-    <span class="">
-    % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
-    %= text_field 'IpsecrwSess', class => ""
-    </span>
-    <br>
-
-    %= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));
-    <br>
-    <span class="">
-    %=l 'rma_LABEL_IPSECRW_RESET'
-    </span>
-    <span class="">
-    %= check_box 'IpsecrwReset',class => ""
-    </span>
-    <br><br>
-
+    
+        <h2><%= l 'rma_TITLE_IPSECRW' %></h2>
+        <div>
+            <%= l 'rma_DESC_IPSECRW' %>
+        </div>
+        <div>
+            <%= l 'rma_LABEL_IPSECRW_SESS' %>
+        </div>
+        <div>
+            % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
+            <%= text_field 'IpsecrwSess', class => "" %>
+        </div>
+        <br>
+    
+        <div>
+            <%= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));  %>
+        </div>
+        <br>
+        <div>
+            <%= l 'rma_LABEL_IPSECRW_RESET' %>
+        </div>
+        <div>
+            <%= check_box 'IpsecrwReset',class => "" %>
+        </div>
+        <br><br>
    <!--<hr class="" />-->

    %}

    <!-- percequ include 'partials/_rma_pptp' -->

-    <h2>
-    %= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT'));
-    </h2><br>
-    %=l 'rma_VALIDFROM_DESC'
+    <h2><%= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT')); %></h2>
+    
+    <br>
+    
+    <div>
+        <%= l 'rma_VALIDFROM_DESC' %>
+    </div>
+
    <br><br>

    % my @vals = $self->_get_valid_from();
    % if (@vals) {
-    <table class="table table-bordered">
-    <thead>
-    <tr>
-    <th class="">
-            %=l 'NETWORK'
-            </th><th class="">
-            %=l 'SUBNET_MASK'
-            </th><th class="">
-            %=l 'NUM_OF_HOSTS'
-            </th><th class="">
-            %=l 'REMOVE'
-        </th>
-        </tr>
-        </thead>
-        </tbody>
-
-    %    foreach my $val ( @vals )
-    %    {
-    %        my ($net, $mask) = split '/', $val;
-    %        $mask = '255.255.255.255' unless ($mask);
-    %        my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
-        <tr>
-            %= t td => (class => "") => $net
-            %= t td => (class => "") => $mask
-            %= t td => (class => "") => $numhosts
-            <td class="">
-            <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
-            </td>
-        </tr>
-    %    }
-
-        </tbody>
+        <table class="table table-bordered">
+            <thead>
+                <tr>
+                    <th><%= l 'NETWORK' %></th>
+                    <th><%= l 'rma_SUBNET_MASK' %></th>
+                    <th><%= l 'rma_NUM_OF_HOSTS' %></th>
+                    <th><%= l 'REMOVE' %></th>
+                </tr>
+            </thead>
+            <tbody>
+        
+            % foreach my $val ( @vals ) {
+            %     my ($net, $mask) = split '/', $val;
+            %     $mask = '255.255.255.255' unless ($mask);
+            %     my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
+                <tr>
+                    <td><%= $net %></td>
+                    <td><%= $mask %></td>
+                    <td><%= $numhosts %></td>
+                    <td>
+                    <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>
-        %= l('rma_NO_ENTRIES_YET');
-    </b>
-    %}
-    %=l 'rma_DESC_VALID_FROM_ENTRIES'
+        <br>
+        <b><%= l('rma_NO_ENTRIES_YET'); %></b>
+    % }
+
+    <%= l 'rma_DESC_VALID_FROM_ENTRIES' %>
+    
    <br><br>
-    <span class="">
-    %=l 'NETWORK'
-    </span>
-    <span class="">
-    %= text_field 'ValidFromNetwork', class => ""
-    </span>
+    
+    <div class="row g-3 align-items-center">
+         <div class="col-md-2">
+            <%= l 'NETWORK' %>
+        </div>
+        <div class="col-auto">
+            <%= text_field 'ValidFromNetwork', class => "" %>
+        </div>
+    </div>
+
    <br>
-    <span class="">
-    %=l 'rma_SUBNET_MASK'
-    </span>
-    <span class="">
-    %= text_field 'ValidFromMask', class => ""
-    </span>
+
+    <div class="row g-3 align-items-center">
+         <div class="col-md-2">
+            <%= l 'rma_SUBNET_MASK' %>
+        </div>
+        <div class="col-auto">
+            <%= text_field 'ValidFromMask', class => "" %>
+        </div>
+    </div>

    <!--<hr class="" />-->

-    <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>
+    <h2><%= l 'rma_TITLE_SSH' %></h2>
+    
    <br>
    
-    <span class="">
-    %=l 'rma_LABEL_SSH_ADMIN'
-    </span>
-    <span class="">
-    % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
-    %= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
-    </span>
+    <div>
+        <%= l 'rma_DESC_SSH' %>
+    </div>
+
+    <br><br>
+
+    <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="">
-    %=l 'rma_LABEL_SSH_PASSWORD_ACCESS'
-    </span>
-    <span class="">
-    % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
-    %= select_field 'SshPasswordAuthentication' => [[(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_PASSWORD_ACCESS' %>
+        </div>
+        <div class="col-auto">
+            % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
+            <%= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
+        </div>
+    </div>
+    
    <br>

-    <span class="">
-    %=l 'rma_LABEL_SSH_PORT'
-    </span>
-    <span class="">
-    % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
-    %= text_field 'SshTCPPort', class => ""
-    </span>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_SSH_PORT' %>
+        </div>
+        <div class="col-auto">
+            % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
+            <%= text_field 'SshTCPPort' %>
+        </div>
+    </div>
+
    <br>

    <!--<hr class="" />-->

-    <h2>
-    %=l 'rma_TITLE_FTP_ACCESS'
-    </h2><br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS'));
-
+    <h2><%= l 'rma_TITLE_FTP_ACCESS' %></h2>
    <br>
-    <span class="">
-    %=l 'rma_LABEL_FTP_ACCESS'
-    </span>
-    <span class="">
-    % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess';
-    %= select_field 'FtpAccess' => $c->networkAccess_list(), class => ""
-    </span>
+    <div>
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS')); %>
+    </div>
+    
    <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'
-    </span>
-    <span class="">
-    % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess';
-    %= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => ""
-    </span>
+    
+    <div>
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN')); %>
+    </div>
+
+    <br>
+    
+    <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>
-    %=l 'rma_TITLE_TELNET_ACCESS'
-    </h2><br>
+        <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>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
@@ -6,36 +6,62 @@
 <div class="card-body">

    % if (config->{debug} == 1) {
-        <p>
-            %= dumper $c->current_route
-        </p>
+        <pre>
+            <%= dumper $c->current_route %>
+        </pre>
    % }
    % if ( stash 'error' ) {
-        <br><div class="">
-            %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
        </div>
-    %}
-    <h1><%=$title %></h1><br>
-    <p>If the Webmail panel does not appear after logging in, then please check your password.</p><br />
+    % }
+
+    <h1><%=$title %></h1>
+    <br>
+
+    <div>
+        If the Webmail panel does not appear after logging in, then please check your password.
+    </div>
+
+    <br>

    % my $thisdomain = $c->req->url->to_abs->host;
    % my $url = $c->stash('modul');
-    % if (!$url) {
-    %   $url = $thisdomain."/roundcube";
-    %}
    % my $username = 'admin';
+
+    % if (!$url) {
+        % $url = $thisdomain."/roundcube";
+    % }
+
    % if ($url =~ /[?&]_user=([^&]+)/) {
-    %   $username = $1;
-    %}
+        % $username = $1;
+    % }
+
    % if (!($url =~ /https:/)) {
-    % $url = 'https://' . $url;
+        % $url = 'https://' . $url;
    %}

-    <div class="">
-        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
+    <div class="container-fluid">
+        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>">
+            <button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %>
+            </button>
+        </a>
        <object id="" data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
    </div>
 </div>


+<iframe width="100%" height="600" style="border:1px solid black;" src="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>">
+</iframe>
+
+    % my $btn = l('Full Window');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+
 %end
--- 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 26
+%define release 32
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -18,6 +18,9 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: smeserver-devtools
 Requires: smeserver-release >= 11.0
 Requires: smeserver-manager >= 11.0.0
+Requires: smeserver-lib >= 11.0.0-13
+Requires: e-smith-manager >= 2.4.0-22
+
 AutoReqProv: no

 %description
@@ -26,6 +29,24 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip

 %changelog
+* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0.31.sme
+- Fix some issues with user panel
+- Fix missing bootstrap icons
+- Reduce font size to keep Brian happy
+ 
+* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-30.sme
+- Add UTF8 support to network panel
+
+* Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-29.sme
+- Proxy panel done
+
+* Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-28.sme
+- Reboot panel done
+
+* Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-27.sme
+- finish Email panels
+- Fix login password toggle
+
 * Wed May 28 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-26.sme
 - DateTime started but needs other fixes.
 - Start Email but it really needs partials
@@ -117,10 +138,10 @@ wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 - Rename some partials more logically

 * Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme
- New version for AdminLTE integration with no class or ids 
+- New version for AdminLTE integration with no class or ids

 %prep
-%setup 
+%setup

 %build
 perl createlinks
Author	SHA1	Message	Date
John Crisp	01223b8a9f	Update version number	2025-06-10 23:10:32 +02:00
John Crisp	f9f799d2ce	Update clamav. Modify ibayupd,ln list, start remoteaccess	2025-06-10 23:05:00 +02:00
John Crisp	b1e896c187	Add autocomplete to login. Updates to quota list	2025-06-10 21:40:12 +02:00
John Crisp	e49e180ce0	Fix users panels - missing css file - override default font size for Brian	2025-06-09 15:27:17 +02:00
John Crisp	927a95af3b	Add UTF8 support to local network panel	2025-06-09 13:38:09 +02:00
John Crisp	b6a78980a4	Fix login panel position	2025-06-06 19:22:25 +02:00
John Crisp	4b888a7112	Testing Roundcube iframe	2025-06-05 20:51:52 +02:00
John Crisp	b39eef01f9	Start Backup Panels	2025-06-05 19:51:11 +02:00
John Crisp	307ee9dea4	Proxy panel done	2025-06-04 18:27:40 +02:00
John Crisp	05d0b91138	reboot panel done	2025-06-04 18:06:02 +02:00
John Crisp	cd2de47aaf	Finish Email templates and fix toggle password	2025-06-04 17:44:26 +02:00
John Crisp	eaf7721114	started Email settings	2025-05-29 10:00:16 -04:00