11.0.0-38.sme More formatting

root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css

@@ -104,9 +104,12 @@ html {
     border-left-width: 0px;
 }
 
-.user-valign-center {
+/* .user-valign-center {
     text-align: center;
-}
+    -- Use align-middle --
+} */
+
+
 
 .user-table-max-wdith {
     max-width: 50%;

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

@@ -208,7 +208,7 @@ document.addEventListener('DOMContentLoaded', () => {
 				//if (!response.ok) throw new Error('Country not found');
 				//const data = await response.json();
 				//// Return the name in the native language
-				//return data[0].name.common; 
+				//return data[0].name.common;
 			//} catch (error) {
 				//console.error(error);
 				//return 'Unknown Country';
@@ -222,7 +222,7 @@ document.addEventListener('DOMContentLoaded', () => {
 		function getCountryCodeFromLanguage(language) {
 			return languageToCountryMap[language] ? languageToCountryMap[language].code : null;
 		}
-		
+
 		function getCountryNameFromCountryCode(countryCode) {
 			//alert(`Country code: ${countryCode}`);
 			for (const language in languageToCountryMap) {
@@ -263,11 +263,15 @@ 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);
-    
+
     //alert(`Country Code: ${countryCode}, Is Unknown: ${isUnknown}`); // Debug country code and unknown flag status
 
     // Display the locale and the corresponding flag (or fallback)
@@ -278,7 +282,7 @@ function displayLocaleAndFlag() {
         fallbackDiv.className = 'fallback-box';
         fallbackDiv.textContent = `? ${userLocale.toUpperCase()}`; // Show ? and locale code inside the box
         document.getElementById('flag-container').appendChild(fallbackDiv);
-        
+
         // Tooltip for fallback
         fallbackDiv.title = "Unknown Country"; // Tooltip for fallback
         //alert('Fallback triggered: Unknown Country'); // Debug fallback
@@ -290,7 +294,7 @@ function displayLocaleAndFlag() {
         flagSpan.textContent = flag; // Use flag emoji
         flagSpan.title = countryName; // Tooltip for the flag in country language
         document.getElementById('flag-container').appendChild(flagSpan);
-        
+
         //alert(`Flag Emoji: ${flag}`); // Debug flag emoji display
     }
 }

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

@@ -15,7 +15,7 @@
         <div class="text-danger">
             <%=  $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
@@ -39,9 +39,9 @@
             </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 {
-                <input type='checkbox' name='Tapebackup'>
+                <input type='checkbox' name='Tapebackup' aria-describedby="disabled">
             % }
             </div>
         </div>
@@ -50,17 +50,20 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <%= l 'bac_TAPE_BACKUP_TIME' %>
+                <label for="inputBackupHour" class="col-form-label"><%= l 'bac_TAPE_BACKUP_TIME' %></label>
+                <label for="inputBackupMin" class="col-form-label"></label>
             </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} %>">
             </div>
             <div class="col-auto">
                 % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
-                <%=  select_field 'BackupAMPM' => ['AM', 'PM'], class => "form-select" %>
+                <%= select_field 'BackupAMPM' => ['AM', 'PM'], class => "form-select" %>
             </div>
         </div>
 
@@ -69,17 +72,20 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <%= l 'bac_LOAD_TAPE_REMINDER_TIME' %>
+                <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} %>">
             </div>
             <div class="col-auto">
                 % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
-                <%=  select_field 'ReminderAMPM' => ['AM', 'PM'], class => "form-select" %>
+                <%= select_field 'ReminderAMPM' => ['AM', 'PM'], class => "form-select" %>
             </div>
         </div>
 

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

@@ -5,10 +5,10 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <pre>
+        <pre>
-        <%= dumper $c->current_route %>
+            <%= dumper $c->current_route %>
-        <%= dumper $bac_datas %>
+            <%= dumper $bac_datas %>
-    </pre>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
@@ -22,13 +22,15 @@
 
     <br>
 
+    <h2><%=l 'bac_RESTORE_CONF_FROM_TAPE' %></h2>
+
+    <br>
+
     <form action="/smanager/backupd" method="POST">
 
-        <h2><%=l 'bac_RESTORE_CONF_FROM_TAPE' %></h2>
+        <div>
-
+            <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) %>
-        <br>
+        </div>
-
-        <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) %>
 
         <br>
 

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

@@ -5,31 +5,34 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <pre>
+        <pre>
-     <%=  dumper $c->current_route %>
+             <%= dumper $c->current_route %>
-     <%=  dumper $bac_datas %>
+             <%= dumper $bac_datas %>
-    </pre>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="text-danger">
+        <br>
-         <%=  $c->render_to_string(inline => stash 'error') %>
+        <div class="text-danger">
-    </div>
+            <%=  $c->render_to_string(inline => stash 'error') %>
-    %}
+        </div>
+    % }
 
     <h1><%=  $title%></h1>
 
     <br>
 
-    <form action="/smanager/backup" method="POST">
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
 
-        <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
+    <br>
-
-        <br>
 
+    <div>
         <%=  $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC')) %>
+    </div>
 
-        <br>
+    <br>
+
+    <form action="/smanager/backup" method="POST">
 
         <div>
             <%= l 'bac_WORKSTN_BACKUP_ENABLED' %>: <%=  $bac_datas->{status} %>

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

@@ -5,169 +5,268 @@
 <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">
-    </div>
+            <%=  $c->render_to_string(inline => stash 'error') %>
-    %}
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_CONFIGURE_WORKSTN_BACKUP'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC'))
-
-    %= form_for '/backupd' => (method => 'POST') => begin
-
-    <p>
-    <span class="">
-    %=l 'bac_ENABLE_WORKSTN_BACKUP'
-    </span>
-    <span class="">
-    % if ( $bac_datas->{status} eq 'checked' ) {
-    <input type='checkbox' name='Workstnbackup' checked >
-    %} else {
-    %= check_box 'Workstnbackup'
-    %}
-    </span>
-
-    </p>
-    <p>
-    <h3>
-    %= l 'bac_WORKSTATION_BACKUP_DEST'
-    </h3>
     <br>
 
-    % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
-        <span class="">
-        %=l 'bac_WORKSTN_NAME'
-        </span>
-        <span class="">
-        % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
-        %= text_field 'BackupwkStation', size => 20, class => ""
-        </span>
-    <br>
-    %}
-    % if (  $bac_datas->{vfstype} eq 'usb' ) {
-        <span class="">
-        %=l 'bac_local removable disk'
-        </span>
-        <span class="">
-        % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder';
-        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
-        </span>
-        <br>
-    % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
-    <span class="">
-        %=l 'bac_Mounted disk'
-        </span>
-        <span class="">
-        % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
-        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
-        </span>
-        <br>
-    % } else {
-        <span class="">
-        %=l 'bac_SHARED_FOLDER_NAME'
-        </span><span class="">
-        % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
-        %= text_field 'BackupwkFolder', size => 20, class => ""
-        </span>
-        <br>
-    %}
-    % if (  $bac_datas->{vfstype} eq 'cifs' ) {
-        <span class="">
-        %=l 'bac_WORKSTN_LOGIN'
-        </span><span class="">
-        % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin';
-        %= text_field 'BackupwkLogin', size => 12, class => ""
-        </span>
-        <br>
-        <span class="">
-        %=l 'bac_PASSWORD'
-        </span><span class="">
-        % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword';
-        %= password_field 'BackupwkPassword', size => 12, class => ""
-        </span>
-    %}
-    </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>
 
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC')) %>
+    <div>
+
+    <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' aria-describedby="enabled" checked >
+            % } else {
+                <input type='checkbox' name='Workstnbackup' aria-describedby="disabled">
+            % }
+            </div>
+        </div>
+
+        </p>
+        <p>
+        <h3>
+        %= l 'bac_WORKSTATION_BACKUP_DEST'
+        </h3>
+        <br>
+
+        % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputBackupWorkStationName" class="col-form-label"><%= l 'bac_WORKSTN_NAME' %></label>
+            </div>
+            <div class="col-auto">
+            % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
+                <input type="text" name="BackupwkStation" id="inputBackupWorkStationName" class="form-control"
+                size="20" aria-describedby="Workstation Name" value="<%= $bac_datas->{station} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % }
+
+        % if (  $bac_datas->{vfstype} eq 'usb' ) {
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <%= 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 => "form-select" %>
+                </div>
+            </div>
+
+            <br>
+
+        % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <%= 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 => "form-select" %>
+                </div>
+            </div>
+
+            <br>
+
+        % } else {
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <label for="inputBackupSharedFolderName" class="col-form-label"><%= l 'bac_SHARED_FOLDER_NAME' %></label>
+                </div>
+                <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' ) {
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <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';
+                    <input type="text" name="BackupwkLogin" id="inputBackupWorkLogin" class="form-control"
+                    size="12" aria-describedby="Backup Workstation Login" value="<%= $bac_datas->{login} %>">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <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';
+                    <input type="password" name="BackupwkPassword" id="password" class="form-control" size="12" aria-describedby="Backup Workstation Password" value="<%= $bac_datas->{password} %>">
+                </div>
+                <div class="col-auto">
+                    <span id="togglePassword" class="bi bi-eye"></span>
+                </div>
+            </div>
+        % }
+
+        <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}
+        % 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('NEXT')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+        <br>
+
+    </form>
 
-    %= hidden_field 'Function' => $bac_datas->{function}
-    %= hidden_field 'VFSType' => $bac_datas->{vfstype}
-    %= submit_button $c->l('bac_UPDATE_CONF'), class => ""
-    % end
 </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">
-    </div>
+            <%= $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><br>
+    <br>
-    % if ($bac_datas->{status} ne 'enabled') {
-    %= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
-    % } else {
-    %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify())
-    %}
 
-    <br><br><span class="">
+    <form action="/smanager/backupd" method="POST">
-    %=l 'bac_SELECT_BACKUP_FILE'
+
-    </span>
+        % if ($bac_datas->{status} ne 'enabled') {
-    <span class="">
+            <div>
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
+                <%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE')) %>
-    </span><br><br>
+            </div>
+        % } else {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+            </div>
+        % }
+
+        <br><br>
+
+        <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_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">
-    </div>
+            <%= $c->render_to_string(inline => stash 'error') %>
-    %}
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
+
+    <h2><%= l 'bac_WORKSTN_RESTORE' %></h2>
+
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div>
+            <%= $c->render_to_string(inline => $bac_datas->{restore_log}) %>
+        </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>
 
-    <h2>
-    %=l 'bac_WORKSTN_RESTORE'
-    </h2>
-    <p>
-    %= $c->render_to_string(inline => $bac_datas->{restore_log})
-    </p><p>
-    %=l 'bac_YOU_MUST_REBOOT'
-    </p>
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_REBOOT'), class => ""
-    % end
 </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>
 
-    <h3><%=l 'bac_BACKUP_CHOICE' %></h3>
+    <form action="/smanager/backupd" method="POST">
 
-    <br>
+        <div>
-    <span class="">
+            <%= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
-    %=l 'bac_SELECT_BACKUP_FILE'
+        </div>
-    </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
+        <br>
+
+        <h3><%= l 'bac_BACKUP_CHOICE' %></h3>
+
+        <br>
+
+
+        <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">
-    </div>
+            <%= $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>
 
-    <br><span class="">
+    <form action="/smanager/backupd" method="POST">
-    %=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 => ""
+        <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>
 
-    % end
+        <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>
+
+        %= hidden_field 'Function' => $bac_datas->{'function'}
+        %= hidden_field 'Backupset' => $bac_datas->{'backupset'}
+        %= hidden_field 'Filterexp' => $bac_datas->{'filterexp'}
+
+
+        % 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,59 +4,75 @@
 <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>
-        </div>
+    % }
-    %}
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_VERIFY_WORKSTN_BACKUP_FILE'
-    </h2>
-
-    %= form_for '/backup' => (method => 'POST') => begin
-
-    % if ($bac_datas->{status} ne 'enabled') {
-        %= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
-    % } else {
-        %= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify())
-    %}
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
-    </span>
     <br>
 
-    <p>
+    <h2><%=l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2>
-    <span class="">
-    %=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
-    </span>
-    <span class="">
-    %= check_box 'Verifyall'
-    </span>
-    </p>
-    <br>
 
-    %=l 'bac_CHECK_INTEGRITY_WARNING'
+    <form action="/smanager/backup" method="POST">
 
-    <br>
+        <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('bac_VERIFY'), class => ""
 
-    % end
+        % if ($bac_datas->{status} ne 'enabled') {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE')) %>
+            </div>
+        % } else {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+            </div>
+        % }
+
+        <br><br>
+
+        <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_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'
+
+        <br>
+        <br>
+        %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
+
+        % 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'} -->
+        <!--  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'}
+        %= 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/backdown.html.ep

@@ -1,6 +1,6 @@
 <%
 
-    my $backups = esmith::BackupHistoryDB->open;
+    my $backups = esmith::BackupHistoryDB->open; # no UTF8
     my $now = time();
     my $backup_rec = $backups->new_record($now, {
         type => 'backup_record', BackupType => 'desktop',
@@ -22,7 +22,7 @@
     my $success = open my $fh, '-|', $cmd;
     #unless ($success) { return "Error download command."; };
     if ($success) {
-        # Try with download plugin - seems to fail to complete download and also 
+        # Try with download plugin - seems to fail to complete download and also
         # name of file deposited is not as required.
         #my $output = do { local $/; <$fh> };
         #close $fh;

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

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

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

@@ -2,11 +2,11 @@
 
 % content_for 'module' => begin
 
-  % if ( config 'debug' ) {
+  % if (config->{debug} == 1) {
   <div>
-  <!-- %= dumper $c->current_route -->
+      <%= dumper $c->current_route %>
       % if ( stash 'trt' ) {
-          %= dumper stash 'trt'
+          <%= dumper stash 'trt' %>
       % }
   </div>
   % }
@@ -67,7 +67,7 @@
 
             <div class="input-group mb-1">
               <div class="form-floating">
-                <input type="password" name="Password" id="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>
               </div>
               <div class="input-group-text">

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

@@ -28,7 +28,7 @@
                 <th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
                 <th class="col-sm"><%=l 'dom_CONTENT' %></th>
                 <th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
-                <th class="col-sm user-valign-center" colspan="2"><%=l 'ACTION' %></th>
+                <th class="col-sm text-center" colspan="2"><%=l 'ACTION' %></th>
             </tr>
         </thead>
 
@@ -65,10 +65,10 @@
                                 %   </button>
                                 % </a>
                             %};
-                        %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
+                        %# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
                     %};
-                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
                 </tr>
             % }
 

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

@@ -24,7 +24,7 @@
                 <tr>
                     <th class="col-sm"><%= l 'GROUP' %></th>
                     <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                    <th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
                 </tr>
             </thead>
             <tbody>
@@ -54,8 +54,8 @@
                                 % </a>
                             %};
 
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
                     </tr>
                 % }
             </tbody>

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

@@ -26,7 +26,7 @@
                     <th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
                     <th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
                     <th class="col-auto"><%= l 'COMMENT' %></th>
-                    <th class="user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                    <th class="align-middle" colspan="2"><%= l 'ACTION' %></th>
                 </tr>
             </thead>
 
@@ -63,8 +63,8 @@
                                 % </a>
                             %};
                         % }
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
                 </tr>
                % }

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

@@ -36,7 +36,7 @@
                  <tr>
                      <th class="col-sm"><%= l 'NAME' %></th>
                      <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-                     <th class="col-sm user-valign-center" colspan="3"><%= l 'ACTION' %></th>
+                     <th class="col-sm align-middle" colspan="3"><%= l 'ACTION' %></th>
                  </tr>
              </thead>
 
@@ -103,9 +103,9 @@
                              % </a>
                              %};
                          % }
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw)%></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionResetPw)%></td>
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
                      </td>
                  </tr>
              % }

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

@@ -19,33 +19,31 @@
         <br>
 
 
-        <div>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
             <%= l 'PASSWORD_NEW' %>
         </div>
-
+        <div class="col-auto">
-        <br>
+            <input name="newPass" id="password" type="password" class="form-control sme-password" placeholder="Password" autocomplete="on">
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-            <input name="newPass" id="newPass" type="password" class="form-control sme-password" placeholder="Password">
-            </div>
         </div>
+        <div class="col-auto">
+            <span id="togglePassword" class="bi bi-eye"></span>
+        </div>
+    </div>
 
-        <br>
+    <br>
 
-        <div>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
             <%= 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 class="row g-3 align-items-center">
-            <div class="col-md-2">
-            <input name="newPassVerify" id="newPassVerify" type="password" class="form-control sme-password" placeholder="Password">
-            </div>
         </div>
-
+        <div class="col-auto">
-        <br>
+            <span id="togglePasswordVerify" class="bi bi-eye"></span>
+        </div>
+    </div>
 
         <br><br>
 

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

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

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

@@ -1,42 +1,43 @@
 <div>
 
-    % my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-    % my %ret;
+    % my %ret = $retref ? %$retref : (ret => "");
-    % unless (length($retref)) {%ret = (ret=>"");}
+    % my @vars = split(/,/, $ret{vars} // '');
-    % else {%ret = %$retref;}
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-    % my @vars = split(",",$ret{vars});
+    % if ($c->app->config->{debug}) {
-    % my $var1 = @vars[0];
+        <br>
-    % my $var2 = @vars[1];
+        <pre>
-    % my $var3 = @vars[2];
+            <%= dumper { ret_data => \%ret } %>
-    % my $var4 = @vars[3];
+        </pre>
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
-
-    %if ($ret{'ret'} eq "") {
-
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <h2> Operation Status Report</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
-        </div>
-       %} else {
-       <div class="">
-           <h2> Operation Status Report - Error</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
-        </div>
-    %}
-    <br />
-    % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
-
-   % if (config->{debug} == 1) {
-    <div>
-        <%= dumper $c->current_route %>
-        <%= dumper $c->stash("ret") %>
-    </div>
     % }
 
+	% if ($ret{ret} eq "") {
+		<div>
+            <%= l "ln_FIRSTPAGE_DESC" %>
+        </div>
+        % } elsif (index($ret{ret},"SUCCESS") != -1) {
+           <div>
+               <!-- <h2> Operation Status Report</h2> -->
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+            </div>
+        % } else {
+           <div class="text-danger">
+               <!-- <h2> Operation Status Report - Error</h2> -->
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+            </div>
+    % }
+
+    <br>
+
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
+
+    % if (config->{debug} == 1) {
+        <div>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+        </div>
+    % }
 
     <form action="/smanager/localnetworksb" method="POST">
         <div>
@@ -54,7 +55,7 @@
               <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" >
+              <input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="Network" >
             </div>
         </div>
 
@@ -65,7 +66,7 @@
               <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" >
+              <input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="Network Subnet Mask" >
             </div>
         </div>
 
@@ -76,17 +77,20 @@
               <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" >
+              <input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="Network Router" >
             </div>
         </div>
 
         <br><br>
 
+        % my $btn = l('ADD');
+
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
+
     </form>
 
 </div>

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

@@ -6,22 +6,22 @@
     % my $router = $ln_datas->{router};
 
    % if (config->{debug} == 1) {
-    <div>
+    <pre>
         <%= dumper $c->current_route %>
         <%= dumper $c->stash("ret") %>
         <%= dumper %$ln_datas %>
         <%= dumper $deletehosts %>
-    </div>
+    </pre>
     % }
 
     <form action="/smanager/localnetworkse" method="POST">
 
         <div>
-            <h2><%=l "ln_REMOVE_TITLE" %></h2>
+            <h2><%= l "ln_REMOVE_TITLE" %></h2>
         </div>
 
         <div>
-            <%=l "ln_REMOVE_DESC" %>
+            <%= l "ln_REMOVE_DESC" %>
         </div>
 
         <br><br>
@@ -60,29 +60,26 @@
         <br>
 
         % if ($deletehosts) {
-        <br>
+            <br>
 
-        <b>tell me if you find this!</b>
+            <div>
-
+                <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
-        <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
-        <br>
+            <br>
-        <span class="">
+            <div class="text-danger align-bottom">
-            <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
-        </span>
+            </div>
-        <span class="">
+            <br><br>
-            <%= check_box deletehost=>1, checked=>1 %>
-        </span>
-        <br><br>
         % }
 
+        <%= hidden_field localnetwork=>$localnetwork %>
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
 
-        <%= hidden_field localnetwork=>$localnetwork %>
-
     </form>
 
 </div>

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

@@ -1,100 +1,96 @@
 <div>
-    % my $btn = l('ln_LOCALNETWORK_ADD');
 
     <form action="/smanager/localnetworksa" method="POST">
 
         <br>
 
-        % my $retref= $c->stash("ret");
+        % my $retref = $c->stash("ret");
-        % my %ret;
+        % my %ret = $retref ? %$retref : (ret => "");
-        % unless (length($retref)) {%ret = (ret=>"");}
+        % my @vars = split(/,/, $ret{vars} // '');
-        % else {%ret = %$retref;}
+        % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-        % if (config->{debug} == 1) {
+        % if ($c->app->config->{debug}) {
-            <div>
+            <br>
-                %= dumper "Ret:".$ret{ret};
+            <pre>
-            </div>
+                <%= dumper { ret_data => \%ret } %>
+            </pre>
         % }
 
-        % my @vars = split(",",$ret{vars});
+        % if ($ret{ret} eq "") {
-        % my $var1 = @vars[0];
-        % my $var2 = @vars[1];
-        % my $var3 = @vars[2];
-        % my $var4 = @vars[3];
-        % my $var5 = @vars[4];
-        % my $var6 = @vars[5];
-        % my $var7 = @vars[6];
-
-        %if ($ret{ret} eq "") {
             <%= l "ln_FIRSTPAGE_DESC" %>
         % } elsif (index($ret{ret},"SUCCESS") != -1) {
+            <h2> Operation Status Report</h2>
             <br>
             <div>
-                <h2> Operation Status Report</h2>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
             </div>
         % } else {
-            <div>
+            <h2> Operation Status Report - Error</h2>
+            <br>
+            <div class="text-danger">
                 <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}, @vars[0..6])) %>
             </div>
         % }
 
         <br><br>
 
+        % my $btn = l('ln_LOCALNETWORK_ADD');
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
 
-    </form>
-
-    <br>
-    % my $numlocalnetworks = @$localnetworks;
-    % if ($numlocalnetworks == 0) {
-        <%= l 'ln_LOCAL_NETWORK_NONE' %>
-    % } else {
         <br>
-        <table class="table table-bordered">
+
-            <thead>
+        % my $numlocalnetworks = @$localnetworks;
-                <tr>
+        % if ($numlocalnetworks == 0) {
-                    <th><%= l 'NETWORK' %></th>
+            <%= l 'ln_LOCAL_NETWORK_NONE' %>
-                    <th><%= l 'ln_SUBNET_MASK' %></th>
+        % } else {
-                    <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
+            <br>
-                    <th><%= l 'ROUTER' %></th>
+            <table class="table table-bordered">
-                    <th><%= l 'ACTION' %></th>
+                <thead>
-                </tr>
+                    <tr>
-            </thead>
+                        <th><%= l 'NETWORK' %></th>
-            <tbody>
+                        <th><%= l 'ln_SUBNET_MASK' %></th>
-                % foreach my $localnetwork (@$localnetworks ) {
+                        <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
-                    % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
+                        <th><%= l 'ROUTER' %></th>
-                    % my $removable = $localnetwork->prop('Removable') || "yes";
+                        <th class="text-center"><%= l 'ACTION' %></th>
-                    % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
+                    </tr>
-                    % if ( $system eq "yes" ) { $removable = "no"; }
+                </thead>
-                        <tr>
+                <tbody>
-                            <td><%= $localnetwork->key %>
+                    % foreach my $localnetwork (@$localnetworks ) {
-                            <td><%= $localnetwork->prop('Mask') %>
+                        % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
-                            <td><%= $num_hosts %>
+                        % my $removable = $localnetwork->prop('Removable') || "yes";
-                            <td><%= $localnetwork->prop('Router') %>
+                        % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
-                            % my $actionRemove = '&nbsp;';
+                        % if ( $system eq "yes" ) { $removable = "no"; }
-                            % if ($removable eq "yes") {
+                            <tr class="align-middle">
-                                %my $remove_text = l('REMOVE');  # Localized text
+                                <td><%= $localnetwork->key %></td>
-                                %my $local_network_entry = $localnetwork->key;
+                                <td><%= $localnetwork->prop('Mask') %></td>
-                                %my $csrf_token = "TOKEN";  # CSRF token for security
+                                <td><%= $num_hosts %></td>
-                                %$actionRemove = qq{
+                                <td><%= $localnetwork->prop('Router') %></td>
-                                % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
+                                % my $actionRemove = '&nbsp;';
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                % if ($removable eq "yes") {
-                                %       $remove_text
+                                    %my $remove_text = l('REMOVE');  # Localized text
-                                %   </button>
+                                    %my $local_network_entry = $localnetwork->key;
-                                % </a>
+                                    %my $csrf_token = "TOKEN";  # CSRF token for security
-                                %};
+                                    %$actionRemove = qq{
-                            % }
+                                    % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
-                            <td><%= $c->render_to_string(inline => $actionRemove) %></td>
+                                    %   <button type='button' class="btn btn-primary" title='$remove_text' >
-                        </tr>
+                                    %       $remove_text
-                    % }
+                                    %   </button>
-            </tbody>
+                                    % </a>
-        </table>
+                                    %};
-        <%= hidden_field 'trt' => $ln_datas->{trt} %>
+                                % }
-    % }
+                                <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                            </tr>
+                        % }
+                </tbody>
+            </table>
+            <%= hidden_field 'trt' => $ln_datas->{trt} %>
+        % }
+
+    </form>
 </div>

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

@@ -1,95 +1,122 @@
 <div>
 
-    % my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-    % my %ret;
+    % my %ret = $retref ? %$retref : (ret => "");
-    % unless (length($retref)) {%ret = (ret=>"");}
+    % my @vars = split(/,/, $ret{vars} // '');
-    % else {%ret = %$retref;}
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
-    
-    % my @vars = split(",",$ret{vars});
-    % my $var1 = @vars[0];
-    % my $var2 = @vars[1];
-    % my $var3 = @vars[2];
-    % my $var4 = @vars[3];
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
 
     <br>
-    %if ($ret{'ret'} eq "") {
-    
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-       %} else { 
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-    %}
-    <br />
-    % my $btn = l('ADD');
-    
-   % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    </p>
-    % }
-     
-    %= form_for '/portforwardingb' => (method => 'POST') => begin
-        <h2>
-        %=l "pf_CREATE_RULE"
-        </h2>
-            <p>
-                %=l "pf_SUMMARY_ADD_DESC"
-            </p><br>
-            <span class="">
-                %=l "pf_LABEL_PROTOCOL"
-            </span>
-            <span class="">
-                %=select_field  'proto'=>["TCP","UDP"]
-            </span><br><br>
-            <span class="">
-                %=l "pf_LABEL_SOURCE_PORT"
-            </span>
-            <span class="">
-                %=text_field 'sport'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_PORT"
-            </span>
-            <span class="">
-                %=text_field 'dport'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_HOST"
-            </span>
-            <span class="">
-                %=text_field 'dhost'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_ALLOW_HOSTS"
-            </span>
-            <span class="">
-                %=text_field 'allow'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_RULE_COMMENT"
-            </span>
-            <span class="">
-                %=text_field 'cmmnt'
-            </span>
-            <br><br>
-            <p>
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>
 
-    %end
+   % if (config->{debug} == 1) {
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $c->stash("ret") %>
+    </pre>
+    % }
+
+    % if ($ret{'ret'} eq "") {
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
+       <div>
+           <!--<h2> Operation Status Report</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % } else {
+       <div class="text-danger">
+           <!--<h2> Operation Status Report - Error</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % }
+
+    <br>
+
+    <h2><%= l "pf_CREATE_RULE" %></h2>
+
+      <form action="/smanager/portforwardingb" method="POST">
+
+        <br>
+        <div>
+            <%= l "pf_SUMMARY_ADD_DESC" %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l "pf_LABEL_PROTOCOL" %>
+            </div>
+            <div class="col-auto">
+                <%=select_field  'proto'=>["TCP","UDP"], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSourcePort" class="col-form-label"><%= l "pf_LABEL_SOURCE_PORT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="sport" id="inputSourcePort" class="form-control" aria-describedby="Source Port">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputDestinationPort" class="col-form-label"><%= l "pf_LABEL_DESTINATION_PORT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="port" id="inputDestinationPort" class="form-control" aria-describedby="Destination Port">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputDestinationHost" class="col-form-label"><%= l "pf_LABEL_DESTINATION_HOST" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="dhost" id="inputDestinationHost" class="form-control" aria-describedby="Destination Host">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputAllowHosts" class="col-form-label"><%= l "pf_ALLOW_HOSTS" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="allow" id="inputAllowHosts" class="form-control" aria-describedby="Allow Hosts">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputRuleComment" class="col-form-label"><%= l "pf_RULE_COMMENT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="cmmnt" id="inputRuleComment" class="form-control" aria-describedby="Comment">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('ADD');
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

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

@@ -1,73 +1,98 @@
 <div>
 
-    % my $btn = l('REMOVE');
     % my $proto = $pf_datas->{proto};
     % my $sport = $pf_datas->{sport};
     % my $dport = $pf_datas->{dport};
     % my $dhost = $pf_datas->{dhost};
     % my $cmmnt = $pf_datas->{cmmnt};
     % my $allow = $pf_datas->{allow};
-    
-   % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    %= dumper %$pf_datas
-    </p>
-    % }
-     
-    %= form_for '/portforwardinge' => (method => 'POST') => begin
-        <br>
-        %= l "pf_SUMMARY_REMOVE_DESC"
-            </p><br>
-            <span class="">
-                %=l "pf_LABEL_PROTOCOL"
-            </span>
-            <span class="">
-                %=$proto
-            </span><br><br>
-            <span class="">
-                %=l "pf_LABEL_SOURCE_PORT"
-            </span>
-            <span class="">
-                %=$sport
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_HOST"
-            </span>
-            <span class="">
-                %=$dport
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_PORT"
-            </span>
-            <span class="">
-                %=$dhost
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_RULE_COMMENT"
-            </span>
-            <span class="">
-                %=$cmmnt
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_ALLOW_HOSTS"
-            </span>
-            <span class="">
-                %=$allow
-            </span>
-            <br><br>
-        %#}
-            %= hidden_field sport=>$sport
-            %= hidden_field proto=>$proto
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>
 
-    %end
+   % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+            <%= dumper %$pf_datas %>
+        </pre>
+    % }
+
+    <form action="/smanager/portforwardinge" method="POST">
+
+        <br>
+        <div>
+            <%= l 'pf_SUMMARY_REMOVE_DESC' %>
+        </div>
+
+        <br>
+
+        <table>
+        <thead>
+            <th class="col-md-4">&nbsp</th>
+            <th class="col-md-4">&nbsp</th>
+        </thead>
+            <tbody>
+                <tr >
+                    <td>
+                        <%= l 'pf_LABEL_PROTOCOL' %>
+                    </td>
+                    <td>
+                       <%= $proto %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_SOURCE_PORT' %>
+                    </td>
+                    <td>
+                       <%= $sport %>
+                    </td>
+                <tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_DESTINATION_HOST' %>
+                    </td>
+                    <td>
+                       <%= $dport %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_DESTINATION_PORT' %>
+                    </td>
+                    <td>
+                       <%= $dhost %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_RULE_COMMENT' %>
+                    </td>
+                    <td>
+                        <%= $cmmnt %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_ALLOW_HOSTS' %>
+                    </td>
+                    <td>
+                        <%= $allow %>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+        <br>
+
+        <%= hidden_field sport=>$sport %>
+        <%= hidden_field proto=>$proto %>
+
+        % 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/_pf_list.html.ep

@@ -1,120 +1,111 @@
 <div>
-    % my $btn = l('pf_CREATE_RULE');
-    %= form_for '/portforwardinga' => (method => 'POST') => begin
 
-    % my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-    % my %ret;
+    % my %ret = $retref ? %$retref : (ret => "");
-    % unless (length($retref)) {%ret = (ret=>"");}
+    % my @vars = split(/,/, $ret{vars} // '');
-    % else {%ret = %$retref;}
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
- 
+
     % my $numtcpforwards = @$tcpforwards;
     % my $numudpforwards = @$udpforwards;
 
-    % my @vars = split(",",$ret{vars});
+    % if ($c->app->config->{debug}) {
-    % my $var1 = @vars[0];
+        <pre>
-    % my $var2 = @vars[1];
+            <%= dumper { ret_data => \%ret } %>
-    % my $var3 = @vars[2];
+        </pre>
-    % my $var4 = @vars[3];
+    % }
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
 
-    %if ($ret{ret} eq "") {
+    % if ($ret{ret} eq "") {
-        %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
+        <div>
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
-        <br>
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
         </div>
-       %} else { 
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
-        <br>
+
-       <div class="">
+        <div>
-           <!--<h2> Operation Status Report - Error</h2>-->
+           <h2> Operation Status Report</h2>
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-        </div>
+        </div>
-    %}
+    % } else {
+        <br>
+        <div class="text-danger">
+           <h2> Operation Status Report - Error</h2>
+           <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % }
 
-    <p>
     <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
+    <form action="/smanager/portforwardinga" method="POST">
 
-    % end   
+    % my $btn = l('pf_CREATE_RULE');
-   
+
-    %   if ($empty){
+    <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>
+
+    % if ($empty) {
             <br>
-        %=l 'pf_NO_FORWARDS'
+            <%= l 'pf_NO_FORWARDS' %>
-    %   } else {
+    % } else {
         <br>
-        %=l 'pf_SHOW_FORWARDS'
+        <%= l 'pf_SHOW_FORWARDS' %>
-    <br><br />
+        <br><br>
         <table class="table table-bordered">
-        <thead>
+            <thead>
-        <tr>
-            <th class="">
-                %=l 'pf_LABEL_PROTOCOL'
-            </th>
-            <th class="">
-                %=l 'pf_LABEL_SOURCE_PORT'
-            </th>
-            <th class="">
-                %=l 'pf_LABEL_DESTINATION_HOST'
-            </th>
-            <th class="">
-                %=l 'pf_LABEL_DESTINATION_PORT'
-            </th>
-            <th class="">
-                %=l 'pf_ALLOW_HOSTS'
-            </th>
-            <th class="">
-                %=l 'pf_RULE_COMMENT'
-            </th>
-            <th class="" '>
-                %=l 'ACTION'
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-        % my %forwards = ();
-        % $forwards{TCP} = $tcpforwards;
-        % $forwards{UDP} = $udpforwards;
-
-        % foreach my $proto (sort keys %forwards) {
-
-        %    if (@{ $forwards{$proto} }) {
-        %        foreach my $entry (@{ $forwards{$proto} }) {
             <tr>
-        %           my $sport = $entry->key;
+                <th><%= l 'pf_LABEL_PROTOCOL' %></th>
-        %           my $dhost = $entry->prop('DestHost');
+                <th><%= l 'pf_LABEL_SOURCE_PORT' %></th>
-        %           my $dport = $entry->prop('DestPort') || '';
+                <th><%= l 'pf_LABEL_DESTINATION_HOST' %></th>
-        %           my $cmmnt  = $entry->prop('Comment') || '';
+                <th><%= l 'pf_LABEL_DESTINATION_PORT' %></th>
-        %           my $allow  = $entry->prop('AllowHosts') || '';
+                <th><%= l 'pf_ALLOW_HOSTS' %></th>
-        %=          t td => (class => "") => $proto
+                <th><%= l 'pf_RULE_COMMENT' %></th>
-        %=          t td => (class => "") => $sport
+                <th class="text-center"><%= l 'ACTION' %></th>
-        %=          t td => (class => "") => $dhost
-        %=          t td => (class => "") => $dport
-        %=          t td => (class => "") => $allow
-        %=          t td => (class => "") => $cmmnt
-                    <td class="">
-                        %my $remove_text = l('REMOVE');  # Localized text
-                        %my $csrf_token = "TOKEN";  # CSRF token for security
-                        %my $actionRemove = qq{
-                                                %       <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
-                        %   <button type='button' class="" title='$remove_text' >
-                        %       $remove_text
-                        %   </button>
-                                                %       </a>
-                        %};
-                    <%= $c->render_to_string(inline => $actionRemove) %>
-                    </td>
             </tr>
-         %       }
+            </thead>
-         %   }
+            <tbody>
-        %}
+                % my %forwards = ();
-    %}
+                % $forwards{TCP} = $tcpforwards;
-    </tbody>
+                % $forwards{UDP} = $udpforwards;
-    </table>
+
-    %= hidden_field 'trt' => $pf_datas->{trt}
+                % foreach my $proto (sort keys %forwards) {
- 
+
+                    % if (@{ $forwards{$proto} }) {
+                        % foreach my $entry (@{ $forwards{$proto} }) {
+                            <tr class="align-middle">
+                                % my $sport = $entry->key;
+                                % my $dhost = $entry->prop('DestHost');
+                                % my $dport = $entry->prop('DestPort') || '';
+                                % my $cmmnt  = $entry->prop('Comment') || '';
+                                % my $allow  = $entry->prop('AllowHosts') || '';
+                                <td><%= $proto %></td>
+                                <td><%= $sport %></td>
+                                <td><%= $dhost %></td>
+                                <td><%= $dport %></td>
+                                <td><%= $allow %></td>
+                                <td><%= $cmmnt %></td>
+                                % my $remove_text = l('REMOVE');  # Localized text
+                                % my $csrf_token = "TOKEN";  # CSRF token for security
+                                % my $actionRemove = qq{
+                                % <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                                % };
+
+                                <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                            </tr>
+                            % }
+                        % }
+                    % }
+                % }
+            </tbody>
+        </table>
+    <%= hidden_field 'trt' => $pf_datas->{trt} %>
+
 </div>

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

@@ -1,51 +1,61 @@
 <div>
 
-    %   my $btn = l('ADD');
+    <h2><%=l 'prt_CREATE_NEW_PRINTER' %></h2>
 
-    %= form_for '/printers2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'prt_CREATE_NEW_PRINTER'
-    </h2>
-    <br>
-    %=l 'prt_CREATE_NEW_DESC'
-    </p>
     <br>
 
-    <p>
+    <form action="/smanager/printers2" method="POST">
-    <span class="">
-    %=l 'prt_PRINTER_NAME', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Name', class => ""
-    </span>
-    </p>
 
-    <p>
+        <br>
-    <span class="">
-    %=l 'DESCRIPTION_BRIEF', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Description', class => ""
-    </span>
-    </p>
 
-    <p>
+        <div>
-    <span class="">
+            <%= l 'prt_CREATE_NEW_DESC' %>
-    %=l 'LOCATION', class => ""
+        </div>
-    </span>
-    <span class="">
-    %= select_field 'Location' => $c->printerLocation_list(), class => ""
-    </span>
-    </p>
 
-    <p>
+        <br>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
 
-    %= hidden_field 'trt' => $prt_datas->{trt}
+            <div class="row g-3 align-items-center">
-    
+                <div class="col-md-1">
-    % end    
+                    <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');
+
+        <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_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,82 +1,72 @@
 <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){
+    % my $numPrinters = @$printerDrivers;
-        %=l 'prt_NO_PRINTERS'
+    % if ($numPrinters == 0){
-    %   } else {
+          <%= l 'prt_NO_PRINTERS' %>
-    <table class="table table-bordered">
+    % } else {
-    <thead>
+            <table class="table table-bordered">
-    <tr>
+               <thead>
-            <th class="">
+                   <tr>
-            %=l 'NAME'
+                           <th><%= l 'NAME' %></th>
-            </th>
+                           <th><%= l 'DESCRIPTION' %></th>
-            <th class="">
+                           <th><%= l 'LOCATION' %></th>
-            %=l 'DESCRIPTION'
+                           <th><%= l 'prt_REMOTE_ADDRESS' %></th>
-            </th>
+                           <th><%= l 'prt_REMOTE_NAME' %></th>
-            <th class="">
+                           <th><%= l 'ACTION' %></th>
-            %=l 'LOCATION'
+                   </tr>
-            </th>
+                   </thead>
-            <th class="">
+                <tbody>
-            %=l 'prt_REMOTE_ADDRESS'
+                % foreach my $printer (@$printerDrivers) {
-            </th>
+                %     my $address = ($printer->prop('Location') eq 'remote')
-            <th class="">
+                %     ? $printer->prop('Address') : 'N/A';
-            %=l 'prt_REMOTE_NAME'
+                %     my $remoteName = ($printer->prop('Location') eq 'remote')
-            </th>
+                %     ? $printer->prop('RemoteName') : 'N/A';
-            <th class="">
+                %     $remoteName = 'raw' unless ($remoteName);
-            %=l 'ACTION'
+
-            </th>
+                    <tr class="align-middle">
-        </tr>
+                        <td><%= $printer->key %></td>
-        </thead>
+                        <td><%= $printer->prop('Description') %></td>
-        <tbody>
+                        <td><%= $printer->prop('Location') %></td>
-    %    foreach my $printer (@$printerDrivers)
+                        <td><%= $address %></td>
-    %    {
+                        <td><%= $remoteName %></td>
-    %        my $address = ($printer->prop('Location') eq 'remote')
+                        <td>
-    %        ? $printer->prop('Address') : 'N/A';
+                            % my $remove_text = l('REMOVE');  # Localized text
-    %        my $remoteName = ($printer->prop('Location') eq 'remote')
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
-    %        ? $printer->prop('RemoteName') : 'N/A';
+                            % my $printer_name = $printer->key;
-    %        $remoteName = 'raw' unless ($remoteName);
+                            % my $actionRemove = qq{
-        <tr>
+                            % <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
-            %= t td => (class => "") => $printer->key
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
-            %= t td => (class => "") => $printer->prop('Description')
+                            %   $remove_text
-            %= t td => (class => "") => $printer->prop('Location')
+                            %   </button>
-            %= t td => (class => "") => $address
+                            % </a>
-            %= t td => (class => "") => $remoteName
+                            % };
-            <td class="">
+                            <%= $c->render_to_string(inline => $actionRemove) %>
-                %my $remove_text = l('REMOVE');  # Localized text
+                        </td>
-                %my $csrf_token = "TOKEN";  # CSRF token for security
+                    </tr>
-                %my $printer_name = $printer->key;
+                % }
-                %my $actionRemove = qq{
+                </tbody>
-                                %       <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
+            </table>
-                %   <button type='button' class="" title='$remove_text' >
+    % }
-                %       $remove_text
+
-                %   </button>
-                                %       </a>
-                %};
-            <%= $c->render_to_string(inline => $actionRemove) %>
-            </td>
-        </tr>
-    %    }
-        </tbody>
-        </table>
-    <%} %>
-    </p>
 
 
 </div>

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

@@ -17,7 +17,7 @@
             </div>
 
             <div class="col-auto">
-                <input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="PseudonymDesc"  >
+                <input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="Pseudonym Description"  >
             </div>
         </div>
 

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

@@ -22,9 +22,9 @@
     <table class="table table-bordered user-table-max-width">
         <thead>
             <tr>
-                    <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
+                <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
-                    <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
+                <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
-                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                <th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
                 <!-- <th class="" style="display: normal;"></th> -->
             </tr>
         </thead>
@@ -57,7 +57,7 @@
                             %   $modify_text
                             %   </button>
                             % </a>
-                            %};
+                            % };
                         % }
 
                         % if ($removable eq 'yes')  {
@@ -70,11 +70,11 @@
                             %   $remove_text
                             %   </button>
                             % </a>
-                            %};
+                            % };
                         % }
 
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
                 </tr>
             % }

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

@@ -4,13 +4,24 @@
 
     <%= $modul %>
 
+    % if (config->{debug} == 1) {
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $userAccounts %>
+    </pre>
+    % }
+
     <h2><%= l 'quo_CURRENT_USAGE_AND_SETTINGS' %></h2>
 
     <br>
 
     % my $numUsers = @$userAccounts;
+
+
     % if ($numUsers == 0){
-        <%= l 'ACCOUNT_USER_NONE' %>
+        <div>
+            <%= l 'ACCOUNT_USER_NONE' %>
+        </div>
     % } else {
 
         % my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
@@ -25,21 +36,28 @@
                     <th class="col-sm"><%= $limit %></th>
                     <th class="col-sm"><%= $absolute %></th>
                     <th class="col-sm"><%= $current %></th>
-                    <th class="col-sm user-valign-center"><%= l 'ACTION' %></th>
+                    <th class="col-sm align-middle"><%= l 'ACTION' %></th>
                 </tr>
             </thead>
 
             <tbody>
 
             % foreach my $user (@$userAccounts) {
-            %     my $uid = getpwnam($user->key);
+
-            %     unless ($uid) {
+            % my $uid = getpwnam($user->key);
-            %       warn($self->localise('COULD_NOT_GET_UID'),$user->key);
+
-            %       next;
+            % if (config->{debug} == 1) {
-            %     }
+                UID <%= l 'quo_COULD_NOT_GET_UID' %> <%= dumper $user->key %><br>
-            %     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);
+            <br>
+            % unless ($uid) {
+            %     warn (l 'quo_COULD_NOT_GET_UID', $user->key);
+            %     next;
+            % }
+            % my $name = $user->prop("FirstName")." ".$user->prop("LastName");
+            % my $dev = Quota::getqcarg('/home/e-smith/files');
+            % my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
 
                 <tr>
                     <td><%= $user->key %></td>
@@ -59,7 +77,7 @@
                     % </a>
                     %};
 
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
                 </tr>
             %    }
             </tbody>

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

@@ -22,12 +22,12 @@
     <div class="table-responsive">
         <table class="table table-bordered">
             <thead>
-                <tr class="">
+                <tr>
-                    <th><%=l 'ACCOUNT' %></th>
+                    <th><%= l 'ACCOUNT' %></th>
-                    <th><%=l 'USER_NAME' %></th>
+                    <th><%= l 'USER_NAME' %></th>
-                    <th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
+                    <th><%= l 'usr_VPN_CLIENT_ACCESS' %></th>
-                    <th><%=l 'usr_FORWARDING_ADDRESS' %></th>
+                    <th><%= l 'usr_FORWARDING_ADDRESS' %></th>
-                    <th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
+                    <th class="text-center text-center" colspan="5"><%= l 'ACTION' %></th>
                 </tr>
             </thead>
             <tbody>
@@ -54,7 +54,7 @@
             % 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>
@@ -136,17 +136,17 @@
                     <!-- If webmail disabled??? -->
                     % $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' >
+                         %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
                         %       $roundcube_text
                         %   </button>
                         %</a>
                     %};
 
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionLock) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
                 </tr>
                 % }
             </tbody>

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

@@ -43,31 +43,31 @@
         <%= l 'usr_RESET_DESC2' %>
     </div>
 
-    <br>
+    <br><br>
-
-    <div>
-        <%= l 'PASSWORD_NEW' %>
-    </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">
+            <%= 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>
-        <%= l 'PASSWORD_VERIFY_NEW' %>
-    </div>
-
-    <br>
-
     <div class="row g-3 align-items-center">
-        <div class="col-md-2">
+        <div class="col-md-1">
-            <input name="newPassVerify" id="newPassVerify" type="password" class="form-control sme-password" placeholder="Password">
+            <%= 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>
 

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

@@ -5,28 +5,29 @@
 <div  class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <pre>
-        %= dumper "<pf>".$c->current_route
+        <%= dumper "<pf>".$c->current_route %>
-        %= dumper $c->stash("ret")
+        <%= dumper $c->stash("ret") %>
-        %= dumper $c->stash("portforwarding")
+        <%= dumper $c->stash("portforwarding") %>
         %  my $ref = $pf_datas->{portforwarding};
-        %= dumper $ref->{TCP}->[0]."</pf>"
+        <%= dumper $ref->{TCP}->[0]."</pf>" %>
-    </p>
+    </pre>
     % }
-    
+
     <h1><%= $title%></h1>
-     %= $modul
+
+    %= $modul
 
     % if ($pf_datas->{trt} eq 'ADD') {
-        %= include 'partials/_pf_add'
+        <%= include 'partials/_pf_add' %>
-    %} elsif ($pf_datas->{trt} eq 'ADD1') {
+    % } elsif ($pf_datas->{trt} eq 'ADD1') {
-        %= include 'partials/_pf_add'
+        <%= include 'partials/_pf_add' %>
-    %} elsif ($pf_datas->{trt} eq 'DEL') {
+    % } elsif ($pf_datas->{trt} eq 'DEL') {
-        %= include 'partials/_pf_del'
+        <%= include 'partials/_pf_del' %>
-    %} elsif ($pf_datas->{trt} eq 'DEL1'){
+    % } elsif ($pf_datas->{trt} eq 'DEL1'){
-        %= include 'partials/_pf_list'
+        <%= include 'partials/_pf_list' %>
-    %} else {
+    % } else {
-        %= include 'partials/_pf_list'
+        <%= include 'partials/_pf_list' %>
     %}
 
 </div>

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

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

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

@@ -5,227 +5,281 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $rma_datas
+        <%= dumper $rma_datas %>
-    </p>
+        </pre>
     % }
+
     <h1><%= $title%></h1>
+
     % if ( $notif ) {
-    <br>
+        <br>
-    <span class="">
+        <div>
-    <%= $c->render_to_string(inline => $notif) %>
+            <%= $c->render_to_string(inline => $notif) %>
-    </span>
+        </div>
     %}
 
     <!--<hr class="" />-->
 
     <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'remoteaccess' => (method => 'POST') => begin
+
+    <form action="/smanager/remoteaccess" method="POST">
 
     % my $ipsec = $c->get_ipsecrw_status();
-    % if ( $ipsec ) {
+    <!-- reetp not tested -->
-    <p>
+    % if ( $ipsec) {
-    <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>
-    % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
+        <div>
-    %= text_field 'IpsecrwSess', class => ""
+            % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
-    </span>
+            <%= text_field 'IpsecrwSess', class => "" %>
-    <br>
+        </div>
-
+        <br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));
-    <br>
-    <span class="">
-    %=l 'rma_LABEL_IPSECRW_RESET'
-    </span>
-    <span class="">
-    %= check_box 'IpsecrwReset',class => ""
-    </span>
-    <br><br>
 
+        <div>
+            <%= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));  %>
+        </div>
+        <br>
+        <div>
+            <%= l 'rma_LABEL_IPSECRW_RESET' %>
+        </div>
+        <div>
+            <input type='checkbox' name='IpsecrwReset'>
+        </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();
     % if (@vals) {
-    <table class="table table-bordered">
+        <table class="table table-bordered">
-    <thead>
+            <thead>
-    <tr>
+                <tr>
-    <th class="">
+                    <th><%= l 'NETWORK' %></th>
-            %=l 'NETWORK'
+                    <th><%= l 'rma_SUBNET_MASK' %></th>
-            </th><th class="">
+                    <th><%= l 'rma_NUM_OF_HOSTS' %></th>
-            %=l 'SUBNET_MASK'
+                    <th><%= l 'REMOVE' %></th>
-            </th><th class="">
+                </tr>
-            %=l 'NUM_OF_HOSTS'
+            </thead>
-            </th><th class="">
+            <tbody>
-            %=l 'REMOVE'
-        </th>
-        </tr>
-        </thead>
-        </tbody>
 
-    %    foreach my $val ( @vals )
+            % foreach my $val ( @vals ) {
-    %    {
+                % my ($net, $mask) = split '/', $val;
-    %        my ($net, $mask) = split '/', $val;
+                % $mask = '255.255.255.255' unless ($mask);
-    %        $mask = '255.255.255.255' unless ($mask);
+                % my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
-    %        my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
+                <tr class="align-middle">
-        <tr>
+                    <td><%= $net %></td>
-            %= t td => (class => "") => $net
+                    <td><%= $mask %></td>
-            %= t td => (class => "") => $mask
+                    <td><%= $numhosts %></td>
-            %= t td => (class => "") => $numhosts
+                    <td>
-            <td class="">
+                    <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
-            <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
+                    </td>
-            </td>
+                </tr>
-        </tr>
+            % }
-    %    }
 
-        </tbody>
+            </tbody>
-        </table>    
+        </table>
 
     <!-- my @cbGroup = $q->checkbox_group(-name => 'validFromRemove',
         -values => [@vals], -labels => { map {$_ => ''} @vals });
             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="">
-    % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess';
-    %= select_field 'SshAccess' => $c->networkAccess_list(), class => ""
-    </span>
-    <br>
-    
-    <span class="">
-    %=l 'rma_LABEL_SSH_ADMIN'
-    </span>
-    <span class="">
-    % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
-    %= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
-    </span>
     <br>
 
-    <span class="">
+    <div>
-    %=l 'rma_LABEL_SSH_PASSWORD_ACCESS'
+        <%= l 'rma_DESC_SSH' %>
-    </span>
+    </div>
-    <span class="">
+
-    % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
+    <br><br>
-    %= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => ""
+
-    </span>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_SSH' %>
+        </div>
+        <div class="col-md-2">
+        % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess';
+        <%= select_field 'SshAccess' => $c->networkAccess_list(), class => "form-select" %>
+        </div>
+    </div>
+
     <br>
 
-    <span class="">
+    <div class="row g-3 align-items-center">
-    %=l 'rma_LABEL_SSH_PORT'
+        <div class="col-md-2">
-    </span>
+            <%= l 'rma_LABEL_SSH_ADMIN' %>
-    <span class="">
+        </div>
-    % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
+        <div class="col-auto">
-    %= text_field 'SshTCPPort', class => ""
+            % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
-    </span>
+            <%= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_SSH_PASSWORD_ACCESS' %>
+        </div>
+        <div class="col-auto">
+            % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
+            <%= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => "form-select" %>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <label for="inputSSHPort" class="col-form-label"><%= l 'rma_LABEL_SSH_PORT' %></label>
+        </div>
+        <div class="col-sm-1">
+            % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
+            <input type="text" name="SshTCPPort" id="inputSSHPort" class="form-control" aria-describedby="SSH Port" value="<%= $c->get_ssh_port() %>">
+        </div>
+    </div>
+
     <br>
 
     <!--<hr class="" />-->
 
-    <h2>
+    <br><br>
-    %=l 'rma_TITLE_FTP_ACCESS'
+    <h2><%= l 'rma_TITLE_FTP_ACCESS' %></h2>
-    </h2><br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS'));
-
-    <br>
-    <span class="">
-    %=l 'rma_LABEL_FTP_ACCESS'
-    </span>
-    <span class="">
-    % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess';
-    %= select_field 'FtpAccess' => $c->networkAccess_list(), class => ""
-    </span>
     <br>
 
+    <div>
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS')); %>
+    </div>
+
     <br>
-    %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN'));
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_FTP_ACCESS' %>
+        </div>
+        <div class="col-auto">
+            % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess';
+            <%= select_field 'FtpAccess' => $c->networkAccess_list(), class => "form-select" %>
+        </div>
+    </div>
+
     <br>
-    <span class="">
+    <br>
-    %=l 'rma_LABEL_FTP_LOGIN'
+
-    </span>
+    <div>
-    <span class="">
+        <%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN')); %>
-    % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess';
+    </div>
-    %= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => ""
+
-    </span>
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l 'rma_LABEL_FTP_LOGIN' %>
+        </div>
+        <div class="col-auto">
+            % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess';
+            <%= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => "form-select" %>
+        </div>
+    <div>
+
     <br>
 
     % my $mode = $c->get_telnet_mode();
     % if ( $mode ne 'off') {
-    <!--<hr class="" />-->
+        <!--<hr class="" />-->
 
-    <h2>
+        <h2><%= l 'rma_TITLE_TELNET_ACCESS' %></h2>
-    %=l 'rma_TITLE_TELNET_ACCESS'
-    </h2><br>
 
-    <span class="">
+        <br>
-    %=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_DESC_TELNET_ACCESS' %>
-    <span class="">
+            </div>
-    % param 'TelnetAccess' => $mode unless param 'TelnetAccess';
+        <div>
-    %= select_field 'TelnetAccess' => $c->networkAccess_list(), class => ""
-    </span>
-    <br>
 
-    %}
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rma_LABEL_TELNET_ACCESS' %>
+            </div>
+            <div class="col-auto">
+                % param 'TelnetAccess' => $mode unless param 'TelnetAccess';
+                <%= select_field 'TelnetAccess' => $c->networkAccess_list(), class => "form-select" %>
+            </div>
+        </div>
+
+        <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/userpassword.html.ep

@@ -16,7 +16,7 @@
     % if ( stash 'error' ) {
         <br>
         <div>
-            %= $c->render_to_string(inline => stash 'error') 
+            %= $c->render_to_string(inline => stash 'error')
         </div>
     %}
 
@@ -27,7 +27,7 @@
     <div>
         %= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
     </div>
-    
+
     % if ( $pwd_datas->{trt} eq 'RESET' ) {
     %    my $btn = l('pwd_PASSWORD_RESET');
     %    my $url = '/userpasswordr';
@@ -57,16 +57,16 @@
            </tr>
        </tbody>
     </table>
-    
+
     <br>
 
     % if ( $pwd_datas->{trt} ne 'RESET' ) {
         <div>
         <%= l 'pwd_PASSWORD_OLD' %>
         </div>
-        
+
         <br>
-        
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
             <input name="OldPass" id="OldPass" type="password" class="form-control sme-password" placeholder="Password">
@@ -74,14 +74,14 @@
         </div>
     % }
 
-    <br> 
+    <br>
 
     <div>
     <%= l 'pwd_PASSWORD_NEW' %>
     </div>
-    
+
     <br>
-    
+
     <div class="row g-3 align-items-center">
         <div class="col-md-2">
         <input name="Pass" id="Pass" type="password" class="form-control sme-password" placeholder="Password">
@@ -93,14 +93,14 @@
     <div>
     %=l 'pwd_PASSWORD_VERIFY_NEW'
     </div>
-    
+
     <br>
-    
+
     <div class="row g-3 align-items-center">
         <div class="col-md-2">
         <input name="Passverify" id="PassVerify" type="password" class="form-control sme-password" placeholder="Password">
         </div>
-    </div>   
+    </div>
 
     <br>
 

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

@@ -5,12 +5,12 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <div>
+        <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}%>
-    </div>
+        </pre>
-    %}
+    % }
 
     <h1><%= $title %></h1>
     <br>
@@ -29,8 +29,8 @@
                     <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" value="<%= $wkg_datas->{Workgroup}%>" >
+                    <input type="text" name="Workgroup" id="inputWorkgroup" class="form-control" aria-describedby="inputWorkgroup" maxlength="15" size="15" value="<%= $wkg_datas->{Workgroup}%>" >
-            </div>
+                </div>
                 <div class="col-auto">
                   <span id="passwordHelpInline" class="form-text">
                     Limited to 15 characters by the NETBIOS

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 31
+%define release 38
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -11,13 +11,12 @@ URL: https://adminlte.io/
 Group: SMEserver/addon
 source: %{name}-%{version}.tar.gz
 
-
 Packager: Brian Read <brianr@koozali.org>
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: smeserver-devtools
 Requires: smeserver-release >= 11.0
-Requires: smeserver-manager >= 11.0.0
+Requires: smeserver-manager >= 11.0.0-91
 Requires: smeserver-lib >= 11.0.0-13
 Requires: e-smith-manager >= 2.4.0-22
 
@@ -29,7 +28,45 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
-* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0.31.sme
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-38.sme
+- More formatting for LocalNetworks
+- More formatting for PortForwards
+
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-37.sme
+- Finish portforwarding to work with [SME:13043]
+
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-36.sme
+- Cosmetic tweaks
+- Localnetworking fix via [SME: 13041]
+- Portforwarding panels done but require fix to module similar to 13041 above.
+
+* 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