Finish Backup add Printers and small tweaks

.gitignore

@@ -2,3 +2,4 @@
 *.log
 *spec-20*
 *.tar.gz
+*.workspace

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,7 +53,7 @@
 }
 
 .login-page {
-    min-height: 10vh;
+    min-height: 60vh !important ;
     vertical-align: top !important ;
 }
 

root/usr/share/smanager/themes/AdminLTE/public/koozali/js/flag-by-locale.js

@@ -263,8 +263,12 @@ document.addEventListener('DOMContentLoaded', () => {
 
 function displayLocaleAndFlag() {
     // Get the browser locale
-    const userLocale = navigator.language || navigator.userLanguage;
+	const userLocale = navigator.languages && navigator.languages.length
+    ? navigator.languages[0]
+    : navigator.language;
+
     //alert(`User Locale: ${userLocale}`); // Alert the detected locale
+	//console.log(navigator.languages); // Log language to console
 
     const { flag, isUnknown, countryCode } = getFlagEmoji(userLocale);
 

root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js

@@ -1,33 +1,22 @@
-// js/sme-password.js
-
 $(document).ready(function () {
-/*     // For each password input
+  const togglePassword = document.querySelector("#togglePassword");
-    $('.sme-password').each(function() {
+  const password = document.querySelector("#password");
-        // Create a new container
-        //alert("sme-password");
-        var $inputContainer = $('<div class="input-container"></div>');
 
-        // Move the input into the new container
+  let pass = togglePassword;
-        $(this).wrap($inputContainer);
 
-        // Create the toggle image
+  if (pass) {
-        var $togglePassword = $('<img src="images/visible.png" alt="Show Password" class="toggle-password" />');
+  togglePassword.addEventListener("click", function () {
-        
+    // toggle the type attribute
-        // Append the toggle image to the container
+    const type = password.getAttribute("type") === "password" ? "text" : "password";
-        $(this).after($togglePassword);
+    password.setAttribute("type", type);
-    }); */
+    // toggle the eye icon
-
+    if (type === "text") {
-    $('.toggle-password').on('click', function() {
+      $(this).removeClass("bi-eye");
-        // Find the associated password field
+      $(this).addClass("bi-eye-slash");
-        var input = $(this).siblings('.sme-password');
+    } else {
-
+      $(this).removeClass("bi-eye-slash");
-        // Toggle the type attribute between password and text
+      $(this).addClass("bi-eye");
-        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);
   });
+}
 });

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

@@ -4,83 +4,103 @@
 
 <div class="card-body">
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%=  dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%=  dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
-    <h2>
+    <br>
-    %=l 'bac_ENABLE_DISABLE_TAPE'
-    </h2><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>
+    <div>
-    <span class="">
+        <%= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC')) %>
-    %=l 'bac_ENABLE_TAPE_BACKUP'
+    </div>
-    </span>
+
-    <span class="">
+    <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 >
+                <input type='checkbox' name='Tapebackup' aria-describedby="enabled" checked >
             % } else {
-    %= check_box 'Tapebackup'
+                <input type='checkbox' name='Tapebackup' aria-describedby="disabled">
             % }
-    </span>
+            </div>
-    </p>
+        </div>
 
+        <br>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'bac_TAPE_BACKUP_TIME'
+                <label for="inputBackupHour" class="col-form-label"><%= l 'bac_TAPE_BACKUP_TIME' %></label>
-    </span>
+                <label for="inputBackupMin" class="col-form-label"></label>
-    <span class="">
+            </div>
+            <div class="col-auto">
                 % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
-    %= text_field 'BackupHour', size => '2'
+                <input type="text" name="BackupHour" id="inputBackupHour" class="form-control" maxlength="2" size="4" aria-describedby="Backup Hour" value="<%= $bac_datas->{backupHour} %>">
+            </div>
+            <div class="col-auto">
                 % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
-    %= text_field 'BackupMin', size => '2'
+                <input type="text" name="BackupMin" id="inputBackupMin" class="form-control" maxlength="2" size="4" aria-describedby="Backup Minute" value="<%= $bac_datas->{backupMin} %>">
-    </span>
+            </div>
-    <!--span class="">
+            <div class="col-auto">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
                 % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
-    %= select_field 'BackupAMPM' => ['AM', 'PM'], class => ""
+                <%= select_field 'BackupAMPM' => ['AM', 'PM'], class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'bac_LOAD_TAPE_REMINDER_TIME'
+
-    </span>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
+                <label for="inputReminderMin" class="col-form-label"><%= l 'bac_LOAD_TAPE_REMINDER_TIME' %></label>
+                <label for="inputReminderMin" class="col-form-label"></label>
+            </div>
+            <div class="col-auto">
                 % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
-    %= text_field 'ReminderHour', size => '2'
+                <input type="text" name="ReminderHour" id="inputReminderHour" class="form-control" maxlength="2" size="4" aria-describedby="Reminder Hour" value="<%= $bac_datas->{reminderHour} %>">
+            </div>
+            <div class="col-auto">
                 % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
-    %= text_field 'ReminderMin', size => '2'
+                <input type="text" name="ReminderMin" id="inputReminderMin" class="form-control" maxlength="2" size="4" aria-describedby="Reminder Minute" value="<%= $bac_datas->{reminderMin} %>">
-    </span>
+            </div>
-    <!--span class="">
+            <div class="col-auto">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
                 % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
-    %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => ""
+                <%= select_field 'ReminderAMPM' => ['AM', 'PM'], class => "form-select" %>
-    </span>
+            </div>
-    </p><br>
+        </div>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
+        <br>
-    %= 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

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

@@ -5,34 +5,46 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
+    <h2><%=l 'bac_RESTORE_CONF_FROM_TAPE' %></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 => ""
+        <div>
+            <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) %>
+        </div>
+
+        <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

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

@@ -5,54 +5,71 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+             <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+             <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <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())
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
 
-    <p>
-    <h3>
-    %= l 'bac_WORKSTATION_BACKUP_SETCONF'
-    </h3>
     <br>
-    <span class="">
+
-    %=l 'bac_SELECT_VFS_TYPE'
+    <div>
-    </span>
+        <%=  $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC')) %>
-    <span class="">
+    </div>
+
+    <br>
+
+    <form action="/smanager/backup" method="POST">
+
+        <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 => ""
+                 <%=  select_field 'VFSType' => $c->get_VFSType_options(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
+        <br>
-    %= submit_button $c->l('NEXT'), class => ""
 
-    % end
+        <%=  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>
 

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

@@ -5,39 +5,47 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+             <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+             <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div>
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
-    <h2>
+    <br>
-    %=l 'bac_CONFIGURE_WORKSTN_BACKUP'
-    </h2>
 
-    %= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC'))
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <p>
+    <div>
-    <span class="">
+        <%= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC')) %>
-    %=l 'bac_ENABLE_WORKSTN_BACKUP'
+    <div>
-    </span>
+
-    <span class="">
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_ENABLE_WORKSTN_BACKUP' %>
+            </div>
+            <div class="col-auto">
             % if ( $bac_datas->{status} eq 'checked' ) {
-    <input type='checkbox' name='Workstnbackup' checked >
+                <input type='checkbox' name='Workstnbackup' aria-describedby="enabled" checked >
             % } else {
-    %= check_box 'Workstnbackup'
+                <input type='checkbox' name='Workstnbackup' aria-describedby="disabled">
             % }
-    </span>
+            </div>
+        </div>
 
         </p>
         <p>
@@ -47,127 +55,218 @@
         <br>
 
         % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
-        <span class="">
+        <div class="row g-3 align-items-center">
-        %=l 'bac_WORKSTN_NAME'
+            <div class="col-md-2">
-        </span>
+              <label for="inputBackupWorkStationName" class="col-form-label"><%= l 'bac_WORKSTN_NAME' %></label>
-        <span class="">
+            </div>
+            <div class="col-auto">
             % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
-        %= text_field 'BackupwkStation', size => 20, class => ""
+                <input type="text" name="BackupwkStation" id="inputBackupWorkStationName" class="form-control"
-        </span>
+                size="20" aria-describedby="Workstation Name" value="<%= $bac_datas->{station} %>">
+            </div>
+        </div>
+
         <br>
+
         % }
+
         % if (  $bac_datas->{vfstype} eq 'usb' ) {
-        <span class="">
+
-        %=l 'bac_local removable disk'
+            <div class="row g-3 align-items-center">
-        </span>
+                <div class="col-md-2">
-        <span class="">
+                    <%= l 'bac_local removable disk' %>
+                </div>
+                <div class="col-auto">
                     % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder';
-        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
+                    <%= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "form-select" %>
-        </span>
+                </div>
+            </div>
+
             <br>
+
         % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
-    <span class="">
+
-        %=l 'bac_Mounted disk'
+            <div class="row g-3 align-items-center">
-        </span>
+                <div class="col-md-2">
-        <span class="">
+                    <%= l 'bac_Mounted disk' %>
+                </div>
+                <div class="col-auto">
                     % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
-        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
+                    <%= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "form-select" %>
-        </span>
+                </div>
+            </div>
+
             <br>
+
         % } else {
-        <span class="">
+
-        %=l 'bac_SHARED_FOLDER_NAME'
+            <div class="row g-3 align-items-center">
-        </span><span class="">
+                <div class="col-md-2">
-        % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
+                    <label for="inputBackupSharedFolderName" class="col-form-label"><%= l 'bac_SHARED_FOLDER_NAME' %></label>
-        %= text_field 'BackupwkFolder', size => 20, class => ""
+                </div>
-        </span>
+                <div class="col-auto">
+                    <input type="text" name="BackupwkFolder" id="inputBackupSharedFolderName" class="form-control"
+                    size="20" aria-describedby="Backup Shared Folder Name" value="<%= $bac_datas->{folder} %>">
+                </div>
+            </div>
+
             <br>
+
         % }
+
         % if (  $bac_datas->{vfstype} eq 'cifs' ) {
-        <span class="">
+            <div class="row g-3 align-items-center">
-        %=l 'bac_WORKSTN_LOGIN'
+                <div class="col-md-2">
-        </span><span class="">
+                    <label for="inputBackupWorkLogin" class="col-form-label"><%= l 'bac_WORKSTN_LOGIN' %></label>
+                </div>
+                <div class="col-auto">
                     % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin';
-        %= text_field 'BackupwkLogin', size => 12, class => ""
+                    <input type="text" name="BackupwkLogin" id="inputBackupWorkLogin" class="form-control"
-        </span>
+                    size="12" aria-describedby="Backup Workstation Login" value="<%= $bac_datas->{login} %>">
+                </div>
+            </div>
+
             <br>
-        <span class="">
+
-        %=l 'bac_PASSWORD'
+            <div class="row g-3 align-items-center">
-        </span><span class="">
+                <div class="col-md-2">
+                    <label for="password" class="col-form-label"><%= l 'bac_PASSWORD' %></label>
+                </div>
+                <div class="col-auto">
                     % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword';
-        %= password_field 'BackupwkPassword', size => 12, class => ""
+                    <input type="password" name="BackupwkPassword" id="password" class="form-control" size="12" aria-describedby="Backup Workstation Password" value="<%= $bac_datas->{password} %>">
-        </span>
+                </div>
+                <div class="col-auto">
+                    <span id="togglePassword" class="bi bi-eye"></span>
+                </div>
+            </div>
         % }
-    </p><br><h3>
-    %= l 'bac_WORKSTN_BACKUP_SETTINGS'
-    </h3><br>
 
-    <p>
-    <span class="">
-    %=l 'bac_NUMBER_OF_SETS'
-    </span>
-    <span class="">
-    % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber';
-    %= text_field 'SetsNumber', size => '3'
-    </span>
-    %=l 'bac_NUMBER_OF_FILES_IN_SET'
-    <span class="">
-    % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset';
-    %= text_field 'Filesinset', size => '3'
-    </span></p>
-
-    <p>
-    <span class="">
-    %=l 'bac_WORKSTN_BACKUP_TIME'
-    </span>
-    <span class="">
-    % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour';
-    %= text_field 'BackupwkHour', size => '2'
-    % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin';
-    %= text_field 'BackupwkMin', size => '2'
-    </span>
-    %=l 'AM/PM:'
-    <span class="">
-    % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM';
-    %= select_field 'BackupwkAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p>
-
-    <p><span class="">
-    %=l 'bac_WORKSTN_TIMEOUT'
-    </span>
-    <span class="">
-    % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout';
-    %= text_field 'BackupwkTimeout', size => '2'
-    </span>
-    %=l 'bac_INC_ONLY_TIMEOUT'
-    <span class="">
-    % if ( $bac_datas->{incOnlyTimeout} eq 'checked' ) {
-        <input type='checkbox' name='IncOnlyTimeout' checked  >
-    %} else {
-       %= check_box 'IncOnlyTimeout'
-    %}
-    </span></p>
-
-    <p>
-    <span class="">
-    %=l 'bac_COMPRESSION_LEVEL'
-    </span>
-    <span class="">
-    % param 'Compression' => $bac_datas->{compression} unless param 'Compression';
-    %= text_field 'Compression', size => '1'
-    </span>
-    %=l 'bac_FULL_ONLY_ON'
-    <span class="">
-    % param 'Dof' => $bac_datas->{dof} unless param 'Dof';
-    %= select_field 'Dof' => $c->get_dow_list(), class => ""
-    </p>
         <br>
 
+        <h3><%= l 'bac_WORKSTN_BACKUP_SETTINGS' %></h3>
+
+        <br>
+
+       <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputNumberofSets" class="col-form-label"><%= l 'bac_NUMBER_OF_SETS' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber';
+                <input type="text" name="SetsNumber" id="inputNumberofSets" class="form-control" maxlength="3" size="3" aria-describedby="Number of sets" value="<%= $bac_datas->{setsNumber} %>">
+            </div>
+        </div>
+
+
+
+
+         <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputFilesinSet" class="col-form-label"><%= l 'bac_NUMBER_OF_FILES_IN_SET' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset';
+                <input type="text" name="Filesinset" id="inputFilesinSet" class="form-control" maxlength="3" size="3" aria-describedby="Files in set" value="<%= $bac_datas->{filesinset} %>">
+            </div>
+        </div>
+
+
+
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputWorkstationBackupHour" class="col-form-label"><%= l 'bac_WORKSTN_BACKUP_TIME' %></label>
+                <label for="inputWorkstationBackupMin" class="col-form-label"></label>
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour';
+                <input type="text" name="BackupwkHour" id="inputWorkstationBackupHour" class="form-control" maxlength="2" size="4" aria-describedby="Backup Hour" value="<%= $bac_datas->{hour} %>">
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin';
+                <input type="text" name="BackupwkMin" id="inputWorkstationBackupMin" class="form-control" maxlength="2" size="4" aria-describedby="Backup Minute" value="<%= $bac_datas->{min} %>">
+            </div>
+            <div class="col-auto">
+                <%= l 'AM/PM:' %>
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM';
+                <%= select_field 'BackupwkAMPM' => ['AM', 'PM'], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputWorkstationTimeout" class="col-form-label"><%= l 'bac_WORKSTN_TIMEOUT' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout';
+                <input type="text" name="BackupwkTimeout" id="inputWorkstationTimeout" class="form-control" maxlength="2" size="2" aria-describedby="Workstation Timeout" value="<%= $bac_datas->{timeout} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_INC_ONLY_TIMEOUT' %>
+            </div>
+            <div class="col-auto">
+            % if ( $bac_datas->{incOnlyTimeout} eq 'checked' ) {
+                <input type='checkbox' name='IncOnlyTimeout' aria-describedby="enabled" checked >
+            % } else {
+                <input type='checkbox' name='IncOnlyTimeout' aria-describedby="disabled">
+            % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputBackupCompression" class="col-form-label"><%= l 'bac_COMPRESSION_LEVEL' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Compression' => $bac_datas->{compression} unless param 'Compression';
+                <input type="text" name="Compression" id="inputBackupCompression" class="form-control" maxlength="1" size="1" aria-describedby="Compression level" value="<%= $bac_datas->{compression} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_FULL_ONLY_ON' %>
+            </div>
+            <div class="col-auto">
+                % param 'Dof' => $bac_datas->{dof} unless param 'Dof';
+                %= select_field 'Dof' => $c->get_dow_list(), class => "form-select"
+            </div>
+        </div>
+
+        <br>
 
         %= hidden_field 'Function' => $bac_datas->{function}
         %= hidden_field 'VFSType' => $bac_datas->{vfstype}
-    %= submit_button $c->l('bac_UPDATE_CONF'), class => ""
+        % my $btn = l('bac_UPDATE_CONF');
-    % end
+
+        <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>
+
+        <br>
+
+    </form>
+
+</div>
+
 % end

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

@@ -5,42 +5,64 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
+    <h2><%= l 'bac_WORKSTN_RESTORE' %></h2>
-    %=l 'bac_WORKSTN_RESTORE'
+
-    </h2>
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
 
-    <br><br>
         % if ($bac_datas->{status} ne 'enabled') {
-    %= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE')) %>
+            </div>
         % } else {
-    %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify())
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+            </div>
         % }
 
-    <br><br><span class="">
+        <br><br>
-    %=l 'bac_SELECT_BACKUP_FILE'
+
-    </span>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-1">
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
+                <%= l 'bac_SELECT_BACKUP_FILE' %>
-    </span><br><br>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Backupset' => $c->get_Backupset_options(), class => "form-select" %>
+            </div>
+        </div>
+
+
+        <br><br>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_RESTORE_FROM_WORKSTN');
+
+        <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>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_RESTORE_FROM_WORKSTN'), class => ""
-    % end
 </div>
 % end

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

@@ -5,33 +5,49 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
+    <h2><%= l 'bac_WORKSTN_RESTORE' %></h2>
-    %=l 'bac_WORKSTN_RESTORE'
+
-    </h2>
+    <br>
-    <p>
+
-    %= $c->render_to_string(inline => $bac_datas->{restore_log})
+    <form action="/smanager/backupd" method="POST">
-    </p><p>
+
-    %=l 'bac_YOU_MUST_REBOOT'
+        <div>
-    </p>
+            <%= $c->render_to_string(inline => $bac_datas->{restore_log}) %>
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_REBOOT'), class => ""
-    % end
         </div>
 
+        <br>
+
+        <div>
+            <%= l 'bac_YOU_MUST_REBOOT' %>
+        </div>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_REBOOT');
+
+        <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

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

@@ -5,49 +5,73 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br><div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+        <%= $c->render_to_string(inline => stash 'error') %>
     </div>
     % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
     <h2><%=l 'bac_WORKSTN_SEL_RESTORE' %></h2>
 
-    %= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify())
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div>
+            <%= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+        </div>
+
+        <br>
 
         <h3><%= l 'bac_BACKUP_CHOICE' %></h3>
 
         <br>
-    <span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Restoreset_options(), class => ""
-    </span>
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_FILTER_EXPRESSION'
-    </span>
-    <span class="">
-    %= text_field 'Filterexp', size => 32, class => ""
-    </span>
-    <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('PERFORM'), class => ""
 
-    % end
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_SELECT_BACKUP_FILE' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Backupset' => $c->get_Restoreset_options(), class => "form-select" %>
+            </div>
+        </div>
+
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+            <label for="inputFilterExpression" class="col-form-label"><%=l 'bac_FILTER_EXPRESSION' %></label>
+           </div>
+            <div class="col-auto">
+                <input type="text" name="Filterexp" id="inputFilterExpression" class="form-control" aria-describedby="Input Filter Expression">
+            </div>
+        </div>
+
+        <br><br>
+
+        %= hidden_field 'Function' => $bac_datas->{'function'}
+
+        % my $btn = 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>
+
+    </form>
 
 </div>
 

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

@@ -5,51 +5,71 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
+    <br>
 
     <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
+
     <br>
 
-    %= $c->render_to_string(inline => (l 'bac_READ_COMPLETE'))
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_READ_COMPLETE')) %>
+    </div>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+            <%=l 'bac_SELECT_FILES_TO_RESTORE' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => "form-select", multiple => 1, size => 15 %>
+            </div>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSelectDate" class="col-form-label"><%=l 'bac_SELECT_DATE_BEFORE' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="Seldatebefore" id="inputSelectDate" class="form-control" aria-describedby="Restore most recent">
+            </div>
+        </div>
+
+        <br><br>
 
-    <br><span class="">
-    %=l 'bac_SELECT_FILES_TO_RESTORE'
-    </span>
-    <span class="">
-    %= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => "", multiple => 1, size => 15
-    </span>
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_DATE_BEFORE'
-    </span>
-    <span class="">
-    %= text_field 'Seldatebefore', size => 32, class => ""
-    </span>
-    <br>
-    <br>
         %= hidden_field 'Function' => $bac_datas->{'function'}
         %= hidden_field 'Backupset' => $bac_datas->{'backupset'}
         %= hidden_field 'Filterexp' => $bac_datas->{'filterexp'}
 
-    %= submit_button $c->l('PERFORM'), class => ""
 
-    % end
+        % my $btn = l('PERFORM');
+
+        <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>
 
 </div>
 % end

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

@@ -5,30 +5,44 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
+
+    <br>
+
     <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
-    <br>
+
-    %= $c->render_to_string(inline => $bac_datas->{restore_log}) 
     <br>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <form action="/smanager/backupd" method="POST">
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('NEXT'), class => ""
 
-    % end
+        <div>
+            <%= $c->render_to_string(inline => $bac_datas->{restore_log}) %>
+        </div>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('NEXT');
+
+        <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

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

@@ -4,50 +4,60 @@
 <div  class="card-body">
 
     % if (config->{debug} == 1) {
-        <p>
+        <pre>
-        %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-        %= dumper $bac_datas
+            <%= dumper $bac_datas %>
-        </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br>
+        <br><div class="text-danger">
-        <div class="">
+        <%= $c->render_to_string(inline => stash 'error') %>
-        %= $c->render_to_string(inline => stash 'error') 
     </div>
     % }
 
     <h1><%= $title%></h1>
 
-    <h2>
+    <br>
-    %=l 'bac_VERIFY_WORKSTN_BACKUP_FILE'
-    </h2>
 
-    %= form_for '/backup' => (method => 'POST') => begin
+    <h2><%=l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2>
+
+    <form action="/smanager/backup" method="POST">
+
+        <br>
 
         % if ($bac_datas->{status} ne 'enabled') {
-        %= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE')) %>
+            </div>
         % } else {
-        %= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify())
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+            </div>
         % }
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
-    </span>
-    <br>
 
-    <p>
+        <br><br>
-    <span class="">
+
-    %=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-1">
-    <span class="">
+                <%=l 'bac_SELECT_BACKUP_FILE' %>
-    %= check_box 'Verifyall'
+            </div>
-    </span>
+            <div class="col-auto">
-    </p>
+                <%= select_field 'Backupset' => $c->get_Backupset_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-4">
+                <%=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE' %>
+            </div>
+            <div class="col-auto">
+                <input type='checkbox' name='Verifyall'>
+            </div>
+        </div>
+
         <br>
 
         %=l 'bac_CHECK_INTEGRITY_WARNING'
@@ -55,8 +65,14 @@
         <br>
         <br>
         %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('bac_VERIFY'), class => ""
 
-    % end
+        % my $btn = l('bac_VERIFY');
+
+        <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

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

@@ -4,34 +4,47 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $bac_datas->{function}
+        <%= dumper $bac_datas->{function} %>
         <!--  dumper $bac_datas->{'files_list'} -->
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
+    <br>
+
     <h2><%= l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2>
 
     <br>
-    %= $c->render_to_string(inline => $c->workstnVerify())
+
+    <div>
+        <%= $c->render_to_string(inline => $c->workstnVerify()) %>
+    </div>
+
     <br>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <form action="/smanager/backupd" method="POST">
 
         %= hidden_field 'Function' => $bac_datas->{'function'}
 
-    %= submit_button $c->l('NEXT'), class => ""
+        % my $btn = l('NEXT');
+
+        <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>
 
-    % end
 </div>
 % end

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

@@ -5,88 +5,99 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <pre>
-    %= dumper $c->current_route
+        <%=  dumper $c->current_route %>
-    %= dumper $bac_datas
+        <%=  dumper $bac_datas %>
-    </p>
+    </pre>
     % }
 
     % if ( stash 'warning' ) {
         <br>
-        <div class="">
+        <div class="col-md-4 bg-info text-center">
-        %= $c->render_to_string(inline => stash 'warning') 
+            <%=  $c->render_to_string(inline => stash 'warning') %>
         </div>
+        <br>
     % }
     % if ( stash 'error' ) {
         <br>
-        <div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <%=  $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-->
+    -->
+
+    <br>
 
     <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module},
     $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
 
-    %= form_for '/backup' => (method => 'POST') => begin
+    <form action="/smanager/backup" method="POST">
+        <br>
 
-    <h2>
+        <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
-    %=l 'bac_BACKUP_CONFIG_STATUS'
-    </h2>
-
-    <p>
-    <span class="">
-    %=l 'bac_TAPE_BACKUPS',
-    </span>
-    <span class="">
-    %= $c->l(uc($bac_datas->{'backupStatus'})).'.'
-    </span>
-    % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
-        %= $c->l('bac_BACKUPS_RUN_AT')
-        <span class="">
-        %=  $bac_datas->{'backupTime'}
-        </span>
-        %= $c->l('bac_REMINDER_MESSAGE_AT')
-        <span class="">
-        %= $bac_datas->{'reminderTime'}
-        </span>    
-    %}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'bac_WORKSTN_BACKUPS',
-    </span>
-    <span class="">
-    %= $c->l(uc($bac_datas->{'backupwkStatus'})).'.'
-    </span>
-    % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
-         %= $c->l('bac_WKBACKUPS_RUN_AT')
-         <b>
-         %= $bac_datas->{'backupwkTime'}
-         </b>
-    %}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'bac_SELECT_AN_ACTION'
-    </span>
-    <span class="">
-    % param 'Function' => $bac_datas->{function} unless param 'Function';
-    %= select_field 'Function' => $c->get_function_options(), class => ""
-    </span>
-    </p>
 
         <br>
-    %= submit_button $c->l('PERFORM'), class => ""
- 
-    % end
 
+        <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>
+
+    </form>
+
+</div>
 % end

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

@@ -5,94 +5,127 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <div>
             (DBG)route: <%= $c->current_route %><br>
             (DBG)trt: <%= $bugr_datas->{trt} %><br>
-    </p>
+        </div>
     % }
 
     <h1><%= $title %></h1>
     <!--br><%= $modul %><br-->
-
-    <b>
-        %=l ('bugr_DO_NOT_PANIC')
-    </b>
-    <p>
-        %=l ('bugr_SME_EXPERIENCE')
-    </p>
-    <p>
-    %=l ('bugr_USE_TEMPLATE')
-: <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
- target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>.
-    </p>
-    <p>
-    %=l ('bugr_PLEASE_REPORT_HERE')
-: <a href="https://bugs.koozali.org" target="_blank">https://bugs.koozali.org</a>.
-    </p>
-    <p> 
-        %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP')
-    </p>
-    <p>
-        %=l ('bugr_REPORT_CONTENT')
     <br>
+    <h2><%= l ('bugr_DO_NOT_PANIC') %></h2>
+    <br>
+    <div>
+        <%= l ('bugr_SME_EXPERIENCE') %>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_USE_TEMPLATE') %>
+        : <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
+        target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_PLEASE_REPORT_HERE') %>
+        : <a href="https://bugs.koozali.org"
+        target="_blank">https://bugs.koozali.org</a>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') %>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_REPORT_CONTENT') %>
+        <br><br>
         <ul>
             <li>
-        %=l ('bugr_SME_VERSION')
+            <%= l ('bugr_SME_VERSION') %>
             </li>
             <li>
-        %=l ('bugr_SERVER_MODE')
+            <%= l ('bugr_SERVER_MODE') %>
             </li>
             <li>
-        %=l ('bugr_PREVIOUS_SERVER_MODE')
+            <%= l ('bugr_PREVIOUS_SERVER_MODE') %>
             </li>
             <li>
-        %=l ('bugr_KERNEL_AND_ARCH')
+            <%= l ('bugr_KERNEL_AND_ARCH') %>
             </li>
             <li>
-        %=l ('bugr_INSTALLED_RPMS')
+            <%= l ('bugr_INSTALLED_RPMS') %>
             </li>
             <li>
-        %=l ('bugr_ALTERED_TEMPLATES')
+            <%= l ('bugr_ALTERED_TEMPLATES') %>
             </li>
             <li>
-        %=l ('bugr_ALTERED_EVENTS')
+            <%= l ('bugr_ALTERED_EVENTS') %>
             </li> <li>
-        %=l ('bugr_YUM_REPOS')
+            <%= l ('bugr_YUM_REPOS') %>
             </li>
-        <br>
+
         </ul>
-        %=l ('bugr_PRIVACY')
+    </div>
-    </p>
 
-    <% my $btn = l('bugr_CREATE_REPORT'); %>
+    <br>
 
-    %= form_for 'bugreport' => (method => 'POST') => begin
+    <div>
-        %= submit_button "$btn", class => ""
+        <%= l ('bugr_PRIVACY') %>
-    % end    
+    </div>
 
-    <p><b>
+    <br>
-        %=l ('bugr_DONATING')
+
+    % my $btn = l('bugr_CREATE_REPORT');
+
+
+    <form action="/smanager/bugreport" method="POST">
+        <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' => $bugr_datas->{trt} %>
+    </form>
+
+    <br>
+
+    <div>
+    <b>
+        <%= l ('bugr_DONATING') %>
         </b>
         <br><br>
-        %=l ('bugr_AWARE_SME')
+        <%= l ('bugr_AWARE_SME') %>
         <br><br>
         <b>
-        %=l ('bugr_YOUR_HELP')
+        <%= l ('bugr_YOUR_HELP') %>
         </b>
         <br><br>
-        %=l ('bugr_CONSIDER_DONATING')
+        <%= l ('bugr_CONSIDER_DONATING') %>
         <br><br>
-    </p>
+    </div>
-
-    %= link_to 'https://wiki.koozali.org/Donate' => begin
-    %= image '/images/btn_donateCC_LG.gif'
-
-    %= hidden_field 'trt' => $bugr_datas->{trt}
-
-    % end
 
     <br>
-    %=l ('bugr_THANK_YOU')
+
+    <div>
+        <a href="https://wiki.koozali.org/Donate"
+        target="_blank">
+        <img src="/smanager/images/btn_donateCC_LG.gif" />
+        </a>
+    </div>
+
+<br>
+
+    <div>
+        <a href="https://wiki.koozali.org/Donate"
+        target="_blank">Donate
+        </a>
+    </div>
+
+
+    <br>
+    <div>
+        <%= l ('bugr_THANK_YOU') %>
+    </div>
 
 </div>
 

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

@@ -5,10 +5,10 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <div>
             (DBG)route: <%= $c->current_route %><br>
             (DBG)trt: <%= $bugr_datas->{trt} %><br>
-    </p>
+        </div>
     % }
 
     <h1><%= $title %></h1>
@@ -17,17 +17,25 @@
 
     <% my $btn = l('bugr_Download this report'); %>
 
-    %= form_for 'bugreportD' => (method => 'POST') => begin
+    <form action="/smanager/bugreportD" method="POST">
-        %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
-        %= hidden_field 'trt' => $bugr_datas->{trt}
+            <div class="col-md-2">
-    % end   
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => $bugr_datas->{trt} %>
+    </form>
+
+
 
     % my $out = "================== <br />";
     % $out .= "Boot anaysis image (right click and save image to download)<br />";
     % $out .= "================== <br />";
     % $out .= "<img src='images/boot.svg' alt='boot timing image' width=95% >";
 
-   <br><%= $c->render_to_string(inline=>$out) %><br>
+    <br>
+    <%= $c->render_to_string(inline=>$out) %>
+    <br><br>
 
 </div>
 

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

@@ -5,46 +5,64 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>(DBG)route: <%= $c->current_route %><br>
+    <pre>
-    (DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>
+        Route: <%= dumper $c->current_route %><br>
-    (DBG)Quar stat: <%=$clm_datas->{Quarantine} %>
+        FsS stat: <%= dumper $clm_datas->{FilesystemScan}%> <br>
-    </p>
+        Quar stat: <%= dumper $clm_datas->{Quarantine} %>
+    </pre>
     % }
+
     <h1><%= $title %></h1>
-    <br>
+    <!-- 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-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">
+            <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" %>
+            </div>
+        </div>
+        
+        <br>
+        
+        <div>
+            <div>
+                <h6><%= l 'clm_LABEL_CLAM_VERSIONS' %>:</h6>
+            </div>
+            <div>
+                <%= $clm_datas->{clam_versions} %>
+            </div>
+        </div>
+        
+        <br>
+
         <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'clamav' => (method => 'POST') => begin
+        <div class="row g-3 align-items-center">
-    <p>
+            <div class="col-md-2">
-        <span class="">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-        %=l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD'
+            </div>
-        </span>
+        </div>
-        <span class="">
+
-        % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
+    </form>
-        %= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => ""
-        </span>
-    </p>
-    <p>
-        <span class="">
-        %=l 'clm_LABEL_QUARANTINE'
-        </span>
-        <span class="">
-        % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine';
-        %= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => ""
-        <br>
-        </span>
-    </p>
-    <p>
-        <span class="">
-        %=l 'clm_LABEL_CLAM_VERSIONS'
-        </span>
-        <span class="">
-        %= $clm_datas->{clam_versions}
-        <br>
-        </span>
-    </p>
-    %= submit_button "$btn", class => ""
-    % end
 </div>
 %end

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/font/bootstrap-icons.min.css'
 %#= stylesheet 'dist/css/overlayscrollbars.min.css'

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

@@ -4,133 +4,205 @@
 
 <div class="card-body">
 
-    % if (config->{debug} == 1) {
+    % if (config->{debug} == 0) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $dat_datas
+            <%= dumper $dat_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-    <div class="">
+        <div class="text-danger">
             %= $c->render_to_string(inline => stash 'error')
         </div>
     %}
 
-    <h1><%= $title %></h1><br>
+    <h1><%= $title %></h1>
+    <br>
     %= $modul
     <% my $btn = l('SAVE'); %>
 
-    %= form_for '/datetime' => (method => 'POST') => begin
+    <form action="/smanager/datetime" method="POST">
-    <p>
+
-    %= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus};
+        <br>
 
         % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus';
-    %= radio_button Ntpstatus => 'enabled'
+        % param 'Ntpserver' => 'smeserver.pool.ntp.org' unless param 'Ntpserver';
-    <span class="">
+
-    %=l 'dat_NTP_CONFIGURE_TITLE'
-    </span>
         <br>
+
         % if ($dat_datas->{ntpstatus} eq 'disabled') {
-    <div class="">
-        %=l 'dat_NTP_ENABLE_DESC'
-        <br>
-    </div>  
-    % } else {
-    <div class="">
-        %=l 'dat_NTP_CONFIGURE_DESC'
-        <br><br>
-        <p>
-        %=l 'dat_CURRENT_SETTING'
-        <b>
-        %= $dat_datas->{now_string}
-        </b>
-        </p>
-        <p>
-        <br>
-        <span class="">
-        %=l 'dat_NTP_SERVER'
-        </span>
-        <span class="">
-        %= text_field 'Ntpserver' =>  $dat_datas->{ntpserver}, class => ""
-        </span>
-        </p>
-    </div>
-    % } 
-    %= radio_button Ntpstatus => 'disabled'
-    <span class="">
-    %=l 'dat_NTP_DISABLE_TITLE'
-    </span>
 
-    % if ($dat_datas->{ntpstatus} eq 'enabled') {
 
-    <br><BR>
+            <div>
-    <div class="">
+                You can manually set your server time here (static string for testing)<br><br>
-        %=l 'dat_NTP_DISABLE_DESC'
             </div>
-    % } else {
+
-    <div class="">
             <br>
-        </p>
+
-        <p>
+            <div>
-        %=l 'dat_CURRENT_SETTING'
-        <b>
-        %= $dat_datas->{now_string}
-        </b>
                 <br>
-        <span class="">
+
-        %=l 'dat_NEW_M/D/Y'
+                <div class="row g-3 align-items-center">
-        </span>
+                    <div class="col-md-1">
-        <span class="">
+                        <%= l 'dat_CURRENT_SETTING' %>
+                    </div>
+                    <div class="col-auto">
+                        <b><%= $dat_datas->{now_string} %></b>
+                    </div>
+                </div>
+
+                <br>
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <%= l 'dat_NEW_M/D/Y' %>
+                    </div>
+                    <div class="col-auto">
                         % param 'Month' => $dat_datas->{month} unless param 'Month';
-        %= select_field 'Month' => $c->getMonth_list(), class => ""
+                        %= select_field 'Month' => $c->getMonth_list(), class => "form-select"
-        </span>
+                    </div>
-        <span class="">
+
+                    <div class="col-auto">
                         % param 'Day' => $dat_datas->{day} unless param 'Day';
                         %= text_field 'Day', size => '2', class => ""
-        </span>
+                    </div>
-        <span class="">
+                    <div class="col-auto">
                         % param 'Year' => $dat_datas->{year} unless param 'Year';
                         %= text_field 'Year', size => '4', class => ""
-        </span>
+                    </div>
+
+                </div>
+
                 <br>
-        <span class="">
+
-        %=l 'dat_NEW_H/M/S'
+
-        </span>
+                <div class="row g-3 align-items-center">
-        <span class="">
+                    <div class="col-md-1">
+                        <%= l 'dat_NEW_H/M/S' %>
+                    </div>
+                    <div class="col-auto">
                         % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
                         %= text_field 'Hour', size => '2', class => ""
-        </span>
+                    </div>
-        <span class="">
+                    <div class="col-auto">
                         % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
                         %= text_field 'Minute', size => '2', class => ""
-        </span>
+                    </div>
-        <span class="">
+                    <div class="col-auto">
                         % param 'Second' => $dat_datas->{second} unless param 'Second';
                         %= text_field 'Second', size => '2', class => ""
-        </span>
+                    </div>
+                </div>
+
                 <br>
-        <span class="">
+
-        %=l 'dat_AM/PM_AND_TZ'
+                <div class="row g-3 align-items-center">
-        </span>
+                    <div class="col-md-1">
-        <span class="">
+                        <%= l 'dat_AM/PM_AND_TZ' %>
+                    </div>
+                    <div class="col-auto">
                         % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
-        %= select_field 'Ampm' =>  ['AM', 'PM'], class => ""
+                        %= select_field 'Ampm' =>  ['AM', 'PM'], class => "form-select"
-        </span>
+                    </div>
-        <span class="">
+
+                   <div class="col-auto">
                        % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-        %= select_field 'Timezone' =>  $c->getZone_list(), class => ""
+                       %= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select"
-        </span>
-        </p>
                    </div>
-    % }
+
-    <p>
+                </div>
+
                 <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-    % end    
+                <div class="form-check">
+                    <label class="form-check-label" for="radioDefault1">
+                        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
+                    </label>
+                    <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1" value="enabled">
+                </div>
+            </div>
+
+            <%#= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
+
+            <%= hidden_field 'Old_ntpstatus' => 'disabled' %>
+
+        % } else {
+
+            <!-- # %  if ($dat_datas->{ntpstatus} eq 'enabled') { -->
+
+            <div>
+                <%= l 'dat_NTP_ENABLE_DESC' %>
+            </div>
+
+            <div>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <%= l 'dat_CURRENT_SETTING' %>
+                    </div>
+                    <div class="col-auto">
+                        <b><%= $dat_datas->{now_string} %></b>
+                    </div>
+                </div>
+
+                <br>
+
+                <div class="form-check">
+                    <label class="form-check-label" for="radioDefault1">
+                        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
+                    </label>
+                    <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1" value="enabled">
+                </div>
+                <br>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <label for="inputNTPServer" class="col-form-label"><%= l 'dat_NTP_SERVER' %></label>
+                    </div>
+                    <div class="col-auto">
+                        <input type="text" name="Ntpserver" id="inputNTPServer" class="form-control" aria-describedby="NTP Server" value="<%= $dat_datas->{ntpserver} %>">
+                    </div>
+                </div>
+
+            </div>
+
+            <br>
+
+            <div>
+                <%= l 'dat_NTP_DISABLE_DESC' %>
+            </div>
+
+            <br>
+
+            <div class="form-check">
+              <label class="form-check-label" for="radioDefault2">
+                <%= l 'dat_NTP_DISABLE_TITLE' %>
+              </label>
+              <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault2" value="disabled">
+            </div>
+
+
+            <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
+            <%#= hidden_field 'Old_ntpstatus' => 'disabled' %>
+
+        % }
+
+
+
+        <br>
+
+
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+
+    </form>
 
 </div>
 %end

root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old

@@ -0,0 +1,172 @@
+% layout 'AdminLTE', title => "Sme server 2 - datetime";
+
+% content_for 'module' => begin
+
+<div class="card-body">
+
+    % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $dat_datas %>
+        </pre>
+    % }
+
+    % if ( stash 'error' ) {
+        <br>
+        <div class="text-danger">
+            %= $c->render_to_string(inline => stash 'error')
+        </div>
+    %}
+
+    <h1><%= $title %></h1>
+    <br>
+    %= $modul
+    <% my $btn = l('SAVE'); %>
+
+    <form action="/smanager/datetime" method="POST">
+
+        <br>
+
+        % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus';
+
+        <div class="form-check">
+            <label class="form-check-label" for="radioDefault1">
+                <%=l 'dat_NTP_CONFIGURE_TITLE' %>
+            </label>
+            <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1">
+        </div>
+
+        <br>
+
+        <%= radio_button Ntpstatus => 'enabled' %>
+        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
+
+        <br>
+
+        % if ($dat_datas->{ntpstatus} eq 'disabled') {
+
+            <div>
+                Status disabled
+                <%= l 'dat_NTP_ENABLE_DESC' %>
+                <br>
+            </div>
+
+        % } else {
+
+            <div>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <%= l 'dat_CURRENT_SETTING' %>
+                    </div>
+                    <div class="col-auto">
+                        <b><%= $dat_datas->{now_string} %></b>
+                    </div>
+                </div>
+
+                <br>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <label for="inputNTPServer" class="col-form-label"><%= l 'dat_NTP_SERVER' %></label>
+                    </div>
+                    <div class="col-auto">
+                        <input type="text" name="Ntpserver" id="inputNTPServer" class="form-control" aria-describedby="NTP Server" value="<%= $dat_datas->{ntpserver} %>">
+                    </div>
+                </div>
+
+            </div>
+        % }
+
+
+        <%= radio_button Ntpstatus => 'disabled' %>
+        <%= l 'dat_NTP_DISABLE_TITLE' %>
+
+        <div class="form-check">
+          <label class="form-check-label" for="radioDefault2">
+            <%= l 'dat_NTP_DISABLE_TITLE' %>
+          </label>
+          <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault2" value="disabled">
+        </div>
+
+
+
+
+        % if ($dat_datas->{ntpstatus} eq 'enabled') {
+
+            <br><br>
+            <div>
+                <%= l 'dat_NTP_DISABLE_DESC' %>
+            </div>
+
+        % } else {
+
+        <div>
+            <br>
+
+            <%= l 'dat_CURRENT_SETTING' %>
+
+            <b><%= $dat_datas->{now_string} %></b>
+
+            <br>
+            <span class="">
+            <%= l 'dat_NEW_M/D/Y' %>
+            </span>
+            <span class="">
+            % param 'Month' => $dat_datas->{month} unless param 'Month';
+            %= select_field 'Month' => $c->getMonth_list(), class => ""
+            </span>
+            <span class="">
+            % param 'Day' => $dat_datas->{day} unless param 'Day';
+            %= text_field 'Day', size => '2', class => ""
+            </span>
+            <span class="">
+            % param 'Year' => $dat_datas->{year} unless param 'Year';
+            %= text_field 'Year', size => '4', class => ""
+            </span>
+            <br>
+            <span class="">
+            <%= l 'dat_NEW_H/M/S' %>
+            </span>
+            <span class="">
+            % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
+            %= text_field 'Hour', size => '2', class => ""
+            </span>
+            <span class="">
+            % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
+            %= text_field 'Minute', size => '2', class => ""
+            </span>
+            <span class="">
+            % param 'Second' => $dat_datas->{second} unless param 'Second';
+            %= text_field 'Second', size => '2', class => ""
+            </span>
+            <br>
+            <span class="">
+            <%= l 'dat_AM/PM_AND_TZ' %>
+            </span>
+            <span class="">
+            % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
+            %= select_field 'Ampm' =>  ['AM', 'PM'], class => ""
+            </span>
+            <span class="">
+            % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
+            %= select_field 'Timezone' =>  $c->getZone_list(), class => ""
+            </span>
+            </p>
+        </div>
+        % }
+
+        <br>
+        <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
+
+        <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

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

@@ -5,87 +5,129 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
+    <div>
-    (DBG)route: <%= $c->current_route %><br>
+        <%= dumper $c->current_route %><br>
-    (DBG)dir. access: <%= $dir_datas->{access}%><br>
+        <%= dumper $dir_datas->{access}%><br>
-    </p>
+    </div>
     % }
 
     <h1><%= $title %></h1>
     <br>
     <%= $modul %>
-    <%  my $btn = l('SAVE');
+    <%  my $btn = l('SAVE'); %>
-     %>
 
-
+    <form action="/smanager/directory" method="POST">
-    %= form_for 'directory' => (method => 'POST') => begin
     <br>
-    <p>
+    <div>
-    <span class="">
+        <div class="row g-3 align-items-center">
-    %= l('dir_LABEL_ROOT'), class => ""
+            <div class="col-md-2">
-    </span>
+                <%= l('dir_LABEL_ROOT') %>
-    <span class="">
-    %= $dir_datas->{root}, class => "" 
-    </span>
-    </p>
-    <p>
-    %=l 'dir_DESC_DIRECTORY_ACCESS', class => ""
-    <br>
-    <span class="">
-    %=l 'dir_DIRECTORY_ACCESS', class => ""
-    </span>
-    <span class="">
-    % param 'access' => $dir_datas->{access} unless param 'access';
-    %= select_field 'access' =>  [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']], class => "", id => ""
-    </span>
-    </p>
-    <p>
-    %=l 'dir_DESC_DEPARTMENT', class => ""
-    <br><br>
-    <span class="">
-    %=l 'dir_DEPARTMENT', class => ""
-    </span><span class="">
-    %= text_field 'department' =>  $dir_datas->{department}, class => ""
-    </span>
-    </p><p>
-    <span class="">
-    %=l 'dir_COMPANY', class => ""
-    </span><span class="">
-    %= text_field 'company', $dir_datas->{company}, class => ""
-    </span>
-    </p><p>
-    <span class="">
-    %=l 'dir_STREET', class => ""
-    </span><span class="">
-    %= text_field 'street' =>  $dir_datas->{street}, class => ""
-    </span>
-    </p><p>
-    <span class="">
-    %=l 'dir_CITY', class => ""
-    </span><span class="">
-    %= text_field 'city', $dir_datas->{city}, class => ""
-    </span>
-    </p><p>
-    <span class="">
-    %=l 'dir_PHONENUMBER', class => ""
-    </span><span class="">
-    %= text_field 'phonenumber', $dir_datas->{phonenumber}, class => ""
-    </span>
-    </p>
-    <p>
-    %=l 'dir_DESC_EXISTING', class => ""
-    <br><br>
-    <span class="">
-    %=l 'dir_EXISTING', class => ""
-    </span><span class="">
-    %= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => ""
-    </span>
-    </p>
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
-    % end    
-
             </div>
+            <div class="col-auto">
+                <%= $dir_datas->{root} %>
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'dir_DESC_DIRECTORY_ACCESS' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'dir_DIRECTORY_ACCESS' %>
+            </div>
+            <div class="col-auto">
+            % param 'access' => $dir_datas->{access} unless param 'access';
+            <%= select_field 'access' =>  [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']], class => "form-select" %>
+        </div>
+
+        <br><br>
+
+        <div>
+            <%= l 'dir_DESC_DEPARTMENT' %>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDirDepartment" class="col-form-label"><%= l 'dir_DEPARTMENT' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="department" id="inputDirDepartment" class="form-control" aria-describedby="DirectoryDepartment" value="<%= $dir_datas->{department} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDirCompany" class="col-form-label"><%= l 'dir_COMPANY' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="company" id="inputDirCompany" class="form-control" aria-describedby="DirectoryCompany" value="<%= $dir_datas->{company} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDirStreet" class="col-form-label"><%= l 'dir_STREET' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="street" id="inputDirStreet" class="form-control" aria-describedby="DirectoryStreet" value="<%= $dir_datas->{street} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDirCity" class="col-form-label"><%= l 'dir_CITY' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="city" id="inputDirCity" class="form-control" aria-describedby="DirectoryCity" value="<%= $dir_datas->{city} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDirPhoneNumber" class="col-form-label"><%= l 'dir_PHONENUMBER' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="phonenumber" id="inputDirPhoneNumber" class="form-control" aria-describedby="DirectoryPhoneNmber" value="<%= $dir_datas->{phonenumber} %>">
+            </div>
+        </div>
+
+        <br><br>
+
+        <div>
+            <%= l 'dir_DESC_EXISTING' %>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <%= l 'dir_EXISTING' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+</div>
+
 %end

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

@@ -5,15 +5,16 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $dom_datas
+        <%= dumper $dom_datas %>
-    </p>
+    </div>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error')  %>
         </div>
     % }
 

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

@@ -5,63 +5,91 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <pre>
         %= dumper $c->current_route
         %= dumper $mai_datas
-    </p>
+    </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $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
+    <br>
 
-    %=l 'mai_DESC_POP_ACCESS_CONTROL'
+    <form action="/smanager/emailsettingd" method="POST">
 
-    <p>
+        <div>
-    <span class="">
+            <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
-    %=l 'mai_LABEL_POP_ACCESS_CONTROL'
+        </div>
-    </span>
+
-    <span class="">
+        <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 => ""
+                <%= select_field 'POPAccess' => $c->get_pop_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    %=l 'mai_DESC_IMAP_ACCESS_CONTROL'
+        <br>
 
-    <p>
+        <div>
-    <span class="">
+            <%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
-    %=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
+        </div>
-    </span>
+
-    <span class="">
+        <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 => ""
+                <%= select_field 'IMAPAccess' => $c->get_imap_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    %=l 'mai_DESC_WEBMAIL'
+        <br>
 
-    <p>
+        <div>
-    <span class="">
+            <%= l 'mai_DESC_WEBMAIL' %>
-    %=l 'mai_LABEL_WEBMAIL'
+        <div>
-    </span>
+
-    <span class="">
+        <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 => ""
+                <%= select_field 'WebMail' => $c->get_webmail_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <br>
 
         % my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <%= hidden_field 'trt' => 'ACC' %>
 
-    %= hidden_field 'trt' => 'ACC'
+        <div class="row g-3 align-items-center">
-    % end    
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+
+    <br>
 
 </div>
 %end

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

@@ -5,108 +5,147 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $mai_datas
+            <%= dumper $mai_datas %>
-    </p>
+        </pre>
     % }
 
+
     % if ( stash 'error' ) {
         <br>
-        <div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title %></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
+    <form action="/smanager/emailsettingd" method="POST">
-    %=l 'mai_TITLE_UNKNOWN'
-    </h2>
 
-    %=l 'mai_DESC_UNKNOWN'
+        <h2><%= l 'mai_TITLE_UNKNOWN' %></h2>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'mai_LABEL_UNKNOWN'
+        <div>
-    </span>
+            <%= l 'mai_DESC_UNKNOWN' %>
-    <span class="">
+        </div>
+
+        <br>
+
+        <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 => ""
+                <%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <br>
 
         <!--<hr class="" />-->
-    <h2>
+        <h2><%= l 'mai_TITLE_DELEGATE' %></h2>
-    %=l 'mai_TITLE_DELEGATE'
-    </h2>
 
-    %=l 'mai_DESC_DELEGATE'
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_DELEGATE' %>
+        </div>
+
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_DELEGATE'
-    </span>
-    <span class="">
         % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
-    %= text_field 'DelegateMailServer', class => ""
+
-    </span>
+        <div class="row g-3 align-items-center">
-    </p>
+            <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>
+
+        <br>
 
         <!--<hr class="" />-->
-    <h2>
+        <h2><%= l 'mai_TITLE_SMARTHOST' %></h2>
-    %=l 'mai_TITLE_SMARTHOST'
-    </h2>
 
-    %=l 'mai_DESC_SMARTHOST'
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SMARTHOST' %>
+        </div>
+
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST'
-    </span>
-    <span class="">
         % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
-    %= text_field 'SMTPSmartHost', class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
+                <label for="inputSMTPSmartHost" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST' %></label>
-    </span>
+            </div>
-    <span class="">
+            <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';
-    %= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
+                <%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' %>
-    </span>
+            </div>
-    <span class="">
+            <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';
-    %= text_field 'SMTPAUTHPROXY_Userid', class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
+                <label for="inputSMTPAuthproxy" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' %></label>
-    </span>
+            </div>
-    <span class="">
+            <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';
-    %= password_field 'SMTPAUTHPROXY_Passwd', class => ""
+
-    </span>
+        <div class="row g-3 align-items-center">
-    </p>
+            <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');
-    %= submit_button "$btn", class => ""
+        <%= hidden_field 'trt' => 'DEL' %>
 
-    %= hidden_field 'trt' => 'DEL'
+        <div class="row g-3 align-items-center">
-    % end    
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
+    </form>
 </div>
 %end

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>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $mai_datas
+            <%= dumper $mai_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <%= $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>
+        <div>
-    <span class="">
+            <%= l 'mai_DESC_VIRUS_SCAN' %>
-    %=l 'mai_LABEL_SPAM_SCAN'
+        </div>
-    </span>
+
-    <span class="">
+        <br>
+
+        <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>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SPAM_SCAN' %>
+        </div>
+
+        <br>
+
+        <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 => ""
+                <%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'mai_LABEL_SPAM_SENSITIVITY'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-1">
-    <span class="">
+                <%= 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 => ""
+                <%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'mai_LABEL_SPAM_TAGLEVEL'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-1">
-    <span class="">
+                <%= 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 => ""
+                <%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'mai_LABEL_SPAM_REJECTLEVEL'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-1">
-    <span class="">
+                <%= 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 => ""
+                <%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'mai_LABEL_SORTSPAM'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-1">
-    <span class="">
+                <%= 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 => ""
+                 <%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    %=l 'mai_DESC_SPAM_SUBJECT'
+        <br>
 
-    <p>
+        <div>
-    <span class="">
+            <%= l 'mai_DESC_SPAM_SUBJECT' %>
-    %=l 'mai_LABEL_SPAM_SUBJECTTAG'
+        </div>
-    </span>
+
-    <span class="">
+        <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 => ""
+                <%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <br>
 
-    <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>
 
-    %=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
+        <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>
 
-    <p>
+
-    <span class="">
+
-    %=l 'mai_LABEL_CONTENT_TO_BLOCK'
+        <br>
-    </span>
+
-    <span class="">
+        <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 => "", multiple => "1"
+                <%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "form-select", multiple => "1" %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <br>
 
         % my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <%= hidden_field 'trt' => 'FIL'  %>
 
-    %= hidden_field 'trt' => 'FIL'
+        <div class="row g-3 align-items-center">
-    % end
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 %end

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

@@ -8,196 +8,279 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <<%=  dumper $c->current_route %>
-    %= dumper $mai_datas
+            <<%=  dumper $mai_datas %>
-    %= dumper $c->param('SMTPAuth')
+            <<%=  dumper $c->param('SMTPAuth') %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <<%=  $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%=  $title %></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <br>
 
-    %=l 'mai_DESC_MODE'
+    <form action="/smanager/emailsettingd" method="POST">
 
-    <p>
+        <div>
-    <span class="">
+            <%= l 'mai_DESC_MODE' %>
-    %=l 'mai_LABEL_MODE'
+        </div>
-    </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 $mai_datas->{fetchmailmethod}  %>
-        %= dumper $c->get_retrieval_opt()
+                    <%=  dumper $c->get_retrieval_opt()  %>
-        %= param 'FetchmailMethod'
+                    <%=  param 'FetchmailMethod'  %>
                 </pre>
                 -->
-    %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => ""
+                <%=  select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class =>"form-select" %>
-    </span>
+            </div>
-    </p>
+        </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>
+
 
-    %#=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 />
 
         % 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="">
         % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
+
+        <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">
+
                 <!--
                 <pre>
-        %= dumper $c->get_smtp_auth_opt()
+                    <%=  dumper $c->get_smtp_auth_opt() %>
-        %= dumper $c->get_current_smtp_auth(FALSE)
+                    <%=  dumper $c->get_current_smtp_auth(FALSE) %>
-        %= dumper $c->get_db_prop("qpsmtpd","Authentication")
+                    <%=  dumper $c->get_db_prop("qpsmtpd","Authentication") %>
-        %= param 'SMTPAuth'
+                    <%=  param 'SMTPAuth'  %>
                 </pre>
                 -->
-        %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => ""
+                <%=  select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <br>
 
         % 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>
+        <div class="row g-3 align-items-center">
-    </p>
+            <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:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-    </span>
-    <span class="">
         % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
+
+        <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_smtp_ssl_auth_opt() %>
-        %= dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE)
+                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) %>
-        %= dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE)
+                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) %>
-        %= dumper $c->get_db_prop("uqpsmtpd","access")
+                    <%=  dumper $c->get_db_prop("uqpsmtpd","access") %>
-        %= param 'uSMTPAuth'
+                    <%=  param 'uSMTPAuth' %>
                 </pre>
                 -->
-    %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
+                <%=  select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <!--<hr class="" />-->
+        <br>
-    <h2>
-    %=l 'mai_TITLE_SECONDARY'
-    </h2>
 
-    %=l 'mai_DESC_SECONDARY'
+        <h2><%= l 'mai_TITLE_SECONDARY' %></h2>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SECONDARY' %>
+        </div>
+
+        <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>
 
-    %=l 'mai_DESC_FETCH_PERIOD'
+        <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>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_FETCH_PERIOD' %>
+        </div>
 
-    <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>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
+                <%= l 'mai_LABEL_FETCH_PERIOD' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
+                <%=  select_field 'FreqOffice' => $c->fetchmail_freq(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
         % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
-    %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
+                <%= l 'mai_LABEL_FETCH_PERIOD_NIGHTS' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
+                <%=  select_field 'FreqOutside' => $c->fetchmail_freq(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
         % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
-    %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_POP_ACCOUNT'
+                <%= l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
+                <%=  select_field 'FreqWeekend' => $c->fetchmail_freq(), class => "form-select" %>
+             </div>
+        </div>
+
+        <br>
+
         % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
-    %= text_field 'SecondaryMailAccount', class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_POP_PASS'
+                <label for="inputSecondaryMailAccount" class="col-form-label"><%= l 'mai_LABEL_POP_ACCOUNT' %></label>
-    </span>
+            </div>
-    <span class="">
+            <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';
-    %= password_field 'SecondaryMailPassword', class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_SORT_METHOD'
+                <label for="password" class="col-form-label"><%= l 'mai_LABEL_POP_PASS' %></label>
-    </span>
+            </div>
-    <span class="">
+            <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';
-    %= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => ""
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_SORT_HEADER'
+                <%= l 'mai_LABEL_SORT_METHOD' %>
-    </span>
+            </div>
-    <span class="">
+            <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';
-    %= text_field 'SecondaryMailEnvelope', class => ""
+
-    </span>
+        <div class="row g-3 align-items-center">
-    </p>
+            <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');
-    %= submit_button "$btn", class => ""
+        <%=  hidden_field 'trt' => 'REC' %>
 
-    %= hidden_field 'trt' => 'REC'
+        <div class="row g-3 align-items-center">
-    % end    
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 %end
+

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

@@ -5,190 +5,224 @@
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
+<!-- see ibays as an example with partials -->
+
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $mai_datas
+            <= dumper $mai_datas %>
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     %}
 
     <h1><%= $title%></h1>
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
+    <br>
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_ACCESS_CONTROL'
-    </span>
-    <span class="">
-    %= $c->get_current_pop3_access( TRUE )
-    </span>
-    </p>
 
-    <p>
+    <form action="/smanager/emailsettings" method="POST">
-    <span class="">
-    %=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-    </span>
-    <span class="">
-    %= $c->get_current_imap_access( TRUE )
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_WEBMAIL'
+                <%= l 'mai_LABEL_POP_ACCESS_CONTROL' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
-    %= $c->get_current_webmail_status( TRUE )
+            <%= $c->get_current_pop3_access( TRUE ) %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_imap_access( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_WEBMAIL' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_webmail_status( TRUE ) %>
+            </div>
+        </div>
+
+        <br>
 
         % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
-    <div class="">
+        <%= hidden_field 'trt' => 'ACC' %>
-    %= submit_button "$btn", class => ""
+
+        <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'
+    </form>
-    % end   
+
-    <br> 
+    <br><br>
 
     <!--<hr class="" />-->
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
+    <form action="/smanager/emailsettings" method="POST">
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_VIRUS_SCAN'
-    </span>
-    <span class="">
-    %= $c->get_virus_status(TRUE)
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_SPAM_SCAN'
+                <%= l 'mai_LABEL_VIRUS_SCAN' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
-    %= $c->get_spam_status(TRUE)
+                <%= $c->get_virus_status(TRUE) %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT'
+            <%= l 'mai_LABEL_SPAM_SCAN' %>
-    </span>
+            </div>
-    <span class="">
+           <div class="col-auto">
-    %= $c->get_patterns_status(TRUE)
+           <%= $c->get_spam_status(TRUE) %>
-    </span>
+           </div>
-    </p>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_patterns_status(TRUE) %>
+            </div>
+        </div>
+
+        <br>
 
         % my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
-    <div class="">
+        <%= hidden_field 'trt' => 'FIL' %>
-    %= submit_button "$btn", class => ""
+
+        <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' => 'FIL'
+    </form>
-    % end  
+
-    <br>  
+    <br><br>
 
     <!--<hr class="" />-->
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
+    <form action="/smanager/emailsettings" method="POST">
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_MODE'
+                <%= l 'mai_LABEL_MODE' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
-    %= $mai_datas->{fetchmailmethod}
+                <%= $mai_datas->{fetchmailmethod} %>
-    </span>
+            </div>
-    </p>
+        </div>
 
         % my $smtp_mesg;
 
         % $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="">
-        %= $c->get_current_smtp_auth( TRUE )
-    </span>
-    </p>
 
-    % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
+        <div class="row g-3 align-items-center">
-    <p>
+            <div class="col-md-2">
-    <span class="">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
-        %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
+            </div>
-    </span>
+            <div class="col-auto">
-    <span class="">
+                <%= $c->get_current_smtp_auth( TRUE ) %>
-        %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )
+            </div>
-    </span>
+        </div>
-    </p>
+
-
+        % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-    % $smtp_mesg=l 'Submission port %u status:';
+
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-        %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
+                <%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
-    %= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE )
+                <%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %>
-    </span>
+            </div>
-    </p>
+        </div>
-    <br />
+
-
+        % $smtp_mesg=l 'Submission port %u status:';
-    % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
+
-    <div class="">
+        <div class="row g-3 align-items-center">
-    %= submit_button "$btn", class => ""
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) %>
+            </div>
         </div>
 
-    %= hidden_field 'trt' => 'REC'
-    % end    
         <br>
 
+        % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
+        <%= 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>
+
+    <br><br>
+
     <!--<hr class="" />-->
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
+    <form action="/smanager/emailsettings" method="POST">
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_UNKNOWN'
+                <%= l 'mai_LABEL_UNKNOWN' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
-    %= $c->get_emailunknownuser_status( TRUE )
+                <%= $c->get_emailunknownuser_status( TRUE ) %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'mai_LABEL_DELEGATE'
+                <%= l 'mai_LABEL_DELEGATE' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
-    %= $c->get_value('DelegateMailServer')
+                <%= $c->get_value('DelegateMailServer') %>
-    </span>
+            </div>
-    </p>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SMARTHOST' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_value('SMTPSmartHost') %>
+            </div>
+        </div>
+
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST'
-    </span>
-    <span class="">
-    %= $c->get_value('SMTPSmartHost')
-    </span>
-    </p>
 
         % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
-    <div class="">
+        <%= hidden_field 'trt' => 'DEL' %>
-        %= submit_button "$btn", class => ""
+
+        <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' => 'DEL'
+        <br>
-    % end    
 
+    </form>
 </div>
+
 %end

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

@@ -5,15 +5,17 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $grp_datas
-    </p>
+    </div>
     % }
 
+<!-- reetp error here -->
+
     % if ( stash 'error' ) {
-        <br><div class="">
+        <div class="text-danger">
-        %= $c->render_to_string(inline => stash 'error') 
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 

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

@@ -5,21 +5,21 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $hos_datas
+        <%= dumper $hos_datas %>
-    </p>
+    </div>
     % }
 
-    <h1><%= $title%></h1>
-
     % if ( $notif ) {
     <br>
-    <span class="">
+        <div class="text-danger">
             <%= $c->render_to_string(inline => $notif) %>
-    </span>
+        </div>
     % }
 
+    <h1><%= $title%></h1>
+
     % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') {
         %= include 'partials/_hos_upd'
     %} elsif ($hos_datas->{trt} eq 'DEL') {

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

@@ -5,15 +5,16 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+       <pre>
-    %= dumper $c->current_route
+           <%= dumper $c->current_route %>
-    %= dumper $iba_datas
+           <%= dumper $iba_datas %>
-    </p>
+       </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 

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

@@ -5,16 +5,17 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <div>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $c->stash("ret")
+            <%= dumper $c->stash("ret") %>
-    %= dumper $c->param("localnetwork");
+            <%= dumper $c->param("localnetwork") %>
-    %= dumper $c->stash("ln_datas");
+            <%= dumper $c->stash("ln_datas") %>
-    %= dumper $c->param("deletehost");
+            <%= dumper $c->param("deletehost") %>
-    </p>
+        </div>
     % }
 
     <h1><%= $title%></h1>
+
      %= $modul
 
     % if ($ln_datas->{trt} eq 'ADD') {
@@ -30,4 +31,5 @@
     %}
 
 </div>
+
 %end

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

@@ -2,26 +2,33 @@
 
 % content_for 'module' => begin
 
-  %if ( config 'debug' ) {
+  % if (config->{debug} == 1) {
-  <p>
+  <div>
-  <!-- %= dumper $c->current_route -->
+      <%= dumper $c->current_route %>
       % if ( stash 'trt' ) {
-      %= dumper stash 'trt'
+          <%= dumper stash 'trt' %>
       % }
-  </p>
+  </div>
   % }
 
 % if ( stash 'error' ) {
-      <br><div class="">
+    <br>
-      %= $c->render_to_string(inline => stash 'error') 
+    <div class="container text-center">
+        <div class="row">
+            <div class="col-sm">
+                <div class="text-danger">
+                <%= $c->render_to_string(inline => stash 'error') %>
+                </div>
+        </div>
     </div>
 % }
 
 % my $btn = l('use_SIGNIN');
 % if ( $trt eq 'RESET' ) {
-      <br><div class=""><h2>
+      <br>
-      %= $c->render_to_string(inline => l 'use_DESC_RESET') 
+      <div>
-  </h2></div>
+          <h2><%= $c->render_to_string(inline => l 'use_DESC_RESET') %></h2>
+      </div>
   % $btn = l('use_RESET');
 % }
 
@@ -36,7 +43,9 @@
             </div>
             <br>
             <a href="/smanager" class="link-dark text-center link-offset-2 link-opacity-100 link-opacity-50-hover">
-              <h1 class="mb-0"><b>Koozali</b></h1><br><h3>Server Manager</h3>
+              <h1 class="mb-0"><b>Koozali</b></h1>
+              <br>
+              <h3>Server Manager</h3>
             </a>
             <br>
             <h1 class="text-center">
@@ -55,16 +64,19 @@
               </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'%>">
+                <input type="password" name="Password" id="password" class="form-control" placeholder="<%=l 'PASSWORD'%>" autocomplete="on">
-                <label for="Password">Password</label>
+                <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
+            <%= hidden_field 'From' => $c->tx->req->url %>
-            %= hidden_field 'Trt' => stash 'trt'
+            <%= hidden_field 'Trt' => stash 'trt' %>
 
             <!--begin::Row-->
             <div class="row">
@@ -84,7 +96,12 @@
             </div>
             <!--end::Row-->
           </form>
-          <p class="mb-1"><a href="login2">I forgot my password</a></p>
+          <br>
+          <!--
+          <div class="mb-1 text-center">
+              <a href="login2">I forgot my password</a>
+          </div>
+          -->
         </div>
         <!-- /.login-card-body -->
       </div>

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

@@ -8,14 +8,14 @@
 
 <div class="card-body">
     % if (config->{debug} == 1) {
-        <p>
+        <div>
             <strong>Debug Info:</strong>
             <pre><%= dumper $c->current_route %></pre>
-        </p>
+        </div>
     % }
 
     % if (stash 'error') {
-        <div class="">
+        <div>
             <strong>Error:</strong><br>
             <%= $c->render_to_string(inline => stash 'error') %>
         </div>
@@ -23,7 +23,7 @@
 
     <h1><%= $title %></h1>
 
-    <div class="">
+    <div>
         <%= $c->render_to_string(inline => stash 'modul') %>
     </div>
 </div>

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

@@ -1,29 +1,38 @@
 <div>
 
     % my $btn = l('REMOVE');
-    %= form_for '/domains2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'dom_REMOVE_TITLE'
-    </h2>
-    </p>
 
-    <p>
+    <form action="/smanager/domain2" method="POST">
-    %= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
-    </p>
 
-    <p><b>
-    %= l('dom_ABOUT_TO_REMOVE')
-    <b></p>
-
-    <p>
          <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-        %= hidden_field 'trt' => $dom_datas->{trt}
+         <div>
-        %= hidden_field 'Domain' => $dom_datas->{domain}
+             <h2><%=l 'dom_REMOVE_TITLE' %></h2>
+         </div>
 
-    % end    
+         <br>
+
+         <div>
+              <%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); %>
+         </div>
+
+         <br>
+
+         <div class="text-danger">
+             <%= l('dom_ABOUT_TO_REMOVE') %>
+         </div>
+
+         <br>
+
+         <div class="row g-3 align-items-center">
+             <div class="col-md-2">
+                 <button type="submit" class="btn btn-danger"><%= $btn %></button>
+             </div>
+         </div>
+
+         <%= hidden_field 'trt' => $dom_datas->{trt} %>
+         <%= hidden_field 'Domain' => $dom_datas->{domain} %>
+
+    </form>
 
 </div>

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

@@ -1,52 +1,45 @@
 <div>
 
     % my $btn = l('dom_ADD_DOMAIN');
+    <%= l('dom_FORM_DESCRIPTION'); %>
 
-
+    <form action="/smanager/domains" method="POST">
-    %= form_for '/domains' => (method => 'POST') => begin
-
-        %= l('dom_FORM_DESCRIPTION');
-        
-        <p>
         <br>
-        %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
-        </p>
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => 'ADD' %>
+    </form>
 
-        %= hidden_field 'trt' => 'ADD'
+    <br>
 
-    % end
+    <div>
+        <h2><%=l 'dom_CURRENT_DOMAINS' %></h2>
+    </div>
+
+    <br>
 
-    <h2>
-        %=l 'dom_CURRENT_DOMAINS'
-    </h2>
     <table class="table table-bordered">
         <thead>
             <tr>
-        <th class="">
+                <th class="col-sm"><%=l 'DOMAIN_NAME' %></th>
-            %=l 'DOMAIN_NAME'
+                <th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
-        </th>
+                <th class="col-sm"><%=l 'dom_CONTENT' %></th>
-        <th class="">
+                <th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
-            %=l 'DESCRIPTION_BRIEF'
+                <th class="col-sm user-valign-center" colspan="2"><%=l 'ACTION' %></th>
-        </th>
-        <th class="">
-            %=l 'dom_CONTENT'
-        </th>
-        <th class="">
-            %=l 'dom_LABEL_NAMESERVERS'
-        </th>
-        <th class="">
-            %=l 'ACTION'
-        </th>
             </tr>
         </thead>
+
         <tbody>
 
             % foreach my $domain ( @$domains ) {
                 <tr>
-            %= t td => (class => "") => $domain->{Domain}
+                    <td><%= $domain->{Domain} %></td>
-            %= t td => (class => "") => $domain->{'Description'}
+                    <td><%= $domain->{'Description'} %></td>
-            %= t td => (class => "") => $domain->{'Content'}
+                    <td><%= $domain->{'Content'} %></td>
-            %= t td => (class => "") => l('dom_' . $domain->{'Nameservers'})
+                    <td><%= l('dom_' . $domain->{'Nameservers'}) %></td>
 
                     %#  my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
                     % my $modify_text = l('MODIFY');  # Localized text
@@ -54,7 +47,7 @@
                     % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
                     % my $actionModify = qq{
                     % <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
-            %   <button type='button' class="" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
                     %       $modify_text
                     %   </button>
                     % </a>
@@ -67,61 +60,64 @@
                             % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
                             % $actionRemove = qq{
                                 % <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
-                        %   <button type='button' class="" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
                                 %       $remove_text
                                 %   </button>
                                 % </a>
                             %};
                         %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
                     %};
-            <td class="" style="min-width:15em">
+                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-            </td>
                 </tr>
             % }
 
         </tbody>
     </table>
 
-    %= hidden_field 'trt' => 'ADD'
+    <%= hidden_field 'trt' => 'ADD' %>
 
-    %= form_for '/domains' => (method => 'POST') => begin
+    <form action="/smanager/domains" method="POST">
 
         <!-- <HR class="">-->
         <br>
 
         % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
 
-        <h3>
+        <h3><%= l 'dom_DESC_CORPORATE_DNS_CURRENT' %></h3>
-            %= l 'dom_DESC_CORPORATE_DNS_CURRENT'
-            </h3>
 
-        <p>
+        % if ($dom_datas->{forwarder}) {
-        <span class="">
+        <div class="row g-3 align-items-center">
-        %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
+            <div class="col-md-3">
-        </span>
+                <%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %>
-        <span class="">
+            </div>
-        %= $dom_datas->{forwarder}
+            <div class="col-auto">
-        </span>
+                <%= $dom_datas->{forwarder} %>
-        </p>
+            </div>
-
+        </div>
-        % if ($dom_datas->{forwarder2}) {
-        <p>
-        <span class="">
-        %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
-        </span>
-        <span class="">
-        %= $dom_datas->{forwarder2}
-        </span>
-        </p>
         % }
 
-        <p>
+        % if ($dom_datas->{forwarder2}) {
-        %= submit_button "$btn2", class => ""
+            <div class="row g-3 align-items-center">
-        </p>
+                <div class="col-md-3">
-        %= hidden_field 'trt' => 'UP2'
+                     <%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %>
-    % end
+                </div>
+                <div class="col-auto">
+                     <%= $dom_datas->{forwarder2} %>
+                </div>
+            </div>
+        % }
 
+        <br>
 
+        <div class="row g-3 align-items-center">
+            <div class="col-md-auto">
+                <button type="submit" class="btn btn-primary"><%= $btn2 %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => 'UP2' %>
+
+    </form>
 
 </div>

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

@@ -2,38 +2,45 @@
 
     % my $btn = l('SAVE');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
+    <form action="/smanager/domains2" method="POST">
 
-    <p><br>
+        <div>
-    %=l 'dom_DESC_CORPORATE_DNS'
+            <%=l 'dom_DESC_CORPORATE_DNS' %>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-3">
-    <span class="">
+                <label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
+            </div>
+            <div class="col-auto">
                 % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
-    %= text_field 'Forwarder', class => ""
+                <input type="text" name="Forwarder" id="inputCorpDNSPrimary" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{forwarder} %>">
-    </span>
+            </div>
-    </p>
+       </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => ""
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-3">
-    <span class="">
+               <label for="inputCorpDNSSecondary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %></label>
+            </div>
+            <div class="col-auto">
                % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
-    %= text_field 'Forwarder2',  class => ""
+               <input type="text" name="Forwarder2" id="inputCorpDNSSecondary" class="form-control" aria-describedby="inputCorpDNSSecondary" value="<%= $dom_datas->{forwarder2} %>">
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+       <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-    %= hidden_field 'trt' => $dom_datas->{trt}
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => $dom_datas->{trt} %>
 
-    %end
+    </form>
 
 </div>

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

@@ -2,73 +2,87 @@
 
     % my $btn = l('ADD');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
+    <form action="/smanager/domains2" method="POST">
-    <p>
+
+        <br>
+
+        <div>
             <h2>
             % if ( $dom_datas->{trt} eq "ADD" ) {
-    %=l 'dom_CREATE_TITLE'
+                <%=l 'dom_CREATE_TITLE' %>
             % } else {
-    %=l 'dom_MODIFY_TITLE'
+                <%=l 'dom_MODIFY_TITLE' %>
                 % $btn = l('MODIFY');
             % }
             </h2>
-    </p>
+        </div>
 
-    <p><br>
+        <br>
-    <span class="">
+
-    %=l 'DOMAIN_NAME', class => ""
+        <div class="row g-3 algn-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                        <label for="Domain" class="col-form-label"><%=l 'DOMAIN_NAME' %></label>
+            </div>
+            <div class="col-auto">
             % if ( $dom_datas->{trt} eq "ADD" ) {
                 % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
-    %= text_field 'Domain', class => ""
+                <input type="text" name="Domain" id="Domain" class="form-control" aria-describedby="inputDomain" value="<%= $dom_datas->{domain} %>">
             % } else {
-        %= hidden_field 'Domain' => $dom_datas->{domain}
+                <%= hidden_field 'Domain' => $dom_datas->{domain} %>
-    %= $dom_datas->{domain}, class => ""
+                <%= $dom_datas->{domain} %>
             % }
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p><br>
+        <br>
-    <span class="">
+
-    %=l 'DESCRIPTION_BRIEF', class => ""
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
+            </div>
+            <div class="col-auto">
                 % param 'Description' => $dom_datas->{description} unless param 'Description';
-    %= text_field 'Description', class => ""
+                <input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p><br>
-    %=l 'dom_CONTENT_FIELD_DESCRIPTION'
         <br>
-    <span class="">
+        <%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
-    %= $c->l('dom_CONTENT', '');
+        <br><br>
-    </span>
+
-    <span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'Content' => $dom_datas->{content} unless param 'Content';
-    %= select_field 'Content', $c->content_options_list(), class => ""
+                <%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p><br>
-    %=l 'dom_DESC_NAMESERVERS'
         <br>
-    <span class="">
+        <%=l 'dom_DESC_NAMESERVERS' %>
-    %=l 'dom_LABEL_NAMESERVERS', class => ""
+        <br><br>
-    </span>
+
-    <span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
+            </div>
+            <div class="col-auto">
                 % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
-    %= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
+                <%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p><br>
+        <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-    %= hidden_field 'trt' => $dom_datas->{trt}
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => $dom_datas->{trt} %>
 
-    %end
+    </form>
 
 </div>

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

@@ -1,4 +1,4 @@
-<div class="container-sm">
+<div>
     <br>
     <!-- <h2><%#= l 'grp_FORM_TITLE' %></h2> -->
 
@@ -53,7 +53,7 @@
 
         <br>
         <div>
-    	%= check_box 'groupMembers' => 'admin'
+            <%= check_box 'groupMembers' => 'admin' %>
             &nbspAdministrator (admin)
             <br>
             % my $users = $c->gen_users_list();
@@ -75,5 +75,6 @@
         </div>
 
         %= hidden_field 'trt' => $grp_datas->{trt}
+    </form>
 
 </div>

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

@@ -1,4 +1,4 @@
-<div class="container-sm">
+<div>
 
     % my $btn = l('REMOVE');
 
@@ -59,13 +59,13 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
             </div>
         </div>
 
-    %= hidden_field 'trt' => $grp_datas->{trt}
+        <%= hidden_field 'trt' => $grp_datas->{trt} %>
-    %= hidden_field 'groupName' => $grp_datas->{group}
+        <%= hidden_field 'groupName' => $grp_datas->{group} %>
-
 
+      </form>
 
 </div>

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

@@ -2,50 +2,41 @@
 
     % my $btn = l('GROUP_ADD');
 
-    %= form_for '/groups' => (method => 'POST') => begin
+    <form action="/smanager/groups2" method="POST">
-
-    %= hidden_field 'trt' => 'ADD'
-
         <br>
-
+        <div class="row g-3 align-items-center">
-    <div>
+            <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %> </button>
             </div>
-	
+        </div>
-    % end    
+        <%= hidden_field 'trt' => 'ADD' %>
+    </form>
 
     <br>
     <h2><%= l 'grp_CURRENT_LIST' %></h2>
     <br><br>
     % my $numGroups = @$groups;
     % if ($numGroups == 0){
-        %=l 'ACCOUNT_GROUP_NONE'
+        <%= l 'ACCOUNT_GROUP_NONE' %>
     % } else {
-	<table class="table table-bordered user-table-max-wdith">
+        <table class="table table-bordered user-table-max-width">
             <thead>
                 <tr>
-    	    <th class="col-sm">
+                    <th class="col-sm"><%= l 'GROUP' %></th>
-    	        %=l 'GROUP'
+                    <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-    	    </th>
+                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
-    	    <th class="col-sm">
-    	        %=l 'DESCRIPTION'
-    	    </th>
-    	    <th class="user-valign-center col-sm" colspan="2">
-	            %=l 'ACTION'
-    	    </th>
                 </tr>
             </thead>
             <tbody>
-
+                % foreach my $group ( @$groups ) {
-    %    foreach my $group ( @$groups )
-    %    {
                     <tr>
                         <td><%= $group->key %></td>
                         <td><%= $group->prop('Description') %></td>
 
-				%my $modify_text = l('MODIFY');  # Localized text
                             % my $csrf_token = "TOKEN";  # CSRF token for security
                             % my $group_name = $group->key;  # group name extracted from the data structure
+
+                            % my $modify_text = l('MODIFY');  # Localized text
                             % my $actionModify = qq{
                                 % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
                                 %   <button type='button' class="btn btn-primary" title='$modify_text' >
@@ -53,9 +44,8 @@
                                 %   </button>
                                 % </a>
                             %};
+
                             % my $remove_text = l('REMOVE');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
-				%my $group_name = $group->key;  # group name extracted from the data structure
                             % my $actionRemove = qq{
                                 % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
                                 %   <button type='button' class="btn btn-primary" title='$remove_text' >
@@ -70,8 +60,6 @@
                 % }
             </tbody>
         </table>
-	<%} %>
+    % }
-
-
 
 </div>

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

@@ -4,15 +4,17 @@
 
     <form action="/smanager/groups2" method="POST">
 
-	<br><br>
+        <br>
 
+        <div>
             <h2><%= l 'MODIFY_USER_GROUP' %></h2>
+        </div>
 
-	<br><br>
+        <br>
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-          <label for="inputLastNAme" class="col-form-label"><%= l 'GROUP_NAME' %></label>
+              <label for="inputGroupName" class="col-form-label"><%= l 'GROUP_NAME' %></label>
             </div>
             <div class="col-auto">
               <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $grp_datas->{group} %>">
@@ -68,8 +70,8 @@
                 %= check_box 'groupMembers' => $key
                 &nbsp
             % }
-	        %= $users->{$key} 
+                <%= $users->{$key} %>
-			%= " (" . $key . ")"
+                <%= " (" . $key . ")" %>
             <br>
         % }
 
@@ -82,9 +84,9 @@
         </div>
 
 
-	%= hidden_field 'trt' => $grp_datas->{trt}
+        <%= hidden_field 'trt' => $grp_datas->{trt} %>
-    %= hidden_field 'groupName' => $grp_datas->{group}
+        <%= hidden_field 'groupName' => $grp_datas->{group} %>
-	
 
+    </form>
 
 </div>

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

@@ -1,29 +1,34 @@
 <div>
 
     %   my $btn = l('REMOVE');
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'hos_REMOVE_TITLE'
-    </h2>
-    </p>
 
-    <p>
+    <form action="/smanager/hostentriesd" method="POST">
-    %= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname});
-    </p>
 
-    <p><b>
+        <div>
-    %=l 'hos_ABOUT_TO_REMOVE'
+            <h2><%= l 'hos_REMOVE_TITLE'%> </h2>
-    </b></p>
+        </div>
 
-    <p>
         <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-        %= hidden_field 'trt' => $hos_datas->{trt}
+        <div>
-        %= hidden_field 'Hostname' => $hos_datas->{hostname}
+            <%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %>
+        </div>
 
-    % end    
+        <br>
+
+        <b><%= l 'hos_ABOUT_TO_REMOVE' %></b>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $hos_datas->{trt} %>
+        <%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
+
+    </form>
 
 </div>

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

@@ -2,56 +2,43 @@
 
     % my $btn = l('hos_ADD_HOSTNAME');
 
-    %= form_for '/hostentries' => (method => 'POST') => begin
+    <form action="/smanager/hostentriesd" method="POST">
-
+        <div class="row g-3 align-items-center">
-    <p>
+            <div class="col-md-2">
-    %= submit_button "$btn", class => ""
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-    <br></p>
+            </div>
-
+        </div>
-        %= hidden_field 'trt' => $hos_datas->{trt}
+        <%= hidden_field 'trt' => $hos_datas->{trt} %>
-
+    </form>
-    % end
 
     % my %dom_hos = %{$dom_hosts};
     % foreach my $domain ( sort ( keys %dom_hos ) ) {
 
-    <p><br><b>
+        <br>
-    %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
+            <%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
-    </b><br></p>
+        <br>
 
         <table class="table table-bordered">
             <thead>
-    <tr>
+                <tr class="">
-            <th class="">
+                    <th class="col-sm"><%= l 'hos_HOSTNAME' %></th>
-            %=l 'hos_HOSTNAME'
+                    <th class="col-auto"><%= l 'hos_HOSTTYPE' %></th>
-            </th>
+                    <th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
-            <th class="">
+                    <th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
-            %=l 'hos_HOSTTYPE'
+                    <th class="col-auto"><%= l 'COMMENT' %></th>
-            </th>
+                    <th class="user-valign-center" colspan="2"><%= l 'ACTION' %></th>
-            <th class="">
-            %=l 'IP_ADDRESS_OR_FQDN'
-            </th>
-            <th class="">
-            %=l 'hos_ETHERNET_ADDRESS'
-            </th>
-            <th class="">
-            %=l 'COMMENT'
-            </th>
-            <th class="">
-            %=l 'ACTION'
-            </th>
                 </tr>
             </thead>
-       <tbody>
 
+            <tbody>
             % foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
                 <tr>
-            %= t td => (class => "") => $_->{'HostName'};
+                    <td><%= $_->{'HostName'}; %></td>
-            %= t td => (class => "") => $_->{'HostType'};
+                    <td><%= $_->{'HostType'}; %></td>
-            %= t td => (class => "") => $_->{'IP'};
+                    <td><%= $_->{'IP'}; %></td>
-            %= t td => (class => "") => $_->{'MACAddress'};
+                    <td><%= $_->{'MACAddress'}; %></td>
-            %= t td => (class => "") => $_->{'Comment'};
+                    <td><%= $_->{'Comment'}; %></td>
-            <td class="" style="min-width:15em">
+
                         % my ($actionModify, $actionRemove) = '&nbsp;';
                         % my $static = $_->{'static'} || "no";
                         % if ($static ne 'yes') {
@@ -60,7 +47,7 @@
                             %my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
                             %$actionModify = qq{
                                 % <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
-                    %   <button type='button' class="" title='$modify_text' > 
+                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
                                 %     $modify_text
                                 %   </button>
                                 % </a>
@@ -70,14 +57,15 @@
                             %#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
                             %$actionRemove = qq{
                                 % <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
                                 %     $remove_text
                                 %   </button>
                                 % </a>
                             %};
                         % }
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-            </td>
+                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+
                 </tr>
                % }
             </tbody>

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

@@ -3,60 +3,69 @@
 
     % my $btn = l('NEXT');
 
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+    <form action="/smanager/hostentriesd" method="POST">
-    <p><h2>
+
         % if ( $hos_datas->{trt} eq "ALC" ) {
-    %=l 'hos_CREATE_TYPE'
+            <h2><%= l 'hos_CREATE_TYPE'  %></h2>
         % } else {
-    %=l 'hos_MODIFY_TYPE'
+            <h2><%= l 'hos_MODIFY_TYPE' %></h2>
             % $btn = l('MODIFY');
         % }
-    </h2></p>
 
-    <p>
+        <div>
-    %=l 'hos_LOCAL_PAGE_DESCRIPTION'
+            <%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
-    </p>
+        </div>
+        <div>
+            <%= l 'hos_LOCAL_IP_DESCRIPTION' %>
+        </div>
 
-    <p>
+        <br>
-    %=l 'hos_LOCAL_IP_DESCRIPTION'
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'hos_LOCAL_IP', class => ""
+                <%= l 'hos_LOCAL_IP' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
                 % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
-    %= text_field 'Internalip', class => ""
+                <%= text_field 'Internalip' %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    %=l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
-    </p>
 
-    <p>
+        <div>
-    <span class="">
+            <%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
-    %=l 'hos_ETHERNET_ADDRESS', class => ""
+        </div>
-    </span>
+
-    <span class="">
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'hos_ETHERNET_ADDRESS' %>
+            </div>
+            <div class="col-auto">
                 % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
-    %= text_field 'Macaddress', class => ""
+                <%= text_field 'Macaddress' %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p><br>
+        <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-    %= hidden_field 'trt' => $hos_datas->{trt}
+        <div class="row g-3 align-items-center">
-    %= hidden_field 'Hostname' => $hos_datas->{hostname}
+            <div class="col-md-2">
-        %= hidden_field 'Name' => $hos_datas->{name}
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-        %= hidden_field 'Domain' => $hos_datas->{domain}
+            </div>
-    %= hidden_field 'Comment'=> $hos_datas->{comment}
+        </div>
-    %= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
-    %= hidden_field 'Externalip' => $hos_datas->{externalip}
 
-    %end
+        <%= hidden_field 'trt' => $hos_datas->{trt} %>
+        <%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
+        <%= hidden_field 'Name' => $hos_datas->{name} %>
+        <%= hidden_field 'Domain' => $hos_datas->{domain} %>
+        <%= hidden_field 'Comment'=> $hos_datas->{comment} %>
+        <%= hidden_field 'Hosttype'=> $hos_datas->{hosttype} %>
+        <%= hidden_field 'Externalip' => $hos_datas->{externalip} %>
+
+
+    </form>
 
 </div>

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

@@ -2,80 +2,91 @@
 
     % my $btn = l('NEXT');
 
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+    <form action="/smanager/hostentriesd" method="POST">
-    <p><h2>
+
         % if ( $hos_datas->{trt} eq "ADD" ) {
-    %=l 'hos_CREATE_TITLE'
+            <h2><%=l 'hos_CREATE_TITLE' %></h2>
         % } else {
-    %=l 'hos_MODIFY_TITLE'
+              <h2><%=l 'hos_MODIFY_TITLE' %></h2>
               % $btn = l('MODIFY');
          % }
-    </h2></p>
 
-    <p>
+        <div>
-    %=l 'hos_HOSTNAME_DESCRIPTION'
+            <%= l 'hos_HOSTNAME_DESCRIPTION' %>
-    </p>
+        </div>
-
+        <br>
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    %=l 'hos_HOSTNAME', class => ""
+                <%=l 'hos_HOSTNAME' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
             % if ( $hos_datas->{trt} eq "ADD" ) {
                 % param 'Name' => $hos_datas->{name} unless param 'Name';
-    %= text_field 'Name', class => ""
+                <%= text_field 'Name' %>
            % } else {
-        %= hidden_field 'Name' => $hos_datas->{name}
+               <%= hidden_field 'Name' => $hos_datas->{name} %>
-    %= $hos_datas->{name}, class => ""
+               <%= $hos_datas->{name} %>
            % }
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'DOMAIN', class => ""
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <%= l 'DOMAIN' %>
+            </div>
+
+            <div class="col-auto">
              % if ( $hos_datas->{trt} eq "ADD" ) {
                  % param 'Domain' => $hos_datas->{domain} unless param 'Domain';
-    %= select_field 'Domain', $c->domains_list(), class => ""
+                 <%= select_field 'Domain', $c->domains_list() %>
              % } else {
-        %= hidden_field 'Domain' => $hos_datas->{domain}
+                 <%= hidden_field 'Domain' => $hos_datas->{domain} %>
-    %= $hos_datas->{domain}, class => ""
+                 <%= $hos_datas->{domain} %>
              % }
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %= $c->l('COMMENT', '');
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <label for="inputHostComment" class="col-form-label"><%= $c->l('COMMENT', ''); %></label>
+            </div>
+            <div class="col-auto">
                 % param 'Comment' => $hos_datas->{comment} unless param 'Comment';
-    %= text_field 'Comment', class => ""
+                <input type="text" name="Comment" id="inputHostComment" class="form-control" aria-describedby="inputHostComment" value="<%= $hos_datas->{comment} %>">
-    </span>
+
-    </p>
+            </div>
-
+        </div>
-    <p>
+
-    <span class="">
+        <br>
-    %=l 'LOCATION', class => ""
+
-    </span>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
-    % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
+             <%=l 'LOCATION' %>
-    %= select_field 'Hosttype', $c->hosttype_list(), class => ""
+            </div>
-    </span>
+            <div class="col-auto">
-    </p>
+               % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
-
+               <%= select_field 'Hosttype', $c->hosttype_list(), class => "form-select"; %>
-    <p><br>
+            </div>
-    %= submit_button "$btn", class => ""
+        </div>
-    </p>
+
-
+        <br>
-    %= hidden_field 'trt' => $hos_datas->{trt}
+
-    %= hidden_field 'Hostname' => $hos_datas->{hostname}
+         <div class="row g-3 align-items-center">
-    %= hidden_field 'Internalip' => $hos_datas->{internalip}
+             <div class="col-md-2">
-    %= hidden_field 'Externalip' => $hos_datas->{externalip}
+                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
-    %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
+             </div>
-
+         </div>
-    %end
+
+         <%= hidden_field 'trt' => $hos_datas->{trt} %>
+         <%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
+         <%= hidden_field 'Internalip' => $hos_datas->{internalip} %>
+         <%= hidden_field 'Externalip' => $hos_datas->{externalip} %>
+         <%= hidden_field 'Macaddress' => $hos_datas->{macaddress} %>
+
+    </form>
 
 </div>

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

@@ -3,26 +3,27 @@
 
     %   my $btn = l('MODIFY');
 
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+    <form action="/smanager/hostentriesd" method="POST">
+    %#= form_for '/hostentriesd' => (method => 'POST') => begin
     
-    <p>
+        <div>
-    %=l 'hos_REMOTE_PAGE_DESCRIPTION'
+            <%= l 'hos_REMOTE_PAGE_DESCRIPTION' %>
-    </p>
+        </div>
     
-    <p>
+        <div>
-    <span class="">
+            <%= l 'IP_ADDRESS_OR_FQDN' %>
-    %=l 'IP_ADDRESS_OR_FQDN', class => ""
+        </div>
-    </span>
+    
-    <span class="">
+        <div>
         % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
-    %= text_field 'Externalip', class => ""
+            <%= text_field 'Externalip' %>
-    </span>
+        </div>
-    </p>
     
-
+       <div class="row g-3 align-items-center">
-    <p><br>
+           <div class="col-md-2">
-    %= submit_button "$btn", class => ""
+               <button type="submit" class="btn btn-primary"><%= $btn %></button>
-    </p>
+           </div>
+       </div>
     
         %= hidden_field 'trt' => $hos_datas->{trt}
         %= hidden_field 'Hostname' => $hos_datas->{hostname}
@@ -33,6 +34,7 @@
         %= hidden_field 'Internalip' => $hos_datas->{internalip}
         %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
     
-    %end
+    %#end
+    </form>
 
 </div>

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

@@ -1,22 +1,31 @@
 <div>
 
     %   my $btn = l('REMOVE');
-    %= form_for '/ibaysd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'iba_REMOVE_TITLE'
-    </h2>
-    <br>
-    %= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description}));
-    <br>
-    </p>
-    <p>
-    %= submit_button "$btn", class => ""
-    </p>
 
-        %= hidden_field 'trt' => $iba_datas->{trt}
+    <form action="/smanager/ibaysd" method="POST">
-        %= hidden_field 'ibay' => $iba_datas->{ibay}
 
-    % end
+        <br>
+
+        <div>
+            <h2><%=l 'iba_REMOVE_TITLE' %></h2>
+        <div>
+
+        <br>
+
+        <div>
+            <%= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description})); %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $iba_datas->{trt} %>
+        <%= hidden_field 'ibay' => $iba_datas->{ibay} %>
+    </form>
 
 </div>

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

@@ -3,39 +3,43 @@
 
     % my $btn = l('iba_ADD_IBAY');
 
-    %= form_for '/ibays' => (method => 'POST') => begin
+    <form action="/smanager/ibays" method="POST">
-
-    <p>
         <br>
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
-    </p>
+            <div class="col-md-2">
-    %= hidden_field 'trt' => 'ADD';
+                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => 'ADD'; %>
+    </form>
 
-    % end    
+    <br>
+    <div>
+        <%= l 'iba_FIRSTPAGE_DESC' %>
+    </div>
 
-    <p>
+    <br>
-    %=l 'iba_FIRSTPAGE_DESC'
+
-    <br><br>
+    <div>
-    </p>
+        <h2>Current List of i-bays - translation string required</h2>
+    </div>
+
+    <br>
 
     % my $numIbays = @$ibays;
     % if ($numIbays == 0) {
-        %=l 'iba_NO_IBAYS'
+        <%= l 'iba_NO_IBAYS' %>
     % } else {
+
          <table class="table table-bordered">
              <thead>
                  <tr>
-            <th class="">
+                     <th class="col-sm"><%= l 'NAME' %></th>
-            %=l 'NAME'
+                     <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-            </th>
+                     <th class="col-sm user-valign-center" colspan="3"><%= l 'ACTION' %></th>
-            <th class="">
-            %=l 'DESCRIPTION'
-            </th>
-            <th class="">
-                %=l 'ACTION'
-            </th>
                  </tr>
              </thead>
+
              <tbody>
              % foreach my $ibay (@$ibays)
              % {
@@ -46,9 +50,9 @@
              % qw(local-pw global-pw global-pw-remote);
 
                  <tr>
-            %= t td => (class => "") => $ibay->key
+                     <td><%= $ibay->key %>
-            %= t td => (class => "") => $ibay->prop('Name')
+                     <td><%= $ibay->prop('Name') %>
-            <td class="" style="min-width:15em">
+                     <td class="">
                          % my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
                          % if ($modifiable eq 'yes') {
                              %my $modify_text = l('MODIFY');  # Localized text
@@ -56,7 +60,7 @@
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %$actionModify = qq{
                              % <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
-                    %   <button type='button' class="" title='$modify_text' > 
+                             %   <button type='button' class="btn btn-primary" title='$modify_text' >
                              % $modify_text
                              %   </button>
                              % </a>
@@ -70,7 +74,7 @@
                              %if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
                                  %$actionResetPw = qq{
                                  % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                        %   <button type='button' class="" title="$password_text - currently unset" style = background:pink; >
+                                 %   <button type='button' class="btn btn-danger" title="$password_text - currently unset" >
                                  %       $password_text
                                  %   </button>
                                  % </a>
@@ -78,7 +82,7 @@
                              % } else {
                                  %$actionResetPw = qq{
                                  % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                        %   <button type='button' class="" title='$password_text' > 
+                                 %   <button type='button' class="btn btn-primary" title='$password_text' >
                                  %       $password_text
                                  %   </button>
                                  % </a>
@@ -93,21 +97,20 @@
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %$actionRemove = qq{
                              % <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                             %   <button type='button' class="btn btn-primary" title='$remove_text' >
                              %       $remove_text
                              %   </button>
                              % </a>
                              %};
                          % }
-                <%= $c->render_to_string(inline => $actionModify) %>
+                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                <%= $c->render_to_string(inline => $actionResetPw)%>
+                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw)%></td>
-                <%= $c->render_to_string(inline => $actionRemove) %>
+                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
                      </td>
                  </tr>
              % }
              </tbody>
          </table>
-    <%} %>
+    % }
-
 
 </div>

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

@@ -2,43 +2,60 @@
 
     %   my $btn = l('SAVE');
 
-    %= form_for '/ibaysd' => (method => 'POST') => begin
+    <form action="/smanager/ibaysd" method="POST">
-    <p>
-    <h2>
-    %=l 'PASSWORD_RESET'
-    </h2>
 
-    <br><br>
+        <br>
-    %=l 'iba_PASSWORD_DESC'
-    %= $iba_datas->{ibay}
-    </p>
 
-    <p>
+        <div>
-    <span class="">
+            <h2><%= l 'PASSWORD_RESET' %></h2>
-    %=l 'PASSWORD_NEW', class => ""
+        <div>
-    </span>
-    <span class="">
-    %= password_field 'newPass', class => "" , class=> 'sme-password'
-    </span>
-    </p>
 
-    <p>
+        <br>
-    <span class="">
-    %=l 'PASSWORD_VERIFY_NEW', class => ""
-    </span>
-    <span class="">
-    %= password_field 'newPassVerify', class => "", class=> 'sme-password'
-    </span>
-    </p>
-
-    <p>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
-
-    %= hidden_field 'trt' => $iba_datas->{trt}
-    %= hidden_field 'ibay' => $iba_datas->{ibay}
-    
-    % end    
 
+        <div>
+            <%= l 'iba_PASSWORD_DESC' %>&nbsp<%= $iba_datas->{ibay} %>
+        </div>
+
+        <br>
+
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <%= l 'PASSWORD_NEW' %>
+        </div>
+        <div class="col-auto">
+            <input name="newPass" id="password" type="password" class="form-control sme-password" placeholder="Password" autocomplete="on">
+        </div>
+        <div class="col-auto">
+            <span id="togglePassword" class="bi bi-eye"></span>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <%= l 'PASSWORD_VERIFY_NEW' %>
+        </div>
+        <div class="col-auto">
+            <input name="newPassVerify" id="passVerify" type="password" class="form-control sme-password" placeholder="Password" autocomplete="on">
+        </div>
+        <div class="col-auto">
+            <span id="togglePasswordVerify" class="bi bi-eye"></span>
+        </div>
+    </div>
+
+        <br><br>
+
+       <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $iba_datas->{trt} %>
+        <%= hidden_field 'ibay' => $iba_datas->{ibay} %>
+
+    </form>
+    <br>
 </div>

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

@@ -3,106 +3,119 @@
 
     % my $btn = l('ADD');
 
-    %= form_for '/ibaysd' => (method => 'POST') => begin
+    <form action="/smanager/ibaysd" method="POST">
-    <p>
-    <h2>
-    %=l 'iba_ADD_TITLE'
-    </h2>
-    <br>
-    %=l 'iba_NAME_FIELD_DESC'
-    </p>
 
-    <p>
+    <div>
-    <span class="">
+        <h2><%=l 'iba_ADD_TITLE' %></h2>
-    %=l 'iba_NAME_LABEL', class => ""
+    </div>
-    </span>
+
-    <span class="">
+    <br>
+
+    <%=l 'iba_NAME_FIELD_DESC'%>
+
+    <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputIbayLabel" class="col-form-label"><%= l 'iba_NAME_LABEL' %></label>
+            </div>
+
+            <div class="col-auto">
                 % if ( $iba_datas->{trt} eq 'ADD' ) {
                     % param 'ibay' => $iba_datas->{ibay} unless param 'ibay';
-        %= text_field 'ibay', class => ""
+                    <input type="text" name="ibay" id="inputIbay" class="form-control" aria-describedby="Ibay" value="<%= $iba_datas->{ibays} %>">
                 % } else {
                     % $btn = l('SAVE');
-        %= $iba_datas->{ibay}, class => ""
+                    <%= $iba_datas->{ibay} %>
                 % }
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'DESCRIPTION', class => ""
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <label for="inputIbayDesc" class="col-form-label"><%= l 'DESCRIPTION' %></label>
+            </div>
+            <div class="col-auto">
                 % param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc';
-    %= text_field 'ibayDesc', class => ""
+                <input type="text" name="ibayDesc" id="inputIbayDesc" class="form-control" aria-describedby="IbayDesc" value="<%= $iba_datas->{description} %>">
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'GROUP'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <%= l 'GROUP' %>
+            </div>
+            <div class="col-auto">
                 % param 'group' => $iba_datas->{group} unless param 'group';
-    %= select_field 'group' => $c->group_list_m(), class => ""
+                %= select_field 'group' => $c->group_list_m(), class => "form-select"
-    <br>
+            </div>
-    </span>
+        </div>
-    </p>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'iba_USER_ACCESS'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+               <%= 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 => ""
+                %= select_field 'userAccess' => $c->userAccess_list_m(), class => "form-select"
+            </div>
+        </div>
 
         <br>
-    </span>
-    </p>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2">
               %=l 'iba_PUBLIC_ACCESS'
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto">
                 % param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess';
-    %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => ""
+                %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => "form-select"
-    <br>
+            </div>
-    </span>
+        </div>
-    </p>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'iba_ALLOW_DYNAMIC_CONTENT'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <%=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 => ""
+                %= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select"
-    <br>
+            </div>
-    </span>
+        </div>
-    </p>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'iba_HTTPS_Only'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <%=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 => ""
+                %= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select"
-    <br>
+            </div>
-    </span>
+        </div>
-    </p>
 
-    <p>
         <br><br>
-    %= submit_button $btn, class => ""
-    </p>
 
-    %= hidden_field 'trt' => $iba_datas->{trt}
+        <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' => $iba_datas->{trt} %>
     % if ( $iba_datas->{trt} eq 'UPD' ) {
-            %= hidden_field 'ibay' => $iba_datas->{ibay}
+            <%= hidden_field 'ibay' => $iba_datas->{ibay} %>
     % }
 
-    % end
+    </form>
 
 </div>

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

@@ -18,59 +18,76 @@
     %} elsif (index($ret{ret},"SUCCESS") != -1) {
        <div class="">
            <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
         </div>
        %} else {
        <div class="">
            <h2> Operation Status Report - Error</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
         </div>
     %}
     <br />
     % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB->open();
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
 
    % if (config->{debug} == 1) {
-	<p>
+    <div>
-	%= dumper $c->current_route
+        <%= dumper $c->current_route %>
-	%= dumper $c->stash("ret")
+        <%= dumper $c->stash("ret") %>
-	</p>
+    </div>
     % }
 
-    %= form_for '/localnetworksb' => (method => 'POST') => begin
+
-		<h2>
+    <form action="/smanager/localnetworksb" method="POST">
-		%=l "ln_ADD_TITLE"
+        <div>
-		</h2>
+            <h2><%=l "ln_ADD_TITLE" %></h2>
-			<p>
+        </div>
-			%= $c->render_to_string(inline => l('ln_ADD_DESC'));
-			</p>
         <br>
-			<span class="">
+        <div>
-				%=l "NETWORK"
+            <%= $c->render_to_string(inline => l('ln_ADD_DESC')); %>
-			</span>
+        </div>
-			<span class="">
+
-				%=text_field  'networkAddress'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "ln_SUBNET_MASK"
-			</span>
-			<span class="">
-				%=text_field 'networkMask'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "ROUTER"
-			</span>
-			<span class="">
-				%=text_field 'networkRouter'
-			</span>
-			<br><br>
-			<p>
         <br>
-			%= submit_button "$btn", class => ""
+
-			</p>
+        <div class="row g-3 align-items-center">
-	%end
+            <div class="col-md-1">
+              <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" >
+            </div>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>
 

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

@@ -6,60 +6,83 @@
     % my $router = $ln_datas->{router};
 
    % if (config->{debug} == 1) {
-	<p>
+    <div>
-	%= dumper $c->current_route
+        <%= dumper $c->current_route %>
-	%= dumper $c->stash("ret")
+        <%= dumper $c->stash("ret") %>
-    %= dumper %$ln_datas
+        <%= dumper %$ln_datas %>
-    %= dumper $deletehosts
+        <%= dumper $deletehosts %>
-	</p>
+    </div>
     % }
 
-    %= form_for '/localnetworkse' => (method => 'POST') => begin
+    <form action="/smanager/localnetworkse" method="POST">
-		<h2>
+
-		%=l "ln_REMOVE_TITLE"
+        <div>
-		</h2>
+            <h2><%=l "ln_REMOVE_TITLE" %></h2>
-			<p>
+        </div>
-			%=l "ln_REMOVE_DESC"
+
-			</p>
+        <div>
+            <%=l "ln_REMOVE_DESC" %>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" value="<%= $localnetwork %>" >
+            </div>
+        </div>
+
         <br>
-			<span class="">
+
-				%=l "NETWORK"
+        <div class="row g-3 align-items-center">
-			</span>
+            <div class="col-md-1">
-			<span class="">
+              <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
-				%=$localnetwork
+            </div>
-			</span>
+            <div class="col-auto">
-			<br><br>
+              <input disabled type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" value="<%= $subnet %>" >
-			<span class="">
+            </div>
-				%=l "ln_SUBNET_MASK"
+        </div>
-			</span>
+
-			<span class="">
+        <br>
-				%= $subnet
+
-			</span>
+        <div class="row g-3 align-items-center">
-			<br><br>
+            <div class="col-md-1">
-			<span class="">
+              <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
-				%=l "ROUTER"
+            </div>
-			</span>
+            <div class="col-auto">
-			<span class="">
+              <input disabled type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" value="<%= $router %>">
-				%= $router
+            </div>
-			</span>
+        </div>
-			<br><br>
+
+        <br>
+
         % if ($deletehosts) {
         <br>
-			%=$c->l("ln_REMOVE_HOSTS_DESC")
+
+        <b>tell me if you find this!</b>
+
+        <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
         <br>
         <span class="">
-				%= $c->l("ln_REMOVE_HOSTS_LABEL")
+            <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
         </span>
         <span class="">
-				%=check_box deletehost=>1, checked=>1
+            <%= check_box deletehost=>1, checked=>1 %>
         </span>
         <br><br>
         % }
-			%= hidden_field localnetwork=>$localnetwork
+
-			<p>
+        <div class="row g-3 align-items-center">
-			<br>
+            <div class="col-md-2">
-			%= submit_button "$btn", class => ""
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-			</p>
+            </div>
-	%end
+        </div>
+
+        <%= hidden_field localnetwork=>$localnetwork %>
+
+    </form>
 
 </div>

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

@@ -1,90 +1,82 @@
 <div>
-    % my $btn = l('ln_LOCALNETWORK_ADD');
+
-    %= form_for '/localnetworksa' => (method => 'POST') => begin
+    <form action="/smanager/localnetworksa" method="POST">
+
+        <br>
 
         % my $retref = $c->stash("ret");
         % my %ret;
         % unless (length($retref)) {%ret = (ret=>"");}
         % else {%ret = %$retref;}
 
-    % if (config->{debug} == 1) {
+        <!-- So at this point the next section is only relevant it ret is not defined -->
-	<p>
-		%= dumper "Ret:".$ret{ret};
-	</p>	
-	%}
 
+        %# my $element_count = scalar(@ret);
+
+        %# if (length $element_count == 0) {
             % my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
+            % my $var1 = $vars[0];
-	% my $var2 = @vars[1];
+            % my $var2 = $vars[1];
-	% my $var3 = @vars[2];
+            % my $var3 = $vars[2];
-	% my $var4 = @vars[3];
+            % my $var4 = $vars[3];
-	% my $var5 = @vars[4];
+            % my $var5 = $vars[4];
-	% my $var6 = @vars[5];
+            % my $var6 = $vars[5];
-	% my $var7 = @vars[6];
+            % my $var7 = $vars[6];
-
+        %# }
 
         %if ($ret{ret} eq "") {
-		%=l "ln_FIRSTPAGE_DESC"
+            <%= l "ln_FIRSTPAGE_DESC" %>
         % } elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class="">
+            <br>
+            <div>
                 <h2> Operation Status Report</h2>
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
+                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
             </div>
         % } else {
-	   <div class="">
+            <div>
                 <h2> Operation Status Report - Error</h2>
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
+                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
             </div>
         % }
 
-	<p>
+        <br><br>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
 
-    % end    
+        % 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>
 
         <br>
+
         % my $numlocalnetworks = @$localnetworks;
         % if ($numlocalnetworks == 0) {
-        %=l 'ln_LOCAL_NETWORK_NONE'
+            <%= l 'ln_LOCAL_NETWORK_NONE' %>
         % } else {
             <br>
             <table class="table table-bordered">
                 <thead>
                     <tr>
-			<th class="">
+                        <th><%= l 'NETWORK' %></th>
-				%=l 'NETWORK'
+                        <th><%= l 'ln_SUBNET_MASK' %></th>
-			</th>
+                        <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
-			<th class="">
+                        <th><%= l 'ROUTER' %></th>
-				%=l 'ln_SUBNET_MASK'
+                        <th><%= l 'ACTION' %></th>
-			</th>
-
-			<th class="">
-				%=l 'ln_NUMBER_OF_HOSTS'
-			</th>
-
-			<th class="">
-				%=l 'ROUTER'
-			</th>
-
-			<th class="">
-				%=l 'ACTION'
-			</th>
                     </tr>
                 </thead>
                 <tbody>
-		%    foreach my $localnetwork (@$localnetworks )
+                    % 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>
+                            <tr class="align-middle">
-					%= t td => (class => "") => $localnetwork->key
+                                <td><%= $localnetwork->key %></td>
-					%= t td => (class => "") => $localnetwork->prop('Mask')
+                                <td><%= $localnetwork->prop('Mask') %></td>
-					%= t td => (class => "") => $num_hosts
+                                <td><%= $num_hosts %></td>
-					%= t td => (class => "") => $localnetwork->prop('Router')
+                                <td><%= $localnetwork->prop('Router') %></td>
                                 % my $actionRemove = '&nbsp;';
                                 % if ($removable eq "yes") {
                                     %my $remove_text = l('REMOVE');  # Localized text
@@ -92,17 +84,19 @@
                                     %my $csrf_token = "TOKEN";  # CSRF token for security
                                     %$actionRemove = qq{
                                     % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
-						%	<button type='button' class="" title='$remove_text' >
+                                    %   <button type='button' class="btn btn-primary" title='$remove_text' >
                                     %       $remove_text
                                     %   </button>
                                     % </a>
                                     %};
                                 % }
-					<td class=""><%= $c->render_to_string(inline => $actionRemove) %></td>
+                                <td><%= $c->render_to_string(inline => $actionRemove) %></td>
                             </tr>
                         % }
                 </tbody>
             </table>
-		%= hidden_field 'trt' => $ln_datas->{trt}
+            <%= hidden_field 'trt' => $ln_datas->{trt} %>
         % }
+
+    </form>
 </div>

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

@@ -1,51 +1,61 @@
 <div>
 
+    <h2><%=l 'prt_CREATE_NEW_PRINTER' %></h2>
+
+    <br>
+
+    <form action="/smanager/printers2" method="POST">
+
+        <br>
+
+        <div>
+            <%= l 'prt_CREATE_NEW_DESC' %>
+        </div>
+
+        <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputPrinterName" class="col-form-label"><%= l 'prt_PRINTER_NAME' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Name" id="inputPrinterName" class="form-control" aria-describedby="Printer Name">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputPrinterDesc" class="col-form-label"><%= l 'DESCRIPTION_BRIEF' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Description" id="inputPrinterDesc" class="form-control" aria-describedby="Printer Description">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l 'LOCATION'%>
+                </div>
+                <div class="col-auto">
+                    <%= select_field 'Location' => $c->printerLocation_list(), class => "form-select" %>
+                </div>
+            </div>
+
+        <br><br>
+
+        <%= hidden_field 'trt' => $prt_datas->{trt} %>
+
         % my $btn = l('ADD');
 
-    %= form_for '/printers2' => (method => 'POST') => begin
+        <div class="row g-3 align-items-center">
-	<p>
+            <div class="col-md-1">
-	<h2>
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-	%=l 'prt_CREATE_NEW_PRINTER'
+            </div>
-	</h2>
+        </div>
-	<br>
+    </form>
-	%=l 'prt_CREATE_NEW_DESC'
-	</p>
-	<br>
-
-	<p>
-	<span class="">
-	%=l 'prt_PRINTER_NAME', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Name', class => ""
-	</span>
-	</p>
-
-	<p>
-	<span class="">
-	%=l 'DESCRIPTION_BRIEF', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Description', class => ""
-	</span>
-	</p>
-
-	<p>
-	<span class="">
-	%=l 'LOCATION', class => ""
-	</span>
-	<span class="">
-	%= select_field 'Location' => $c->printerLocation_list(), class => ""
-	</span>
-	</p>
-
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
-
-	%= hidden_field 'trt' => $prt_datas->{trt}
-	
-    % end    
 
 </div>

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

@@ -1,30 +1,38 @@
 <div>
-    % 	my $btn = l('REMOVE');
-    %= form_for '/printers2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'prt_REMOVE_PRINTER'
-	</h2>
-	<br><br>
 
-	<%=l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%>
+    <h2><%= l 'prt_REMOVE_PRINTER' %></h2>
-	(<%=$prt_datas->{description}%>)
+
+    <form action="/smanager/printers2" method="POST">
+
     <br>
 
-	%=l 'prt_SPOOL_FILE_WARNING'
+    <div>
+        <%= l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%> (<%=$prt_datas->{description}%>)
+    </div>
+
     <br>
 
-	%=l 'prt_ARE_YOU_SURE'
+    <div class="text-danger">
-	</p>
+       <%= l 'prt_SPOOL_FILE_WARNING' %>
+    </div>
 
-	<p>
     <br>
-	%= submit_button "$btn", class => ""
-	</p>
 
+    <div>
+        <%= l 'prt_ARE_YOU_SURE' %>
+    </div>
+
+    <br>
         %= hidden_field 'trt' => $prt_datas->{trt}
         %= hidden_field 'printer' => $prt_datas->{printer}
 
-    % end    
+        % my $btn = l('REMOVE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

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

@@ -1,70 +1,60 @@
 <div>
 
-    % my $btn = l('prt_INITIAL_BTN');
-
-    %= form_for '/printers' => (method => 'POST') => begin
-
-        %= hidden_field 'trt' => 'ADD'
-
-	<p>
     <br>
-	%= submit_button "$btn", class => ""
-	</p>
-   % end
 
-	<p>
+    <form action="/smanager/printers" method="POST">
-	<h2>
+
-	%=l 'prt_CURRENT_LIST'
+        % my $btn = l('prt_INITIAL_BTN');
-	</h2>
+        <%= hidden_field 'trt' => 'ADD' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
+
+    <br>
+
+    <h2><%= l 'prt_CURRENT_LIST' %></h2>
     <br><br>
+
     % my $numPrinters = @$printerDrivers;
     % if ($numPrinters == 0){
-        %=l 'prt_NO_PRINTERS'
+          <%= l 'prt_NO_PRINTERS' %>
     % } else {
             <table class="table table-bordered">
                <thead>
                    <tr>
-    	    <th class="">
+                           <th><%= l 'NAME' %></th>
-    	    %=l 'NAME'
+                           <th><%= l 'DESCRIPTION' %></th>
-    	    </th>
+                           <th><%= l 'LOCATION' %></th>
-    	    <th class="">
+                           <th><%= l 'prt_REMOTE_ADDRESS' %></th>
-    	    %=l 'DESCRIPTION'
+                           <th><%= l 'prt_REMOTE_NAME' %></th>
-    	    </th>
+                           <th><%= l 'ACTION' %></th>
-    	    <th class="">
-    	    %=l 'LOCATION'
-    	    </th>
-    	    <th class="">
-    	    %=l 'prt_REMOTE_ADDRESS'
-    	    </th>
-    	    <th class="">
-    	    %=l 'prt_REMOTE_NAME'
-    	    </th>
-    	    <th class="">
-    	    %=l 'ACTION'
-    	    </th>
                    </tr>
                    </thead>
                 <tbody>
-    %    foreach my $printer (@$printerDrivers)
+                % foreach my $printer (@$printerDrivers) {
-    %    {
                 %     my $address = ($printer->prop('Location') eq 'remote')
                 %     ? $printer->prop('Address') : 'N/A';
                 %     my $remoteName = ($printer->prop('Location') eq 'remote')
                 %     ? $printer->prop('RemoteName') : 'N/A';
                 %     $remoteName = 'raw' unless ($remoteName);
-        <tr>
+
-            %= t td => (class => "") => $printer->key
+                    <tr class="align-middle">
-            %= t td => (class => "") => $printer->prop('Description')
+                        <td><%= $printer->key %></td>
-            %= t td => (class => "") => $printer->prop('Location')
+                        <td><%= $printer->prop('Description') %></td>
-            %= t td => (class => "") => $address
+                        <td><%= $printer->prop('Location') %></td>
-            %= t td => (class => "") => $remoteName
+                        <td><%= $address %></td>
-			<td class="">
+                        <td><%= $remoteName %></td>
+                        <td>
                             % my $remove_text = l('REMOVE');  # Localized text
                             % my $csrf_token = "TOKEN";  # CSRF token for security
                             % my $printer_name = $printer->key;
                             % my $actionRemove = qq{
                             % <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
-				%	<button type='button' class="" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
                             %   $remove_text
                             %   </button>
                             % </a>
@@ -75,8 +65,8 @@
                 % }
                 </tbody>
             </table>
-	<%} %>
+    % }
-	</p>
+
 
 
 </div>

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

@@ -1,41 +1,48 @@
 <div>
 
     % my $btn = l('ADD');
-
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'pse_TITLE_CREATE'
-    </h2>
     <br>
-    %= $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES'));
+    <h2><%= l 'pse_TITLE_CREATE' %></h2>
-    </p>
+    <br>
+    <form action="/smanager/pseudonyms2" method="POST">
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-auto">
-    %=l 'pse_PSEUDONYM_NAME', class => ""
+                <%=  $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES')); %>
-    </span>
+                <br>
-    <span class="">
+            </div>
-    %= text_field 'Pseudonym', class => ""
+            <br>
-    </span>
+            <div class="col-md-2">
-    </p>
+              <label for="inputPseudonymName" class="col-form-label"><%= l 'pse_PSEUDONYM_NAME' %></label>
+            </div>
 
-    <p>
+            <div class="col-auto">
-    <span class="">
+                <input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="PseudonymDesc"  >
-    %=l 'pse_SELECT_ACCOUNT', class => ""
+            </div>
-    </span>
+        </div>
-    <span class="">
-    %= select_field 'Account' => $c->existing_accounts_list(), class => ""
-    </span>
-    </p>
 
-    <p>
         <br><br>
-    %= submit_button "$btn", class => ""
+
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=l 'pse_SELECT_ACCOUNT' %>
+            </div>
+
+            <div class="col-auto">
+                <%= select_field 'Account' => $c->existing_accounts_list(), class => "form-select" %>
+            </div>
+        </div>
+
+            <br><br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                </div>
+            </div>
 
             %= hidden_field 'trt' => $pse_datas->{trt}
 
-    % end    
+    </form>
 
 </div>

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

@@ -1,25 +1,24 @@
 <div>
 
     % my $btn = l('REMOVE');
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'pse_REMOVE_PSEUDONYM'
-    </h2>
 
-    <p>
+    <form action="/smanager/pseudonyms2" method="POST">
-    %= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym}));
+        <h2><%= l 'pse_REMOVE_PSEUDONYM' %></h2>
 
-    </p>
+        <!--This is the old test that needs fixing in the language files-->
 
-    <p>
         <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-        %= hidden_field 'trt' => $pse_datas->{trt}
+        <%= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym})); %>
-        %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
-
-    % end    
 
+        <br><br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $pse_datas->{trt} %>
+        <%= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} %>
+    </form>
 </div>

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

@@ -2,46 +2,35 @@
 
     % my $btn = l('pse_CLICK_TO_CREATE');
 
-    %= $c->render_to_string(inline => l('pse_DESCRIPTION'));
+    <form action="/smanager/pseudonyms" method="POST">
+        <%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => 'ADD' %>
+    </form>
 
-    %= form_for '/pseudonyms' => (method => 'POST') => begin
+    <br>
-
+    <h2><%= l 'pse_CURRENT_PSEUDONYMS' %></h2>
-        %= hidden_field 'trt' => 'ADD'
+    <br>
-
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
-    
-    % end    
-
-
-    <p><h2>
-    %=l 'pse_CURRENT_PSEUDONYMS'
-    </h2><br>
     % my $numPseudonyms = @$pseudonyms;
     % if ($numPseudonyms == 0) {
-        %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
+        <%= l 'pse_ACCOUNT_PSEUDONYM_NONE' %>
     % } else {
-    <table class="table table-bordered">
+    <table class="table table-bordered user-table-max-width">
         <thead>
             <tr>
-            <th class="">
+                    <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
-            %=l 'pse_PSEUDONYM'
+                    <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
-            </th>
+                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
-            <th class="">
-            %=l 'pse_USER_OR_GROUP'
-            </th>
-            <th class="">
-            %=l 'ACTION'
-            </th>
-
                 <!-- <th class="" style="display: normal;"></th> -->
             </tr>
         </thead>
         <tbody>
 
-    %    foreach my $pseudonym ( @$pseudonyms )
+            % foreach my $pseudonym ( @$pseudonyms ) {
-    %    {
             % my $modifiable = $pseudonym->prop('Changeable') || 'yes';
             % my $removable = $pseudonym->prop('Removable') || 'yes';
 
@@ -54,10 +43,9 @@
             % if (defined $visible && $visible eq "internal");
 
                 <tr>
-            %= t td => (class => "") => $pseudonym->key
+                    <td><%= $pseudonym->key%></td>
-            %= t td => (class => "") => $account
+                    <td><%= $account%></td>
 
-            <td class="">
                         % my ($actionModify, $actionRemove) = '&nbsp;';
                         % if ($modifiable eq 'yes') {
                             %my $modify_text = l('MODIFY');  # Localized text
@@ -65,7 +53,7 @@
                             %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                             %$actionModify = qq{
                             % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
-                    %   <button type='button' class="" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
                             %   $modify_text
                             %   </button>
                             % </a>
@@ -78,21 +66,20 @@
                             %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                             %$actionRemove = qq{
                             % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
                             %   $remove_text
                             %   </button>
                             % </a>
                             %};
                         % }
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
 
-            </td>
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+
                 </tr>
             % }
             </tbody>
         </table>
-    <%} %>
+    % }
-    </p>
-
 
 </div>

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

@@ -2,55 +2,73 @@
 
     % my $btn = l('SAVE');
 
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
+    <form action="/smanager/pseudonyms2" method="POST">
-    <p>
+
-    <h2>
-    %=l 'pse_MODIFY_PSEUDONYM'
-    </h2>
         <br>
-    %=l 'pse_DESC_PSEUDONYM_NAME'
-    </p>
 
-    <p>
+        <div>
-    <span class="">
+            <h2><%=l 'pse_MODIFY_PSEUDONYM' %></h2>
-    %=l 'pse_PSEUDONYM_NAME', class => ""
+        </div>
-    </span>
-    <span class="">
-    %= $pse_datas->{pseudonym}, class => ""
-    </span>
-    </p>
 
-    <p>
+        <br>
-    <span class="">
+
-    %=l 'pse_SELECT_ACCOUNT', class => ""
+        <div>
-    </span>
+            <%=l 'pse_DESC_PSEUDONYM_NAME' %>
-    <span class="">
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <%=l 'pse_PSEUDONYM_NAME' %>
+            </div>
+
+            <div class="col-auto">
+            <%= $pse_datas->{pseudonym} %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+               <%=l 'pse_SELECT_ACCOUNT' %>
+            </div>
+
+            <div class="col-auto">
                 % param 'Account' => $pse_datas->{account} unless param 'Account';
-    %= select_field 'Account' => $c->existing_accounts_list(), class => ""
+                <%= select_field 'Account' => $c->existing_accounts_list(); %>
-    </span>
+            </div>
-    </p>
+        </div>
+
 
         % if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) {
 
-    <p>
+            <br>
-    <span class="">
+            <div class="row g-3 align-items-center">
-    %=l 'pse_SELECT_INTERNAL', class => ""
+                <div class="col-md-2">
-    </span>
+                <%= l 'pse_SELECT_INTERNAL' %>
-    <span class="">
+                </div>
+
+                <div class="col-auto">
                     % param 'Internal' => $pse_datas->{internal} unless param 'Internal';
-    %= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ], class => ""
+                    <%= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ] %>
-    </span>
+                </div>
-    </p>
+            </div>
 
         % }
 
-    <p>
+        <br><br>
-    %= submit_button "$btn", class => ""
+
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
         %= hidden_field 'trt' => $pse_datas->{trt}
         %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
 
-    %end
+    </form>
 
 </div>

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

@@ -1,17 +1,27 @@
 <div>
 
-    <p>
     % my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC'));
-    %= $modul
 
-    <h3>
+    <%= $modul %>
-    %=l 'quo_CURRENT_USAGE_AND_SETTINGS'
+
-    </h3>
+    % 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'
+        <div>
+            <%= l 'ACCOUNT_USER_NONE' %>
+        </div>
     % } else {
 
         % my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
@@ -21,64 +31,60 @@
         <table class="table table-bordered">
             <thead>
                 <tr>
-            <th class="">
+                    <th class="col-sm"><%= l 'ACCOUNT' %></th>
-            %=l 'ACCOUNT'
+                    <th class="col-sm"><%= l 'USER_NAME' %></th>
-            </th>
+                    <th class="col-sm"><%= $limit %></th>
-            <th class="">
+                    <th class="col-sm"><%= $absolute %></th>
-            %=l 'USER_NAME'
+                    <th class="col-sm"><%= $current %></th>
-            </th>
+                    <th class="col-sm user-valign-center"><%= l 'ACTION' %></th>
-            <th class="">
-            %= $limit
-            </th>
-            <th class="">
-            %= $absolute
-            </th>
-            <th class="">
-            %= $current
-            </th>
-            <th class="">
-            %=l 'ACTION'
-            </th>
                 </tr>
             </thead>
+
             <tbody>
 
-    %    foreach my $user (@$userAccounts)
+            % foreach my $user (@$userAccounts) {
-    %    {
+
             % my $uid = getpwnam($user->key);
+
+            % if (config->{debug} == 1) {
+                UID <%= l 'quo_COULD_NOT_GET_UID' %> <%= dumper $user->key %><br>
+            % }
+
+            <br>
             % unless ($uid) {
-    %       warn($self->localise('COULD_NOT_GET_UID'),$user->key);
+            %     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>
-            %= t td => (class => "") => $user->key
+                    <td><%= $user->key %></td>
-            %= t td => (class => "") => $name
+                    <td><%= $name %></td>
-            %= t td => (class => "") => sprintf("%.2f", $bs / 1024 )
+                    <td><%= sprintf("%.2f", $bs / 1024 ) %></td>
-            %= t td => (class => "") => sprintf("%.2f", $bh / 1024 )
+                    <td><%= sprintf("%.2f", $bh / 1024 ) %></td>
-            %= t td => (class => "") => sprintf("%.2f", $bc / 1024 )
+                    <td><%= sprintf("%.2f", $bc / 1024 ) %></td>
-            <td class="">
+
                     % my $modify_text = l('MODIFY');  # Localized text
                     % my $csrf_token = "TOKEN";  # CSRF token for security
                     % my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
                     % my $actionModify = qq{
                     % <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
-                %   <button type='button' class="" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
                     %       $modify_text
                     %   </button>
                     % </a>
                     %};
-                <%= $c->render_to_string(inline => $actionModify) %>
+
-            </td>
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
                 </tr>
             %    }
             </tbody>
         </table>
-    <%} %>
-    </p>
 
-        %= hidden_field 'trt' => $quo_datas->{trt}
+    % }
+
+    <%= hidden_field 'trt' => $quo_datas->{trt} %>
 
 </div>

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

@@ -2,12 +2,9 @@
 
     % my $btn = l('SAVE');
 
-    %= form_for '/quota2' => (method => 'POST') => begin
+    <form action="/smanager/quota2" method="POST">
-    <p>
+
-    <h2>
+    <h2><%= l 'quo_MODIFY_USER_TITLE' %></h2>
-    %=l 'quo_MODIFY_USER_TITLE'
-    </h2>
-    </p>
 
     % my $userid = $quo_datas->{user};
     % my $user = $quo_datas->{userRec};
@@ -30,58 +27,71 @@
     % my $dev = Quota::getqcarg('/home/e-smith/files');
     % my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
 
-    <p>
+    <div>
-    %=l 'quo_USER' 
+        <%= l 'quo_USER' %>&nbsp<%= "$name (\"$userid\")" %>
-    %= "$name (\"$userid\")" 
+        &nbsp
-    %=l 'quo_CURRENTLY_HAS' 
+        <%= l 'quo_CURRENTLY_HAS' %>&nbsp<%= $ic %>
-    %= $ic 
+        <%= l 'quo_FILES' %>
-        %=l 'quo_FILES' 
+        &nbsp
-    %=l 'quo_OCCUPYING' 
+        <%= l 'quo_OCCUPYING' %>&nbsp<%= $c->toMB($bc) %>&nbsp<%= l 'quo_MEGABYTES' %>
-    %= $c->toMB($bc)
+    </div>
-    %=l 'quo_MEGABYTES'
+    <br>
-    </p>
 
-    <p>
+    <div>
-    %=l 'quo_INSTRUCTIONS'
+        <%= l 'quo_INSTRUCTIONS' %>
-    </p>
+    </div>
+    <br>
 
-    <p>
+    <div class="row g-3 align-items-center">
-    <span class="">
+        <div class="col-md-2">
-    %=l 'quo_USER', class => ""
+            <%= l 'quo_USER' %>
-    </span>
+        </div>
-    <span class="">
+        <div class="col-auto">
-    %= $name, class => ""
+            <%= $name %>
-    </span>
+        </div>
-    </p>
+    </div>
+
+    <br>
 
-    <p>
-    <span class="">
-    %=l 'quo_LIMIT_WITH_GRACE', class => ""
-    </span>
-    <span class="">
     % param 'Soft' => $quo_datas->{softlim} unless param 'Soft';
-    %= text_field 'Soft', class => ""
-    </span>
-    </p>
 
-    <p>
+    <div class="row g-3 align-items-center">
-    <span class="">
+        <div class="col-md-2">
-    %=l 'quo_ABS_LIMIT', class => ""
+            <label for="inputQuotaDesc" class="col-form-label"><%=l 'quo_LIMIT_WITH_GRACE' %></label>
-    </span>
+        </div>
-    <span class="">
+        <div class="col-auto">
+            <!-- text_field 'Soft' -->
+            <input type="text" name="Soft" id="inputQuotaDesc" class="form-control" aria-describedby="QuotaDesc" value="<%= $quo_datas->{softlim} %>">
+        </div>
+    </div>
+
+    <br>
+
     % param 'Hard' => $quo_datas->{hardlim} unless param 'Hard';
-    %= text_field 'Hard', class => ""
-    </span>
-    </p>
 
-    <p>
+    <div class="row g-3 align-items-center">
-    <br><br>
+        <div class="col-md-2">
-    %= submit_button "$btn", class => ""
+            <label for="inputQuotaABS" class="col-form-label"><%= l 'quo_ABS_LIMIT' %></label>
-    </p>
+        </div>
+        <div class="col-auto">
+            <!-- text_field 'Hard' -->
+            <input type="text" name="Hard" id="inputQuotaABS" class="form-control" aria-describedby="QuotaABS" value="<%= $quo_datas->{hardlim} %>">
 
-    %= hidden_field 'trt' => $quo_datas->{trt}
+
-        %= hidden_field 'user' => $quo_datas->{user}
+        </div>
-    
+    </div>
-    % end    
+
+    <br><br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
+
+    <%= hidden_field 'trt' => $quo_datas->{trt} %>
+    <%= hidden_field 'user' => $quo_datas->{user} %>
+
+    </form>
 
 </div>

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

@@ -2,8 +2,8 @@
     <table class="table table-bordered">
         <thead>
             <tr>
-            <th><%= l 'rvw_NETWORKING_PARAMS' %></th>
+            <th class="col-md-2"><%= l 'rvw_NETWORKING_PARAMS' %></th>
-            <th>&nbsp</th>
+            <th class="col-auto">&nbsp</th>
             </tr>
         </thead>
         <tbody>
@@ -47,8 +47,8 @@
     <table class="table table-bordered">
         <thead>
             <tr>
-            <th><%= l 'rvw_SERVER_NAMES' %></th>
+            <th class="col-md-2"><%= l 'rvw_SERVER_NAMES' %></th>
-            <th>&nbsp</th>
+            <th class="col-auto">&nbsp</th>
             </tr>
         </thead>
         <tbody>
@@ -82,8 +82,8 @@
     <table class="table table-bordered">
         <thead>
             <tr>
-            <th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
+            <th class="col-md-2"><%= l 'rvw_DOMAIN_INFORMATION' %></th>
-            <th>&nbsp</th>
+            <th class="col-auto">&nbsp</th>
             </tr>
         </thead>
         <tbody>

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

@@ -25,10 +25,8 @@
 <form action="<%= $formUrl %>" method="POST" >
   <div class="row g-3 align-items-center">
       <div class="col-auto">
-        <label class="visually-hidden" for="inlineFormSelectPref">Preference</label>
+        <!--<label class="visually-hidden" for="inlineFormSelectPref">Preference</label> -->
-
+        %= select_field 'Theme' => $c->theme_list(), class => "form-select", id => "Preference"
-        %= select_field 'Theme' => $c->theme_list(), class => "form-select"
-        
         %= hidden_field 'From' => $c->tx->req->url
       </div>
 

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

@@ -2,7 +2,8 @@
 
     % my $btn = l('REMOVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+    <form action="/smanager/useraccountsd" method="POST">
+
         <div>
             <h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
         </div>
@@ -39,14 +40,15 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
             </div>
         </div>
 
-    %= hidden_field 'trt' => $usr_datas->{trt}
+        <%= hidden_field 'trt' => $usr_datas->{trt} %>
-    %= hidden_field 'user' => $usr_datas->{user}
+        <%= hidden_field 'user' => $usr_datas->{user} %>
-    %= hidden_field 'name' => $usr_datas->{name}
+        <%= hidden_field 'name' => $usr_datas->{name} %>
+
+    </form>
 
-    % end    
 
 </div>

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

@@ -1,48 +1,33 @@
 <div>
 
-
     % my $btn = l('usr_ADD_USER');
 
-    %= form_for '/useraccounts' => (method => 'POST') => begin
+    <form action="/smanager/useraccounts" method="POST">
-
         <br>
-
         <div>
             <button type="submit" class="btn btn-primary"><%= $btn %> </button>
         </div>
-    
+    </form>
-    % end    
 
     <br>
-    %= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
+    <%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) %>
     <br>
 
-    
     %#= dumper @$users
 
     % my $numUsers = @$users;
     % if ($numUsers == 0) {
-        %=l 'usr_NO_USER_ACCOUNTS'
+        <%=l 'usr_NO_USER_ACCOUNTS' %>
     % } else {
     <div class="table-responsive">
         <table class="table table-bordered">
             <thead>
                 <tr>
-            <th>
+                    <th><%=l 'ACCOUNT' %></th>
-                %=l 'ACCOUNT'
+                    <th><%=l 'USER_NAME' %></th>
-            </th>
+                    <th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
-            <th>
+                    <th><%=l 'usr_FORWARDING_ADDRESS' %></th>
-                %=l 'USER_NAME'
+                    <th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
-            </th>
-            <th>
-                %=l 'usr_VPN_CLIENT_ACCESS'
-            </th>
-            <th>
-                %=l 'usr_FORWARDING_ADDRESS'
-            </th>
-            <th class="user-valign-center" colspan="5">
-                %=l 'ACTION'
-            </th>
                 </tr>
             </thead>
             <tbody>
@@ -59,19 +44,22 @@
             % my $vpnaccess = $user->prop('VPNClientAccess') || 'no';
             % $vpnaccess = $vpnaccess eq 'yes' ? $c->l('YES') : $c->l('NO');
             % my $password_set = $user->prop('PasswordSet');
+            % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+            % my $csrf_token = "TOKEN";  # CSRF token for security
+            % my $modify_text = l('MODIFY');  # Localized text
+            % my $remove_text = l('REMOVE');  # Localized text
+            % my $password_text = l("PASSWORD_RESET");
+            % my $lock_text = l('usr_LOCK');  # Localized text
+            % my $roundcube_text = l('Webmail');  # Localized text
+            % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
+            % my $thisdomain = $c->req->url->to_abs->host;
 
-             <tr>
+                <tr class="align-middle">
                     <td><%= $username %></td>
                     <td><%= $first %>&nbsp<%=$last %></td>
                     <td><%= $vpnaccess %></td>
                     <td><%= $fwd %></td>
 
-                 % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
-                 % my $modify_text = l('MODIFY');  # Localized text
-                 % my $csrf_token = "TOKEN";  # CSRF token for security
-                 % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-                 % my $password_text = l("PASSWORD_RESET");
-
                     % if ($useraccounts_user_name eq 'admin')  {
                         %$actionModify = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
@@ -99,18 +87,26 @@
 
 
                     % if ($password_set ne 'yes') {
-                     %$actionLock = l('ACCOUNT_LOCKED');
+
+                       <!-- Needs a fix here -->
+                       %#$actionLock = l('ACCOUNT_LOCKED');
+                       <!-- Sets BOTH columns - possibly leave out Reset Password here?-->
+                       %$actionLock = qq{
+                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
+                                %   <button type='button' class="btn btn-danger" title="$password_text - currently unset">
+                                %       Unlock
+                                %   </button>
+                            %</a>
+                            %};
                        %$actionResetPw = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                             %   <button type='button' class="btn btn-primary" title="$password_text - currently unset" style = background:pink; >
+                                %   <button type='button' class="btn btn-primary" title="$password_text - currently unset">
                                 %       $password_text
                                 %   </button>
                             %</a>
                        %};
+
                     % } elsif ($useraccounts_user_name ne 'admin') {
-                     % my $lock_text = l('usr_LOCK');  # Localized text
-                     % my $csrf_token = "TOKEN";  # CSRF token for security
-                     % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
                         %$actionLock = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
                                 %   <button type='button' class="btn btn-primary" title='$lock_text' >
@@ -128,8 +124,6 @@
                     % }
 
                     % if ( $removable eq 'yes' )  {
-                     % my $remove_text = l('REMOVE');  # Localized text
-                     % my $csrf_token = "TOKEN";  # CSRF token for security
                         %$actionRemove = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
                             %   <button type='button' class="btn btn-primary" title='$remove_text' >
@@ -139,10 +133,7 @@
                         %};
                     % }
 
-                 % my $thisdomain = $c->req->url->to_abs->host;
+                    <!-- If webmail disabled??? -->
-                 % my $roundcube_text = l('Webmail');  # Localized text
-                 % $csrf_token = "TOKEN";  # CSRF token for security
-                 % $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
                     % $actionroundcube = qq{
                         %<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
                         %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
@@ -150,6 +141,7 @@
                         %   </button>
                         %</a>
                     %};
+
                     <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
                     <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
                     <td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
@@ -161,9 +153,9 @@
         </table>
     </div>
 
-    <%} %>
+    % }
 
-        %= hidden_field 'trt' => $usr_datas->{trt}
+    <%= hidden_field 'trt' => $usr_datas->{trt} %>
 
 </div>
 

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

@@ -2,7 +2,10 @@
 
     %   my $btn = l('usr_LOCK');
     
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+    <form action="/smanager/useraccountsd" method="POST">
+
+    %#= form_for '/useraccountsd' => (method => 'POST') => begin
+    
     <div>
     <h2><%= l 'usr_LOCK_ACCOUNT_TITLE' %></h2>
     </div>
@@ -48,6 +51,7 @@
     %= hidden_field 'user' => $usr_datas->{user}
     %= hidden_field 'name' => $usr_datas->{name}
     
-    % end    
+    </form>
+    %# end    
 
 </div>

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

@@ -2,7 +2,9 @@
 
     % my $btn = l('SAVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+    <form action="/smanager/useraccountsd" method="POST">
+
+    <br>
 
     <div>
         <h2><%= l 'RESET_PASSWORD_TITLE' %></h2>
@@ -11,7 +13,7 @@
     <br>
 
     <div>
-    %= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} );
+        <%= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} ); %>
     </div>
 
     <br>
@@ -41,31 +43,31 @@
         <%= l 'usr_RESET_DESC2' %>
     </div>
 
-    <br>
+    <br><br>
 
-    <div>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
             <%= l 'PASSWORD_NEW' %>
         </div>
+        <div class="col-auto">
+            <input name="newPass" id="password" type="password" class="form-control sme-password" placeholder="Password" autocomplete="on">
+        </div>
+        <div class="col-auto">
+            <span id="togglePassword" class="bi bi-eye"></span>
+        </div>
+    </div>
 
     <br>
 
     <div class="row g-3 align-items-center">
-        <div class="col-md-2">
+        <div class="col-md-1">
-        <input name="newPass" id="newPass" type="password" class="form-control sme-password" placeholder="Password">
-        </div>
-    </div>
-
-    <br>
-    
-    <div>
             <%= l 'PASSWORD_VERIFY_NEW' %>
         </div>
-
+        <div class="col-auto">
-    <br>
+            <input name="newPassVerify" id="passVerify" type="password" class="form-control sme-password" placeholder="Password" autocomplete="on">
-
+        </div>
-    <div class="row g-3 align-items-center">
+        <div class="col-auto">
-        <div class="col-md-2">
+            <span id="togglePasswordVerify" class="bi bi-eye"></span>
-        <input name="newPassVerify" id="newPassVerify" type="password" class="form-control sme-password" placeholder="Password">
         </div>
     </div>
 
@@ -81,6 +83,6 @@
     %= hidden_field 'user' => $usr_datas->{user}
     %= hidden_field 'name' => $usr_datas->{name}
 
-    % end    
+    </form>
-
+    <br>
 </div>

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

@@ -1,8 +1,8 @@
 <div>
 
     % my $btn = l('SAVE');
-
+    <form action="/smanager/useraccountsd" method="POST">
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+    %#= form_for '/useraccountsd' => (method => 'POST') => begin
     
         <div>
         <h2><%= l 'PASSWORD_RESET' %></h2>
@@ -72,6 +72,7 @@
         %= hidden_field 'user' => $usr_datas->{user}
         %= hidden_field 'name' => $usr_datas->{name}
     
-    % end
+    %# end
+    </form>
 
 </div>

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

@@ -1,5 +1,5 @@
 
-<div class="container-sm">
+<div>
     <br>
     <h2><%= l 'usr_P2_TITLE' %></h2>
     <br>
@@ -149,8 +149,6 @@
         </div>
         <br>
 
-        
-       
         % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
 
         <div class="row g-3 align-items-center">
@@ -168,7 +166,6 @@
         </div>
         <br>
 
-    
         % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
 
         <div class="row g-3 align-items-center">
@@ -293,6 +290,7 @@
         % }
 
     </form>
+    %#end
 </div>
 
 <!-- End of containers-sm -->

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

@@ -1,13 +1,11 @@
-% content_for 'module' => begin
 
-<div class="container-sm">
+
-    <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">
@@ -20,6 +18,7 @@
         </div>
 
         <br>
+
         % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
 
         <div class="row g-3 align-items-center">
@@ -52,6 +51,7 @@
               </span>
             </div>
         </div>
+
         <br>
 
         % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
@@ -61,9 +61,10 @@
                 <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';
@@ -81,6 +82,7 @@
               </span>
             </div>
         </div>
+
         <br>
 
         % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
@@ -90,12 +92,16 @@
                 <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">
@@ -104,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>
 

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

@@ -5,15 +5,16 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
+        <pre>
             %= dumper $c->current_route
             %= dumper $prt_datas
-    </p>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-            %= $c->render_to_string(inline => stash 'error') 
+        <div>
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 

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

@@ -5,42 +5,74 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>(DBG)route: <%= $c->current_route %><br>
+        <pre>
-    (DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
+            <%= dumper $c->current_route %>
-    (DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>
+            <%= dumper $prx_datas->{http_proxy_status} %>
-    </p>
+            <%= dumper $prx_datas->{smtp_proxy_status} %>
+        </pre>
     % }
-    <h1><%= $title %></h1>
-    <br>
-    <%= $modul %>
-    <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'proxy' => (method => 'POST') => begin
+
-    <p>
+    <h1><%= $title %></h1>
-    %=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION'
+
-    <br><br>
+    <br>
-    <span class="">
+
-    %=l 'prx_HTTP_PROXY_STATUS_LABEL'
+    <%= $modul %>
-    </span>
+
-    <span class="">
+    <form action="/smanager/hostentriesd" method="POST">
-    % 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']], class => "", id => ""
+        <br>
-    </span>
+
-    </p>
+        <div>
-    %if ( $prx_datas->{smtp_proxy_status} ) {
+           <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
-        <p>
-        %=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION'
-        <br><br>
-        <span class="">
-        %=l 'prx_SMTP_PROXY_STATUS_LABEL'
-        </span><span class="">
-        % 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']], class => "", id => "", default => $prx_datas->{smtp_proxy_status}
-        <br><br>
-        </span>
-        </p>
-    %}
-    %= submit_button "$btn", class => ""
-    % end
         </div>
+
+        <br>
+
+        <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']], class => "form-select" %>
+            </div>
+        </div>
+
+        % if ( $prx_datas->{smtp_proxy_status} ) {
+
+            <br>
+
+            <div>
+                <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <%=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>
+
 %end

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

@@ -5,15 +5,16 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $pse_datas
+        <%= dumper $pse_datas %>
-    </p>
+    </div>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
@@ -30,4 +31,5 @@
     % }
 
 </div>
+
 %end

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

@@ -1,4 +1,5 @@
 % layout 'AdminLTE', title => "Sme server 2 - qmailanalog";
+
 % content_for 'module' => begin
 
 <!-- should be moved -->
@@ -8,45 +9,63 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <div>
             (DBG)route: <%= $c->current_route %><br>
-    </p>
+        </div>
     % }
+
     <h1><%= $title %></h1>
     <br>
+
     <%= $modul %>
     <% my $btn = l('qma_GENERATE_REPORT'); %>
-    %= form_for 'qmailanalog' => (method => 'POST') => begin
+
-        <p>
+
-        <span class="">
+    <form action="/smanager/qmailanalog" method="POST">
-        %=l 'qma_REPORT_TYPE'
+
-        </span>
+        <div class="row g-3 align-items-center">
-        <span class="">
+            <div class="col-md-1">
+                <label for="analysis_type" class="col-form-label"><%=l 'qma_REPORT_TYPE' %></label>
+            </div>
+            <div class="col-auto">
                 <!-- (to be sorted) -->
-        %= select_field 'report_type' => $c->reportType_list(), id => ""
+                <%= select_field 'report_type' => $c->reportType_list(), class => "form-select", id => "analysis_type" %>
-        </span>
+            </div>
-        </p>
+        </div>
+
+        <br>
 
         <!--And optional parameters, depending on the choice.-->
-        <div id="">
+        <div class="row g-3 align-items-center">
-            <span class="">
+            <div class="col-md-1">
-            %= label_for message_id => 'Message ID:'
+                <label for="message_id_group" class="col-form-label">Message ID:</label>
-            </span>
+            </div>
-            <span class="">
+            <div class="col-auto">
-            %= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => ""
+                <input type="text" name="message_id" id="message_id_group" class="form-control" aria-describedby="message_id_group" placeholder="Enter Postfix Message ID">
-            </span>
+            </div>
         </div>
 
-        <div id="">
+        <br>
-            <span class="">
+
-            %= label_for email_address => 'Email Address:'
+        <div class="row g-3 align-items-center">
-            </span>
+            <div class="col-md-1">
-            <span class="">
+                <label for="email_address_group" class="col-form-label">Email Address:</label>
-            %= email_field 'email_address', placeholder => 'Enter email address', id => ""
+            </div>
-            </span>
+            <div class="col-auto">
+                <input type="email" name="email_address" id="email_address_group" class="form-control" aria-describedby="email_address_group" placeholder="Enter Email Address">
+            </div>
         </div>
 
-        %= submit_button "$btn", class => ""
+        <br>
-    % 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>
+
+    </form>
+
+</div>
+
 %end

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

@@ -5,26 +5,28 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $quo_datas
-    </p>
+    </div>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
     <h1><%= $title%></h1>
 
     % if ($quo_datas->{trt} eq 'UPD') {
-    %= include 'partials/_quo_upd'
+        <%= include 'partials/_quo_upd' %>
     % } else {
-    %= include 'partials/_quo_list'
+        <%= include 'partials/_quo_list' %>
     % }
 
 </div>
+
 %end
 

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

@@ -5,36 +5,45 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    (DBG)route: <%= $c->current_route %><br>
+            <%=  dumper $c->current_route %>
-    </p>
+        </pre>
     % }
 
     <h1><%=  $title %></h1>
+
     <br>
 
-    %= $modul
+    <%= $modul %>
 
-    <%  my $btn = l('PERFORM'); %>
+    <form action="/smanager/reboot" method="POST">
-    %= form_for 'reboot' => (method => 'POST') => begin
 
-    <p>
+        <div class="col-md-6">
-    %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
+            <%= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION')) %>
-    <br><br>
+        </div>
 
-    <span class="">
+        <br>
-    %=l 'rbo_LABEL_REBOOT'
-    </span>
-    <span class="">
-    %= select_field 'function' => $c->rebootFunction_list()
-    </span>
-    </p><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

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

@@ -5,64 +5,70 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $rma_datas
+        <%= dumper $rma_datas %>
-    </p>
+        </pre>
     % }
+
     <h1><%= $title%></h1>
+
     % if ( $notif ) {
         <br>
-    <span class="">
+        <div>
             <%= $c->render_to_string(inline => $notif) %>
-    </span>
+        </div>
     %}
 
     <!--<hr class="" />-->
 
     <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'remoteaccess' => (method => 'POST') => begin
+
+    <form action="/smanager/remoteaccess" method="POST">
 
     % my $ipsec = $c->get_ipsecrw_status();
+    <!-- reetp not tested -->
     % if ( $ipsec) {
-    <p>
-    <h2>
-    %=l 'rma_TITLE_IPSECRW'
-    </h2><br>
 
-    %=l 'rma_DESC_IPSECRW'
+        <h2><%= l 'rma_TITLE_IPSECRW' %></h2>
-    <br>
+        <div>
-
+            <%= l 'rma_DESC_IPSECRW' %>
-    <span class="">
+        </div>
-    %=l 'rma_LABEL_IPSECRW_SESS'
+        <div>
-    </span>
+            <%= l 'rma_LABEL_IPSECRW_SESS' %>
-    <span class="">
+        </div>
+        <div>
             % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
-    %= text_field 'IpsecrwSess', class => ""
+            <%= text_field 'IpsecrwSess', class => "" %>
-    </span>
+        </div>
         <br>
 
-    %= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));
+        <div>
+            <%= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));  %>
+        </div>
         <br>
-    <span class="">
+        <div>
-    %=l 'rma_LABEL_IPSECRW_RESET'
+            <%= l 'rma_LABEL_IPSECRW_RESET' %>
-    </span>
+        </div>
-    <span class="">
+        <div>
-    %= check_box 'IpsecrwReset',class => ""
+            <input type='checkbox' name='IpsecrwReset'>
-    </span>
+        </div>
         <br><br>
-
     <!--<hr class="" />-->
 
     % }
 
     <!-- percequ include 'partials/_rma_pptp' -->
 
-    <h2>
+    <h2><%= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT')); %></h2>
-    %= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT'));
+
-    </h2><br>
+    <br>
-    %=l 'rma_VALIDFROM_DESC'
+
+    <div>
+        <%= l 'rma_VALIDFROM_DESC' %>
+    </div>
+
     <br><br>
 
     % my @vals = $self->_get_valid_from();
@@ -70,29 +76,23 @@
         <table class="table table-bordered">
             <thead>
                 <tr>
-    <th class="">
+                    <th><%= l 'NETWORK' %></th>
-            %=l 'NETWORK'
+                    <th><%= l 'rma_SUBNET_MASK' %></th>
-            </th><th class="">
+                    <th><%= l 'rma_NUM_OF_HOSTS' %></th>
-            %=l 'SUBNET_MASK'
+                    <th><%= l 'REMOVE' %></th>
-            </th><th class="">
-            %=l 'NUM_OF_HOSTS'
-            </th><th class="">
-            %=l 'REMOVE'
-        </th>
                 </tr>
             </thead>
-        </tbody>
+            <tbody>
 
-    %    foreach my $val ( @vals )
+            % 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>
+                <tr  class="align-middle">
-            %= t td => (class => "") => $net
+                    <td><%= $net %></td>
-            %= t td => (class => "") => $mask
+                    <td><%= $mask %></td>
-            %= t td => (class => "") => $numhosts
+                    <td><%= $numhosts %></td>
-            <td class="">
+                    <td>
                     <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
                     </td>
                 </tr>
@@ -106,126 +106,180 @@
             foreach my $val (@vals)
             { esmith::cgi::genSmallCell($q, shift(@cbGroup), } -->
     % } else {
-    <br><b>
+        <br>
-        %= l('rma_NO_ENTRIES_YET');
+        <b><%= l('rma_NO_ENTRIES_YET'); %></b>
-    </b>
     % }
-    %=l 'rma_DESC_VALID_FROM_ENTRIES'
+
-    <br><br>
-    <span class="">
-    %=l 'NETWORK'
-    </span>
-    <span class="">
-    %= text_field 'ValidFromNetwork', class => ""
-    </span>
     <br>
-    <span class="">
+
-    %=l 'rma_SUBNET_MASK'
+    <div>
-    </span>
+        <%= l 'rma_DESC_VALID_FROM_ENTRIES' %>
-    <span class="">
+    </div>
-    %= text_field 'ValidFromMask', class => ""
+
-    </span>
+    <br><br>
+
+    <div class="row g-3 align-items-center">
+         <div class="col-md-1">
+            <label for="inputNetwork" class="col-form-label"><%= l 'NETWORK' %></label>
+        </div>
+        <div class="col-auto">
+            <input type="text" name="ValidFromNetwork" id="inputNetwork" class="form-control" aria-describedby="Network">
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+         <div class="col-md-1">
+            <label for="inputSubnetMask" class="col-form-label"><%= l 'rma_SUBNET_MASK' %></label>
+        </div>
+        <div class="col-auto">
+            <input type="text" name="ValidFromMask" id="inputSubnetMask" class="form-control" aria-describedby="Subnet">
+        </div>
+    </div>
 
     <!--<hr class="" />-->
 
-    <h2>
-    %=l 'rma_TITLE_SSH'
-    </h2><br>
-    %=l 'rma_DESC_SSH'
     <br><br>
-    <span class="">
+
-    %=l 'rma_LABEL_SSH'
+    <h2><%= l 'rma_TITLE_SSH' %></h2>
-    </span>
+
-    <span class="">
+    <br>
+
+    <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 => ""
+        <%= select_field 'SshAccess' => $c->networkAccess_list(), class => "form-select" %>
-    </span>
+        </div>
+    </div>
+
     <br>
 
-    <span class="">
+    <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_SSH_ADMIN'
+        <div class="col-md-2">
-    </span>
+            <%= l 'rma_LABEL_SSH_ADMIN' %>
-    <span class="">
+        </div>
+        <div class="col-auto">
             % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
-    %= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
+            <%= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
-    </span>
+        </div>
+    </div>
+
     <br>
 
-    <span class="">
+    <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_SSH_PASSWORD_ACCESS'
+        <div class="col-md-2">
-    </span>
+            <%= l 'rma_LABEL_SSH_PASSWORD_ACCESS' %>
-    <span class="">
+        </div>
+        <div class="col-auto">
             % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
-    %= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
+            <%= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
-    </span>
+        </div>
+    </div>
+
     <br>
 
-    <span class="">
+    <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_SSH_PORT'
+        <div class="col-md-2">
-    </span>
+            <label for="inputSSHPort" class="col-form-label"><%= l 'rma_LABEL_SSH_PORT' %></label>
-    <span class="">
+        </div>
+        <div class="col-sm-1">
             % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
-    %= text_field 'SshTCPPort', class => ""
+            <input type="text" name="SshTCPPort" id="inputSSHPort" class="form-control" aria-describedby="SSH Port" value="<%= $c->get_ssh_port() %>">
-    </span>
+        </div>
+    </div>
+
     <br>
 
     <!--<hr class="" />-->
 
-    <h2>
+    <br><br>
-    %=l 'rma_TITLE_FTP_ACCESS'
+    <h2><%= l 'rma_TITLE_FTP_ACCESS' %></h2>
-    </h2><br>
+    <br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS'));
+
+    <div>
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS')); %>
+    </div>
 
     <br>
-    <span class="">
+
-    %=l 'rma_LABEL_FTP_ACCESS'
+    <div class="row g-3 align-items-center">
-    </span>
+        <div class="col-md-2">
-    <span class="">
+            <%= 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 => ""
+            <%= select_field 'FtpAccess' => $c->networkAccess_list(), class => "form-select" %>
-    </span>
+        </div>
-    <br>
+    </div>
 
     <br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN'));
     <br>
-    <span class="">
+
-    %=l 'rma_LABEL_FTP_LOGIN'
+    <div>
-    </span>
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN')); %>
-    <span class="">
+    </div>
+
+    <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 => ""
+            <%= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => "form-select" %>
-    </span>
+        </div>
+    <div>
+
     <br>
 
     % my $mode = $c->get_telnet_mode();
     % if ( $mode ne 'off') {
         <!--<hr class="" />-->
 
-    <h2>
+        <h2><%= l 'rma_TITLE_TELNET_ACCESS' %></h2>
-    %=l 'rma_TITLE_TELNET_ACCESS'
+
-    </h2><br>
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rma_DESC_TELNET_ACCESS' %>
+            </div>
+        <div>
 
-    <span class="">
-    %=l 'rma_DESC_TELNET_ACCESS'
-    </span>
         <br><br>
 
-    <span class="">
+        <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_TELNET_ACCESS'
+            <div class="col-md-2">
-    </span>
+                <%= l 'rma_LABEL_TELNET_ACCESS' %>
-    <span class="">
+            </div>
+            <div class="col-auto">
                 % param 'TelnetAccess' => $mode unless param 'TelnetAccess';
-    %= select_field 'TelnetAccess' => $c->networkAccess_list(), class => ""
+                <%= select_field 'TelnetAccess' => $c->networkAccess_list(), class => "form-select" %>
-    </span>
+            </div>
+        </div>
+
         <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>
 

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

@@ -6,36 +6,62 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-        <p>
+        <pre>
-            %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-        </p>
+        </pre>
     % }
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
-            %= $c->render_to_string(inline => stash 'error') 
+        <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');
+    % my $username = 'admin';
+
     % if (!$url) {
         % $url = $thisdomain."/roundcube";
     % }
-    % my $username = 'admin';
+
     % if ($url =~ /[?&]_user=([^&]+)/) {
         % $username = $1;
     % }
+
     % if (!($url =~ /https:/)) {
         % $url = 'https://' . $url;
     %}
 
-    <div class="">
+    <div class="container-fluid">
-        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
+        <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

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

@@ -3,7 +3,9 @@
 % content_for 'module' => begin
 
 <div class="card-body">
-    <p> < %= $title % ></p>
+    <div>
+        < %= $title % >
+    </div>
     <br>
         <%= $modul %> 
     <br>

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

@@ -2,29 +2,23 @@
 
 % content_for 'module' => begin
 
-%#= include 'partials/_panel_card_top'
-%#= include 'partials/_panel_card_header'
-
 <div class="card-body">
-<!-- /.card-body -->
-        
 
     % if (config->{debug} == 1) {
-    <p>
+        <div>
             %= dumper $c->current_route
             %= dumper $usr_datas
-    </p>
+        </div>
+    % }
+
+    % if ( $notif ) {
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => $notif) %>
+        </div>
     % }
 
     <h1><%= $title%></h1>
 
-    % if ( $notif ) {
-    <br>
-    <span class="">
-    <%= $c->render_to_string(inline => $notif) %>
-    </span>
-    %}
-
     % if ($usr_datas->{trt} eq 'ADD' or $usr_datas->{trt} eq 'UPD') {
         %= include 'partials/_usr_upd'
     %} elsif ($usr_datas->{trt} eq 'DEL') {
@@ -43,8 +37,5 @@
 
 </div>
 
-%#= include 'partials/_panel_card_footer'
-%#= include 'partials/_panel_card_bottom'
-
 %end
 

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

@@ -5,70 +5,108 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
+        <div>
             (DBG)route: <%= $c->current_route %><br>
-    </p>
+        </div>
     % }
+
     <h1><%= $title %></h1>
+
     <br>
+
     <%= $notif %>
+
     <% my $btn = l('NEXT'); %>
 
-    %= form_for 'viewlogfiles' => (method => 'POST') => begin
+
-    <p>
+    <form action="/smanager/viewlogfiles" method="POST">
-    %=l 'log_FIRSTPAGE_DESC'
+
+        <div>
+            <%=l 'log_FIRSTPAGE_DESC' %>
+        </div>
+
         <br>
-    <span class="">
+
-    %=l 'log_LOG_FILE_SELECT_DESC'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <label for="LogFileSelect" class="col-form-label"><%=l 'log_LOG_FILE_SELECT_DESC' %></label>
+            </div>
+            <div class="col-auto">
                 % param 'Filename' => 'messages';
                 <!-- select_field 'Filename' => [['toto'], ['tata']], class => "" -->
-    %= select_field 'Filename' => $c->findlogFiles(), class => ""
+                %= select_field 'Filename' => $c->findlogFiles(), class => "form-select", id => "LogFileSelect"
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
-    %=l 'log_FILTER_PATTERN_DESC'
         <br>
-    <span class="">
-    %=l 'log_FILTER_PATTERN_LABEL'
-    </span>
-    <span class="">
-    %= text_field 'Matchpattern', class => ""
-    </span>
-    </p>
 
-    <p>
+        <div>
-    %=l 'log_MATCH_PATTERN_DESC'
+            <%= l 'log_FILTER_PATTERN_DESC' %>
-    <br>
+        </div>
-    <span class="">
-    %=l 'log_MATCH_PATTERN_LABEL'
-    </span>
-    <span class="">
-    %= text_field 'Highlightpattern', class => ""
-    </span>
-    </p>
 
-    <p>
-    %=l 'log_OP_DESC'
         <br>
-    <span class="">
+
-    %=l 'log_OP_LABEL'
+        <div class="row g-3 align-items-center">
-    </span>
+            <div class="col-md-2">
-    <span class="">
+                <label for="LogFilterPattern" class="col-form-label"><%= l 'log_FILTER_PATTERN_LABEL' %></label>
+            </div>
+            <div class="col-auto">
+                 <input type="text" name="Matchpattern" id="LogFilterPattern" class="form-control" aria-describedby="LogFilterPattern">
+            </div>
+        </div>
+
+
+        <br>
+
+        <div>
+            <%= l 'log_MATCH_PATTERN_DESC' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="LogHighlightpattern" class="col-form-label"><%= l 'log_MATCH_PATTERN_LABEL' %></label>
+            </div>
+            <div class="col-auto">
+                 <input type="text" name="Highlightpattern" id="LogHighlightpattern" class="form-control" aria-describedby="LogHighlightpattern">
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'log_OP_DESC' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="LogOperation" class="col-form-label"><%= l 'log_OP_LABEL' %></label>
+            </div>
+            <div class="col-auto">
                 %if ($log_datas->{'default_op'} eq 'download') {
                     % param 'Operation' => 'download';
                 % }
-    %= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => ""
+                %= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => "form-select", id => "LogOperation"
-    </span>
-    </p>
-
-    <p>
-    %=l 'log_END_DESC'
-    </p>
-
-    %= submit_button "$btn", class => ""
-    % end
             </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'log_END_DESC' %>
+        </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>
+
+    </form>
+
+</div>
+
 %end

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

@@ -5,28 +5,37 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <div>
             (DBG)route: <%= $c->current_route %><br>
             (DBG)trt: <%= $log_datas->{trt} %><br>
-    </p>
+        </div>
     % }
 
     <h1><%= $title %></h1>
 
-    <br><%= $modul %><br>
+    <br>
+
+    <%= $modul %>
+
+    <br>
 
-    <p>
     <% my $btn = l('log_REFRESH'); %>
 
-    %= form_for 'viewlogfilesr' => (method => 'POST') => begin
+    <form action="/smanager/viewlogfilesr" method="POST">
-    %= submit_button "$btn", class => ""
+
+        <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' => $log_datas->{trt}
         %= hidden_field 'Filename' => $log_datas->{filename}
         %= hidden_field 'Matchpattern' => $log_datas->{matchpattern}
         %= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern}
         %= hidden_field 'Operation' => $log_datas->{operation}
-    % end
+    </form>
-   </p>
+
 </div>
 
 %end

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

@@ -5,67 +5,98 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
+        <pre>
-    (DBG)route: <%= $c->current_route %><br>
+            route: <%= dumper $c->current_route %>
-    (DBG)pdc: <%= $wkg_datas->{ServerRole}%><br>
+            pdc: <%= dumper $wkg_datas->{ServerRole}%>
-    (DBG)roam: <%= $wkg_datas->{RoamingProfiles}%><br>
+            roam: <%= dumper $wkg_datas->{RoamingProfiles}%>
-    </p>
+        </pre>
     % }
 
     <h1><%= $title %></h1>
     <br>
     <%= $modul %>
-    <%  my $btn = l('SAVE');
+    <%  my $btn = l('SAVE'); %>
-     %>
 
-    %= form_for 'workgroup' => (method => 'POST') => begin
+    <form action="/smanager/workgroup" method="POST">
-    <p>
-    %=l 'wkg_DESC_WORKGROUP', class => ""
-    <br><br>
-    <span class="">
-    %=l 'wkg_LABEL_WORKGROUP', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Workgroup' =>  $wkg_datas->{Workgroup}, class => "" , pattern=>".{1,15}", title=>"Limited to 15 characters by the NETBIOS"
-    </span>
-    </p>
-    <p>
-    %=l 'wkg_DESC_SERVERNAME', class => ""
-    <br><br>
-    <span class="">
-    %=l 'wkg_LABEL_SERVERNAME', class => ""
-    </span>
-    <span class="">
-    %= text_field 'ServerName' =>  $wkg_datas->{ServerName}, class => ""
-    </span>
-    </p>
-    <p>
-        %= $c->render_to_string(inline => l 'wkg_DESC_PDC')
-    <br>
-    <span class="">
-    %=l 'wkg_LABEL_PDC', class => ""
-    </span>
-    <span class="">
-    % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole';
-    %= select_field 'ServerRole' =>  [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => ""
-    </span>
-    </p>
-    <p>
-        %= $c->render_to_string(inline => l 'wkg_DESC_ROAM')
-    <br>
-    <span class="">
-    %=l 'wkg_LABEL_ROAM', class => ""
-    </span>
-    <span class="">
-    % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles';
-    %= select_field 'RoamingProfiles' =>  [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => ""
-    </span>
-    </p>
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
-    % end    
 
+        <div>
+            <%= l 'wkg_DESC_WORKGROUP' %>
         </div>
+
+        <br>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputWorkgroup" class="col-form-label"><%= l 'wkg_LABEL_WORKGROUP' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Workgroup" id="inputWorkgroup" class="form-control" aria-describedby="inputWorkgroup" maxlength="15" size="15" value="<%= $wkg_datas->{Workgroup}%>" >
+                </div>
+                <div class="col-auto">
+                  <span id="passwordHelpInline" class="form-text">
+                    Limited to 15 characters by the NETBIOS
+                  </span>
+                </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'wkg_DESC_SERVERNAME' %>
+        </div>
+
+        <br>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputSambaServerName" class="col-form-label"><%= l 'wkg_LABEL_SERVERNAME' %></label>
+                </div>
+                <div class="col-auto">
+                <input type="text" name="ServerName" id="inputSambaServerName" class="form-control" aria-describedby="inputSambaServerName"  value="<%= $wkg_datas->{ServerName}%>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            %= $c->render_to_string(inline => l 'wkg_DESC_PDC')
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'wkg_LABEL_PDC' %>
+            </div>
+            <div class="col-auto">
+                % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole';
+                <%= select_field 'ServerRole' =>  [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= $c->render_to_string(inline => l 'wkg_DESC_ROAM') %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'wkg_LABEL_ROAM' %>
+            </div>
+            <div class="col-auto">
+                % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles';
+                <%= select_field 'RoamingProfiles' =>  [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => "form-select" %>
+            </div>
+        </div>
+
+        <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

smeserver-manager-AdminLTE.code-workspace

@@ -0,0 +1,7 @@
+{
+    "folders": [
+        {
+            "path": "."
+        }
+    ]
+}

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 16
+%define release 35
 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,84 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Thu Jun 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-35.sme
+- Finish backup panels
+- Finish printer panels
+- Tidy Local Networks
+- Small layout tweaks
+
+* Wed Jun 11 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-34.sme
+- Update flag detection JS [SME: 13039]
+- Tweak login template
+- Update Remoteaccess template
+- Various formatting  fixes
+- User password trying to get the show hide password icon working
+- Ibay password trying to get the show hide password icon working
+- Continue Backup panels
+
+* Tue Jun 10 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-33.sme
+- Fix out of sync versioning
+
+* Tue Jun 10 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-32.sme
+- Add autocomplete to login as per Google
+- Update to Quota list - thanks Ed Burgstaler
+- Update Clamav
+- Modify ibay update
+- Modify Localnetwork list
+- Start remoteaccess
+
+* 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
+- Some general tidying
+
+* Tue May 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-25.sme
+- Log files - Bug reports - Config reports
+
+* Mon May 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-24.sme
+- Local Networks and a few odd tidies
+
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-23.sme
+- Domains done plus more tweaks
+
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-22.sme
+- Hosts done and a few tweaks
+
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-21.sme
+- Directory updated. More odd fixes.
+
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-20.sme
+- Ibays done. Updating some consistency elsewhere.
+
+* Fri May 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-19.sme
+- Fix more stuff with usr templates
+
+* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-18.sme
+- Trying to make _user_list more logical. Needs 'UNLOCK' translation
+- Big cleanup of dupplicate % my= but needs more work
+
+* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-17.sme
+- Convert tabs to spaces for consistency
+- Fix group update container
+
 * Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-16.sme
 - Fix user add error
 - Update group templates