Update email templates, mai_data, button sizes, numerous tweaks

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

@@ -1,3 +1,6 @@
+html {
+    font-size: 14px;
+}
 
 #busy-indicator {
     display: none;
@@ -50,8 +53,8 @@
 }
 
 .login-page {
-    min-height: 10vh;
-    vertical-align: top !important;
+    min-height: 60vh !important ;
+    vertical-align: top !important ;
 }
 
 .nav-icon {
@@ -101,9 +104,12 @@
     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/Koozali-Spinner.js

@@ -0,0 +1,12 @@
+function spinner() {
+    const spinnerDisplayer = document.querySelector('.spinner-displayer');
+    const btn = document.getElementById('btn');
+
+    btn.addEventListener('click', () => {
+        spinnerDisplayer.classList.add('loading');
+    })
+}
+
+spinner();
+
+//        <div class='spinner-displayer'></div>

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

@@ -1,298 +0,0 @@
-document.addEventListener('DOMContentLoaded', () => {
-	const flagContainer = document.getElementById('flag-container');
-	// Mapping of language codes to country codes and their names
-	const languageToCountryMap = {
-		"af": { code: "NA", name: "Namibia" },
-		"agq": { code: "CM", name: "Cameroon" },
-		"ak": { code: "GH", name: "Ghana" },
-		"am": { code: "ET", name: "Ethiopia" },
-		"ar": { code: "SA", name: "Saudi Arabia" },
-		"as": { code: "IN", name: "India" },
-		"asa": { code: "TZ", name: "Tanzania" },
-		"ast": { code: "ES", name: "Spain" },
-		"az": { code: "AZ", name: "Azerbaijan" },
-		"bas": { code: "CM", name: "Cameroon" },
-		"be": { code: "BY", name: "Belarus" },
-		"bem": { code: "ZM", name: "Zambia" },
-		"bez": { code: "TZ", name: "Tanzania" },
-		"bg": { code: "BG", name: "Bulgaria" },
-		"bm": { code: "ML", name: "Mali" },
-		"bn": { code: "BD", name: "Bangladesh" },
-		"bo": { code: "CN", name: "China" },
-		"br": { code: "FR", name: "France" },
-		"brx": { code: "IN", name: "India" },
-		"bs": { code: "BA", name: "Bosnia and Herzegovina" },
-		"ca": { code: "AD", name: "Andorra" },
-		"ccp": { code: "BD", name: "Bangladesh" },
-		"ce": { code: "RU", name: "Russia" },
-		"cgg": { code: "UG", name: "Uganda" },
-		"chr": { code: "US", name: "United States" },
-		"ckb": { code: "IQ", name: "Iraq" },
-		"cs": { code: "CZ", name: "Czech Republic" },
-		"cy": { code: "GB", name: "United Kingdom" },
-		"da": { code: "DK", name: "Denmark" },
-		"dav": { code: "KE", name: "Kenya" },
-		"de": { code: "DE", name: "Germany" },
-		"dje": { code: "NE", name: "Niger" },
-		"dsb": { code: "DE", name: "Germany" },
-		"dua": { code: "CM", name: "Cameroon" },
-		"dyo": { code: "SN", name: "Senegal" },
-		"dz": { code: "BT", name: "Bhutan" },
-		"ebu": { code: "KE", name: "Kenya" },
-		"ee": { code: "GH", name: "Ghana" },
-		"el": { code: "CY", name: "Cyprus" },
-		"en": { code: "US", name: "United States" }, // Assume US for English if unspecified
-		"es": { code: "ES", name: "Spain" },
-		"et": { code: "EE", name: "Estonia" },
-		"eu": { code: "ES", name: "Spain" },
-		"ewo": { code: "CM", name: "Cameroon" },
-		"fa": { code: "AF", name: "Afghanistan" },
-		"ff": { code: "CM", name: "Cameroon" },
-		"fi": { code: "FI", name: "Finland" },
-		"fil": { code: "PH", name: "Philippines" },
-		"fo": { code: "FO", name: "Faroe Islands" },
-		"fr": { code: "FR", name: "France" },
-		"fur": { code: "IT", name: "Italy" },
-		"fy": { code: "NL", name: "Netherlands" },
-		"ga": { code: "IE", name: "Ireland" },
-		"gd": { code: "GB", name: "United Kingdom" },
-		"gl": { code: "ES", name: "Spain" },
-		"gsw": { code: "CH", name: "Switzerland" },
-		"gu": { code: "IN", name: "India" },
-		"guz": { code: "KE", name: "Kenya" },
-		"gv": { code: "IM", name: "Isle of Man" },
-		"ha": { code: "GH", name: "Ghana" },
-		"haw": { code: "US", name: "United States" },
-		"he": { code: "IL", name: "Israel" },
-		"hi": { code: "IN", name: "India" },
-		"hr": { code: "HR", name: "Croatia" },
-		"hsb": { code: "DE", name: "Germany" },
-		"hu": { code: "HU", name: "Hungary" },
-		"hy": { code: "AM", name: "Armenia" },
-		"id": { code: "ID", name: "Indonesia" },
-		"ig": { code: "NG", name: "Nigeria" },
-		"ii": { code: "CN", name: "China" },
-		"is": { code: "IS", name: "Iceland" },
-		"it": { code: "IT", name: "Italy" },
-		"ja": { code: "JP", name: "Japan" },
-		"jgo": { code: "CM", name: "Cameroon" },
-		"jmc": { code: "TZ", name: "Tanzania" },
-		"ka": { code: "GE", name: "Georgia" },
-		"kab": { code: "DZ", name: "Algeria" },
-		"kam": { code: "KE", name: "Kenya" },
-		"kde": { code: "TZ", name: "Tanzania" },
-		"kea": { code: "CV", name: "Cabo Verde" },
-		"khq": { code: "ML", name: "Mali" },
-		"ki": { code: "KE", name: "Kenya" },
-		"kk": { code: "KZ", name: "Kazakhstan" },
-		"kkj": { code: "CM", name: "Cameroon" },
-		"kl": { code: "GL", name: "Greenland" },
-		"kln": { code: "KE", name: "Kenya" },
-		"km": { code: "KH", name: "Cambodia" },
-		"kn": { code: "IN", name: "India" },
-		"ko": { code: "KP", name: "North Korea" },
-		"kok": { code: "IN", name: "India" },
-		"ks": { code: "IN", name: "India" },
-		"ksb": { code: "TZ", name: "Tanzania" },
-		"ksf": { code: "CM", name: "Cameroon" },
-		"ksh": { code: "DE", name: "Germany" },
-		"kw": { code: "GB", name: "United Kingdom" },
-		"ky": { code: "KG", name: "Kyrgyzstan" },
-		"lag": { code: "TZ", name: "Tanzania" },
-		"lb": { code: "LU", name: "Luxembourg" },
-		"lg": { code: "UG", name: "Uganda" },
-		"lkt": { code: "US", name: "United States" },
-		"ln": { code: "AO", name: "Angola" },
-		"lo": { code: "LA", name: "Laos" },
-		"lrc": { code: "IQ", name: "Iraq" },
-		"lt": { code: "LT", name: "Lithuania" },
-		"lu": { code: "CD", name: "Democratic Republic of the Congo" },
-		"luo": { code: "KE", name: "Kenya" },
-		"Luo": { code: "KE", name: "Kenya" },
-		"luy": { code: "KE", name: "Kenya" },
-		"lv": { code: "LV", name: "Latvia" },
-		"mas": { code: "KE", name: "Kenya" },
-		"mer": { code: "KE", name: "Kenya" },
-		"mfe": { code: "MU", name: "Mauritius" },
-		"mg": { code: "MG", name: "Madagascar" },
-		"mgh": { code: "MZ", name: "Mozambique" },
-		"mgo": { code: "CM", name: "Cameroon" },
-		"mk": { code: "MK", name: "North Macedonia" },
-		"ml": { code: "IN", name: "India" },
-		"mn": { code: "MN", name: "Mongolia" },
-		"mr": { code: "IN", name: "India" },
-		"ms": { code: "BN", name: "Brunei" },
-		"mt": { code: "MT", name: "Malta" },
-		"mua": { code: "CM", name: "Cameroon" },
-		"my": { code: "MM", name: "Myanmar" },
-		"mzn": { code: "IR", name: "Iran" },
-		"naq": { code: "NA", name: "Namibia" },
-		"nb": { code: "NO", name: "Norway" },
-		"nd": { code: "ZW", name: "Zimbabwe" },
-		"nds": { code: "DE", name: "Germany" },
-		"ne": { code: "IN", name: "India" },
-		"nl": { code: "NL", name: "Netherlands" },
-		"nmg": { code: "CM", name: "Cameroon" },
-		"nn": { code: "NO", name: "Norway" },
-		"nnh": { code: "CM", name: "Cameroon" },
-		"nus": { code: "SS", name: "South Sudan" },
-		"nyn": { code: "UG", name: "Uganda" },
-		"om": { code: "ET", name: "Ethiopia" },
-		"or": { code: "IN", name: "India" },
-		"os": { code: "GE", name: "Georgia" },
-		"pa": { code: "PK", name: "Pakistan" },
-		"pl": { code: "PL", name: "Poland" },
-		"ps": { code: "AF", name: "Afghanistan" },
-		"pt": { code: "PT", name: "Portugal" },
-		"qu": { code: "BO", name: "Bolivia" },
-		"rm": { code: "CH", name: "Switzerland" },
-		"rn": { code: "BI", name: "Burundi" },
-		"ro": { code: "RO", name: "Romania" },
-		"rof": { code: "TZ", name: "Tanzania" },
-		"ru": { code: "RU", name: "Russia" },
-		"rw": { code: "RW", name: "Rwanda" },
-		"rwk": { code: "TZ", name: "Tanzania" },
-		"sah": { code: "RU", name: "Russia" },
-		"saq": { code: "KE", name: "Kenya" },
-		"sbp": { code: "TZ", name: "Tanzania" },
-		"se": { code: "SE", name: "Sweden" },
-		"seh": { code: "MZ", name: "Mozambique" },
-		"ses": { code: "ML", name: "Mali" },
-		"sg": { code: "CF", name: "Central African Republic" },
-		"shi": { code: "TN", name: "Tunisia" },
-		"si": { code: "LK", name: "Sri Lanka" },
-		"sk": { code: "SK", name: "Slovakia" },
-		"sl": { code: "SI", name: "Slovenia" },
-		"smn": { code: "FI", name: "Finland" },
-		"sn": { code: "ZW", name: "Zimbabwe" },
-		"so": { code: "SO", name: "Somalia" },
-		"sq": { code: "AL", name: "Albania" },
-		"sr": { code: "RS", name: "Serbia" },
-		"sv": { code: "SE", name: "Sweden" },
-		"sw": { code: "CD", name: "Democratic Republic of the Congo" },
-		"ta": { code: "IN", name: "India" },
-		"te": { code: "IN", name: "India" },
-		"teo": { code: "KE", name: "Kenya" },
-		"tg": { code: "TJ", name: "Tajikistan" },
-		"th": { code: "TH", name: "Thailand" },
-		"ti": { code: "ER", name: "Eritrea" },
-		"to": { code: "TO", name: "Tonga" },
-		"tr": { code: "TR", name: "Turkey" },
-		"tt": { code: "RU", name: "Russia" },
-		"twq": { code: "NE", name: "Niger" },
-		"tzm": { code: "MA", name: "Morocco" },
-		"ug": { code: "CN", name: "China" },
-		"uk": { code: "UA", name: "Ukraine" },
-		"ur": { code: "IN", name: "India" },
-		"uz": { code: "UZ", name: "Uzbekistan" },
-		"vai": { code: "TN", name: "Tunisia" },
-		"Vai": { code: "TN", name: "Tunisia" },
-		"vi": { code: "VN", name: "Vietnam" },
-		"vun": { code: "TZ", name: "Tanzania" },
-		"wae": { code: "CH", name: "Switzerland" },
-		"wo": { code: "SN", name: "Senegal" },
-		"xog": { code: "UG", name: "Uganda" },
-		"yav": { code: "CM", name: "Cameroon" },
-		"yi": { code: "01", name: "Unknown" }, // Placeholder for unspecified region
-		"yo": { code: "BJ", name: "Benin" },
-		"yue": { code: "CN", name: "China" },
-		"zgh": { code: "MA", name: "Morocco" },
-		"zh": { code: "CN", name: "China" },
-		"zu": { code: "ZA", name: "South Africa" },
-	};
-
-
-		//async function getCountryName(countryCode) {
-			//try {
-				//const response = await fetch(`https://restcountries.com/v3.1/alpha/${countryCode}`);
-				//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; 
-			//} catch (error) {
-				//console.error(error);
-				//return 'Unknown Country';
-			//}
-		//}
-
-		function getCountryNameFromLanguage(language) {
-			return languageToCountryMap[language] ? languageToCountryMap[language].name : null;
-		}
-
-		function getCountryCodeFromLanguage(language) {
-			return languageToCountryMap[language] ? languageToCountryMap[language].code : null;
-		}
-		
-		function getCountryNameFromCountryCode(countryCode) {
-			//alert(`Country code: ${countryCode}`);
-			for (const language in languageToCountryMap) {
-				if (languageToCountryMap.hasOwnProperty(language)) {
-					if (languageToCountryMap[language].code === countryCode) {
-						return languageToCountryMap[language].name;
-					}
-				}
-			}
-			return null; // Return null if country code not found
-		}
-
-		function getFlagEmoji(locale) {
-			// Split the locale to get the language and country code
-			const parts = locale.split('-');
-			let countryCode;
-
-			// Handle single subtag (language only) or double subtag (language-country)
-			if (parts.length === 1) {
-				countryCode = getCountryCodeFromLanguage(parts[0]);
-			} else if (parts.length === 2) {
-				countryCode = parts[1].toLowerCase(); // Use the country code
-			}
-
-			// If country code is not found, set a fallback output
-			if (!countryCode) {
-				const fallback = `? ${locale.toUpperCase()}`; // Just a question mark and the full locale
-				return { flag: fallback, isUnknown: true, countryName: 'Unknown Country' };
-			}
-
-			// Convert the country code to a flag emoji
-			return {
-				flag: String.fromCodePoint(...[...countryCode.toUpperCase()].map(char => 0x1F1E6 + char.charCodeAt(0) - 'A'.charCodeAt(0))),
-				isUnknown: false,
-				countryCode: countryCode
-			};
-		}
-
-function displayLocaleAndFlag() {
-    // Get the browser locale
-    const userLocale = navigator.language || navigator.userLanguage;
-    //alert(`User Locale: ${userLocale}`); // Alert the detected locale
-
-    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)
-    //document.getElementById('locale').textContent = `Your Locale: ${userLocale}`;
-
-    if (isUnknown) {
-        const fallbackDiv = document.createElement('div');
-        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
-    } else {
-        const countryName = getCountryNameFromCountryCode(countryCode.toUpperCase());
-        //alert(`Country Name from Country Code: ${countryName}`); // Alert the country name
-
-        const flagSpan = document.createElement('span');
-        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
-    }
-}
-		displayLocaleAndFlag();
-	});

root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js

@@ -1,28 +0,0 @@
-$(document).ready(function() {
-    function toggleUPSClasses() {
-        var selectedOption = $('#Nutmode_select').val();
-        $('.masterups').toggle(selectedOption === 'netserver' || selectedOption === 'standalone'); // Show/Hide masterups based on Net Server or Standalone
-        $('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client
-        
-        // Enable/Disable inputs based on the selected option
-        $('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone')); 
-        $('.slaveups input').prop('disabled', selectedOption !== 'netclient'); 
-    }
-
-    function toggleGenerics() {
-        var upsModelValue = $('#UPS_Model_select').val().toLowerCase(); // Get the current value from UPS_Model
-        var isGenericUps = upsModelValue === 'genericups'; // Check if it's 'genericups'
-
-        // Show/Hide generics section and enable/disable inputs
-        $('.generics').toggle(isGenericUps); 
-        $('.generics input').prop('disabled', !isGenericUps); // Enable/Disable inputs based on the value
-    }
-
-    // Event listener for the selections
-    $('#Nutmode_select').change(toggleUPSClasses);
-    $('#UPS_Model_select').change(toggleGenerics); // Listen for changes in the UPS_Model dropdown
-
-    // Set the initial state based on current selections
-    toggleGenerics();
-    toggleUPSClasses();
-});

root/usr/share/smanager/themes/AdminLTE/public/koozali/js/qmailanalog.js

@@ -1,25 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-    const analysisType = document.getElementById('analysis_type');
-    const messageIdGroup = document.getElementById('message_id_group');
-    const emailAddressGroup = document.getElementById('email_address_group');
-
-    // Initially hide both controls
-    messageIdGroup.style.display = 'none';
-    emailAddressGroup.style.display = 'none';
-
-    analysisType.addEventListener('change', function() {
-        // Hide both controls first
-        messageIdGroup.style.display = 'none';
-        emailAddressGroup.style.display = 'none';
-
-        // Show the relevant control based on the selected option
-        switch(this.value) {
-            case 'trace_message':
-                messageIdGroup.style.display = 'block';
-                break;
-            case 'user_activity':
-                emailAddressGroup.style.display = 'block';
-                break;
-        }
-    });
-});

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

@@ -4,83 +4,103 @@
 
 <div class="card-body">
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%=  dumper $c->current_route %>
+            <%=  dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_ENABLE_DISABLE_TAPE'
-    </h2><br>
+    <br>
 
-    %= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC'))
+    <h2><%= l 'bac_ENABLE_DISABLE_TAPE' %></h2>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <p>
-    <span class="">
-    %=l 'bac_ENABLE_TAPE_BACKUP'
-    </span>
-    <span class="">
-    % if ( $bac_datas->{status} eq 'checked' ) {
-    <input type='checkbox' name='Tapebackup' checked >
-    %} else {
-    %= check_box 'Tapebackup'
-    %}
-    </span>
-    </p>
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC')) %>
+    </div>
+
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_ENABLE_TAPE_BACKUP' %>
+            </div>
+            <div class="col-auto">
+            % if ( $bac_datas->{status} eq 'checked' ) {
+                <input type='checkbox' name='Tapebackup' aria-describedby="enabled" checked >
+            % } else {
+                <input type='checkbox' name='Tapebackup' aria-describedby="disabled">
+            % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <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';
+                <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';
+                <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" %>
+            </div>
+        </div>
+
+        <br>
 
 
-    <p>
-    <span class="">
-    %=l 'bac_TAPE_BACKUP_TIME'
-    </span>
-    <span class="">
-    % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
-    %= text_field 'BackupHour', size => '2'
-    % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
-    %= text_field 'BackupMin', size => '2'
-    </span>
-    <!--span class="">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
-    % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
-    %= select_field 'BackupAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <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';
+                <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';
+                <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" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'bac_LOAD_TAPE_REMINDER_TIME'
-    </span>
-    <span class="">
-    % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
-    %= text_field 'ReminderHour', size => '2'
-    % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
-    %= text_field 'ReminderMin', size => '2'
-    </span>
-    <!--span class="">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
-    % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
-    %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p><br>
+        <br>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_UPDATE_CONF'), class => ""
+        <%=  hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_UPDATE_CONF');
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
-    % end
 </div>
 % end

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

@@ -5,34 +5,46 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
-    %=l 'bac_RESTORE_CONF_FROM_TAPE'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC'))
+    <h2><%=l 'bac_RESTORE_CONF_FROM_TAPE' %></h2>
 
     <br>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
+    <form action="/smanager/backupd" method="POST">
 
-    %= submit_button $c->l('bac_RESTORE_FROM_TAPE'), class => ""
+        <div>
+            <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) %>
+        </div>
+
+        <br>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_RESTORE_FROM_TAPE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    <form>
 
-    % end
 </div>
 % end

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

@@ -5,54 +5,71 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+             <%= dumper $c->current_route %>
+             <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
+
+    <h1><%=  $title%></h1>
+
+    <br>
+
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
+
+    <br>
+
+    <div>
+        <%=  $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC')) %>
     </div>
-    %}
 
-    <h1><%= $title%></h1>
-
-    %= form_for '/backup' => (method => 'POST') => begin
-
-    <h2>
-    %=l 'bac_CONFIGURE_WORKSTN_BACKUP'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC'))
-
-    %=l 'bac_WORKSTN_BACKUP_ENABLED'
-    <span class="">
-    %= $bac_datas->{status}
-    </span>
     <br>
 
-    %= $c->render_to_string(inline => $c->workstnBackupConfig())
+    <form action="/smanager/backup" method="POST">
 
-    <p>
-    <h3>
-    %= l 'bac_WORKSTATION_BACKUP_SETCONF'
-    </h3>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_VFS_TYPE'
-    </span>
-    <span class="">
-    % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
-    %= select_field 'VFSType' => $c->get_VFSType_options(), class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'bac_WORKSTN_BACKUP_ENABLED' %>: <%=  $bac_datas->{status} %>
+        </div>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('NEXT'), class => ""
+        <br>
 
-    % end
+        <%=  $c->render_to_string(inline => $c->workstnBackupConfig()) %>
+
+        <br>
+
+        <h3><%= l 'bac_WORKSTATION_BACKUP_SETCONF' %></h3>
+
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                 <%= l 'bac_SELECT_VFS_TYPE' %>
+            </div>
+            <div class="col-auto">
+                % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
+                 <%=  select_field 'VFSType' => $c->get_VFSType_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%=  hidden_field 'Function' => $bac_datas->{'function'} . '1' %>
+
+        % my $btn = l('NEXT');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 

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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+             <%= dumper $c->current_route %>
+             <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div>
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_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 ) {
-        <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>
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
 
-    <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 btn-sm" 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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
-    %=l 'bac_WORKSTN_RESTORE'
-    </h2>
+    <h2><%= l 'bac_WORKSTN_RESTORE' %></h2>
 
-    <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><br><span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
-    </span><br><br>
+    <form action="/smanager/backupd" method="POST">
+
+        % 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_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-sm"><%= $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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    %= 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-sm"><%= $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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br><div class="text-danger">
+        <%= $c->render_to_string(inline => stash 'error') %>
     </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <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>
-    <span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Restoreset_options(), class => ""
-    </span>
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_FILTER_EXPRESSION'
-    </span>
-    <span class="">
-    %= text_field 'Filterexp', size => 32, class => ""
-    </span>
-    <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('PERFORM'), class => ""
+        <div>
+            <%= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+        </div>
 
-    % 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-sm"><%= $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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
+    <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="">
-    %=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'}
+    <form action="/smanager/backupd" method="POST">
 
-    %= 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 btn-sm" 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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
+
+    <br>
+
     <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
-    <br>
-    %= $c->render_to_string(inline => $bac_datas->{restore_log}) 
+
     <br>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('NEXT'), class => ""
+    <form action="/smanager/backupd" method="POST">
 
-    % 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-sm"><%= $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>
-        %= dumper $c->current_route
-        %= dumper $bac_datas
-        </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-        </div>
-    %}
+        <br><div class="text-danger">
+        <%= $c->render_to_string(inline => stash 'error') %>
+    </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_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>
-    <span class="">
-    %=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
-    </span>
-    <span class="">
-    %= check_box 'Verifyall'
-    </span>
-    </p>
-    <br>
+    <h2><%=l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2>
 
-    %=l 'bac_CHECK_INTEGRITY_WARNING'
+    <form action="/smanager/backup" method="POST">
 
-    <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('bac_VERIFY'), class => ""
+        <br>
 
-    % 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-sm"><%= $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>
-    %= dumper $c->current_route
-    %= dumper $bac_datas->{function}
-    <!--  dumper $bac_datas->{'files_list'} -->
-    </p>
+        <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $bac_datas->{function} %>
+        <!--  dumper $bac_datas->{'files_list'} -->
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
+    <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-sm"><%= $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/backup.html.ep

@@ -5,76 +5,99 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <div>
-        %= dumper $c->current_route
-        %= dumper $bac_datas
-    </div>
+    <pre>
+        <%=  dumper $c->current_route %>
+        <%=  dumper $bac_datas %>
+    </pre>
     % }
 
     % if ( stash 'warning' ) {
         <br>
-        <div>
-        %= $c->render_to_string(inline => stash 'warning') 
+        <div class="col-md-4 bg-info text-center">
+            <%=  $c->render_to_string(inline => stash 'warning') %>
         </div>
-    %}
+        <br>
+    % }
     % if ( stash 'error' ) {
         <br>
-        <div>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error')  %>
         </div>
-    %}
+        <br>
+    % }
 
     <h1><%= $title%></h1>
+
     <!--br>Still incomplete click here for previous version
     <a href="/server-manager/cgi-bin/backup" target='_blank'><b>(Previous Backup version)</b></a>
-    <br-->
-
-    <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module}, 
-        $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
-
-    <form action="/smanager/backup" method="POST">
-        %#= form_for '/backup' => (method => 'POST') => begin
-    
-    <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
-
-    <div>
-    <%= l 'bac_TAPE_BACKUPS' %>,
-    <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
-
-    % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
-        %= $c->l('bac_BACKUPS_RUN_AT')
-        %=  $bac_datas->{'backupTime'}
-        %= $c->l('bac_REMINDER_MESSAGE_AT')
-        %= $bac_datas->{'reminderTime'}
-    % }
-    </div>
-    
-    <div>
-
-    <%=l 'bac_WORKSTN_BACKUPS' %>,
-    <%= $c->l(uc($bac_datas->{'backupwkStatus'})) . '.' %>
-    % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
-        <%= $c->l('bac_WKBACKUPS_RUN_AT') %>
-        <%= $bac_datas->{'backupwkTime'} %>
-    % }
-    </div>
-
-    <div>
-    <%= l 'bac_SELECT_AN_ACTION' %>
-    % param 'Function' => $bac_datas->{function} unless param 'Function';
-    <%= select_field 'Function' => $c->get_function_options() %>
-    </div>
+    -->
 
     <br>
 
-        <%  my $btn = $c->l('PERFORM'); %>
-         <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+    <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module},
+    $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
+
+    <form action="/smanager/backup" method="POST">
+        <br>
+
+        <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
+
+        <br>
+
+        <div>
+            <div>
+                <%= l 'bac_TAPE_BACKUPS' %>: <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
+            </div>
+
+
+            % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
+                <div>
+                    <%=  $c->l('bac_BACKUPS_RUN_AT') %>: <%=   $bac_datas->{'backupTime'} %>
+                </div>
+                <br>
+                <div>
+                    <%=  $c->l('bac_REMINDER_MESSAGE_AT') %>: <%=  $bac_datas->{'reminderTime'} %>
+                </div>
+            % }
+        </div>
+
+        <br>
+
+        <div>
+            <div>
+                <%=l 'bac_WORKSTN_BACKUPS' %>:  <%= $c->l(uc($bac_datas->{'backupwkStatus'})) . '.' %>
+            </div>
+            <div>
+                % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
+                    <%= $c->l('bac_WKBACKUPS_RUN_AT') %>: <%= $bac_datas->{'backupwkTime'} %>
+                % }
             </div>
         </div>
-    % end
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_SELECT_AN_ACTION' %>
+            </div>
+
+            <div class="col-auto">
+                % param 'Function' => $bac_datas->{function} unless param 'Function';
+                <%= select_field 'Function' => $c->get_function_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = $c->l('PERFORM');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
-
 % end

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

@@ -81,7 +81,7 @@
     <form action="/smanager/bugreport" method="POST">
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
         <%= hidden_field 'trt' => $bugr_datas->{trt} %>

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

@@ -20,7 +20,7 @@
     <form action="/smanager/bugreportD" method="POST">
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
         <%= hidden_field 'trt' => $bugr_datas->{trt} %>

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

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

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

@@ -1,9 +1,16 @@
 <!-- common_css.html.ep -->
-%= stylesheet 'koozali/css/adminlte.koozali.css'
-%= stylesheet 'koozali/css/flag-icon.min.css'
-
-%#= stylesheet 'css/sme-jquery-overrides.css'
 
+<!-- Generic to AdminLTE -->
 %= stylesheet 'dist/css/adminlte.min.css'
-%= stylesheet 'dist/icons/font/bootstrap-icons.min.css'
-%#= stylesheet 'dist/css/overlayscrollbars.min.css' 
+%= stylesheet 'dist/font/bootstrap-icons.min.css'
+
+
+<!-- Specific to Koozali from smanager/default -->
+%= stylesheet 'css/flag-icon.min.css'
+
+<!-- Specific Koozali AdminLTE overrides -->
+%= stylesheet 'koozali/css/adminlte.koozali.css'
+
+
+%#= stylesheet 'dist/css/overlayscrollbars.min.css'
+%#= stylesheet 'css/sme-jquery-overrides.css'

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

@@ -1,9 +1,16 @@
 <!-- common_js.html.ep -->
-%= javascript 'dist/js/jquery.min.js'
-%= javascript 'dist/js/bootstrap.min.js'
-%= javascript 'dist/js/popper.min.js'
-%= javascript 'dist/js/adminlte.min.js'
 
-%= javascript 'koozali/js/flag-by-locale.js'
+<!-- Specific to AdminLTE -->
+%= javascript 'dist/js/adminlte.min.js'
+%= javascript 'dist/js/bootstrap.min.js'
+
+<!-- Generic JS -->
+%= javascript 'dist/js/jquery.min.js'
+%= javascript 'dist/js/popper.min.js'
+
+<!-- Specific to Koozali from smanager/default -->
+%= javascript 'js/flag-by-locale.js'
+
+<!-- Specific to Koozali AdminLTE -->
 %= javascript 'koozali/js/sme-password.js'
 

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

@@ -4,205 +4,229 @@
 
 <div class="card-body">
 
-    % if (config->{debug} == 0) {
+    % if (config->{debug} == 1) {
         <pre>
             <%= dumper $c->current_route %>
-            <%= dumper $dat_datas %>
+            <%= dumper $dat_data %>
         </pre>
     % }
 
-    % if ( stash 'error' ) {
-        <br>
-        <div class="text-danger">
-            %= $c->render_to_string(inline => stash 'error')
+
+    % if ($c->stash('first')) {
+        <div>
+            <%= $c->render_to_string(inline =>$c->l($c->stash('first'))) %>
         </div>
-    %}
+    % } elsif ($c->stash('success')) {
+        <div class='text-success'>
+            <%= $c->l($c->stash('success')); %>
+        </div>
+    % } elsif ($c->stash('error')) {
+        <div class='text-danger'>
+            <%= $c->l($c->stash('error')); %>
+        </div>
+    % }
+
 
     <h1><%= $title %></h1>
     <br>
-    %= $modul
-    <% my $btn = l('SAVE'); %>
+    <%= $modul %>
 
-    <form action="/smanager/datetime" method="POST">
+   <br><br>
 
-        <br>
-
-        % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus';
-        % param 'Ntpserver' => 'smeserver.pool.ntp.org' unless param 'Ntpserver';
-
-        <br>
-
-        % if ($dat_datas->{ntpstatus} eq 'disabled') {
-
-
-            <div>
-                You can manually set your server time here (static string for testing)<br><br>
-            </div>
-
-            <br>
-
-            <div>
-                <br>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_CURRENT_SETTING' %>
-                    </div>
-                    <div class="col-auto">
-                        <b><%= $dat_datas->{now_string} %></b>
-                    </div>
-                </div>
-
-                <br>
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_NEW_M/D/Y' %>
-                    </div>
-                    <div class="col-auto">
-                        % param 'Month' => $dat_datas->{month} unless param 'Month';
-                        %= select_field 'Month' => $c->getMonth_list(), class => "form-select"
-                    </div>
-
-                    <div class="col-auto">
-                        % param 'Day' => $dat_datas->{day} unless param 'Day';
-                        %= text_field 'Day', size => '2', class => ""
-                    </div>
-                    <div class="col-auto">
-                        % param 'Year' => $dat_datas->{year} unless param 'Year';
-                        %= text_field 'Year', size => '4', class => ""
-                    </div>
-
-                </div>
-
-                <br>
-
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_NEW_H/M/S' %>
-                    </div>
-                    <div class="col-auto">
-                        % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
-                        %= text_field 'Hour', size => '2', class => ""
-                    </div>
-                    <div class="col-auto">
-                        % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
-                        %= text_field 'Minute', size => '2', class => ""
-                    </div>
-                    <div class="col-auto">
-                        % param 'Second' => $dat_datas->{second} unless param 'Second';
-                        %= text_field 'Second', size => '2', class => ""
-                    </div>
-                </div>
-
-                <br>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_AM/PM_AND_TZ' %>
-                    </div>
-                    <div class="col-auto">
-                        % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
-                        %= select_field 'Ampm' =>  ['AM', 'PM'], class => "form-select"
-                    </div>
-
-                   <div class="col-auto">
-                       % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-                       %= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select"
-                   </div>
-
-                </div>
-
-                <br>
-
-                <div class="form-check">
-                    <label class="form-check-label" for="radioDefault1">
-                        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
-                    </label>
-                    <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1" value="enabled">
-                </div>
-            </div>
-
-            <%#= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
-
-            <%= hidden_field 'Old_ntpstatus' => 'disabled' %>
-
-        % } else {
-
-            <!-- # %  if ($dat_datas->{ntpstatus} eq 'enabled') { -->
-
-            <div>
-                <%= l 'dat_NTP_ENABLE_DESC' %>
-            </div>
-
-            <div>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_CURRENT_SETTING' %>
-                    </div>
-                    <div class="col-auto">
-                        <b><%= $dat_datas->{now_string} %></b>
-                    </div>
-                </div>
-
-                <br>
-
-                <div class="form-check">
-                    <label class="form-check-label" for="radioDefault1">
-                        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
-                    </label>
-                    <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1" value="enabled">
-                </div>
-                <br>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <label for="inputNTPServer" class="col-form-label"><%= l 'dat_NTP_SERVER' %></label>
-                    </div>
-                    <div class="col-auto">
-                        <input type="text" name="Ntpserver" id="inputNTPServer" class="form-control" aria-describedby="NTP Server" value="<%= $dat_datas->{ntpserver} %>">
-                    </div>
-                </div>
-
-            </div>
-
-            <br>
-
-            <div>
-                <%= l 'dat_NTP_DISABLE_DESC' %>
-            </div>
-
-            <br>
-
-            <div class="form-check">
-              <label class="form-check-label" for="radioDefault2">
-                <%= l 'dat_NTP_DISABLE_TITLE' %>
-              </label>
-              <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault2" value="disabled">
-            </div>
-
-
-            <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
-            <%#= hidden_field 'Old_ntpstatus' => 'disabled' %>
-
-        % }
-
-
-
-        <br>
-
-
-
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
+   <div div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= $c->l('dat_The_time_is_currently') %>
         </div>
+        <br>
+        <div>
+            <%= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'col-md-2' , value => $dat_data->{currentdatetime} %>
+        </div>
+    </div>
+
+    <br>
+
+    % if ($dat_data->{ntpstatus} eq 'disabled') {
+        <div class='datetime-set-ntp'>
+            <%= l 'dat_NTP_ENABLE_DESC' %>
+        </div>
+    % } else {
+
+        % my $current_year = $dat_data->{year};
+        % my $year_options  = [ map { [ $_, $_ ] } ($current_year..($current_year+30)) ];
+        % my $month_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (1..12) ];
+        % my $hour_options  = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..23) ];
+        % my $minute_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..60) ];
+        % my $second_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..60) ];
+        % my $mode_options = [
+        %   [ $c->l('dat_ntp_server'),   'dat_ntp_server' ],
+        %   [ $c->l('dat_manually_set'), 'dat_manually_set' ]
+        % ];
+
+        <br>
+
+        <h2><%= $c->l('Time Configuration') %></h2>
 
 
-    </form>
+        <form action="/smanager/datetimeu" method="POST">
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <%= label_for time_mode => $c->l('Time Setting Mode:') %>
+                </div>
+                <div class="col-auto">
+                    % param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode';
+                    <%= select_field time_mode => ($mode_options, id => 'time_mode_select'), class => "form-select" %>
+                </div>
+            </div>
+
+            <br><br>
+
+            <div id='ntp_section'>
+                <div>
+                    <%= $c->l('dat_NTP_CONFIGURE_DESC') %>
+                </div>
+
+                <br>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-2">
+                        <label for="inputNTPServerURL" class="col-form-label"><%=$c->l('dat_NTP_Server_URL') %></label>
+                    </div>
+                    <div class="col-auto">
+                        % my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
+                        % param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
+                        <input type="text" name="ntpserver" id="inputNTPServerURL" class="form-control" aria-describedby="NTP Server URL" pattern="<%= $server_check %>" value="<%= $dat_data->{ntpserver} %>">
+
+                    </div>
+                    <div class="col-auto">
+                        <button type="button" id="test-ntp-btn" class="btn btn-primary btn-sm ml-2">Test Server</button>
+                        <span id="ntp-test-result" class="ntp-test-result ml-2"></span>
+                    </div>
+                </div>
+            </div>
+
+            <br>
+
+            <div id='manual_section'>
+
+                <div>
+                    <%= $c->l('dat_NTP_DISABLE_DESC') %>
+                </div>
+
+                <br>
+
+                <div>
+                    <h3><%= $c->l('dat_set_manually') %></h3>
+                </div>
+
+                <br>
+
+                <div class="row g-3 align-items-center">
+
+                    <div class="col-md-1">
+                        <legend><%= $c->l('Date') %><legend>
+                    </div>
+
+                    <div class="col-auto">
+                        <%= $c->l('Year:') %>
+                    </div>
+
+                    <div class="col-auto">
+                        % param 'year' => ($dat_data->{year}) unless param 'year';
+                        <%= select_field year => ($year_options, id => 'year'), required => 'required', class=> "form-select" %>
+                    </div>
+
+                    <div class="col-auto">
+                        <%= $c->l('Month:') %>
+                    </div>
+
+                    <div class="col-auto">
+                        % param 'month' => ($dat_data->{month}) unless param 'month';
+                        <%= select_field month => ($month_options, id => 'month'), required => 'required', class=> "form-select" %>
+                    </div>
+
+                    <div class="col-auto">
+                        <label for="inputDay" class="col-form-label"><%= $c->l('Day:') %></label>
+                    </div>
+
+                    <div class="col-auto">
+                        % param 'day' => ($dat_data->{day}) unless param 'day';
+                        <input type="text" name="day" id="inputDay" class="form-control" aria-describedby="Day" placeholder="<%= $dat_data->{day} %>" pattern="^(0[1-9]|[12][0-9]|3[01])$" size="2" maxlength="2" required="required" inputmode = "numeric" autcomplete="off">
+                    </div>
+
+                </div>
+
+                <br>
+
+                <div class="row g-3 align-items-center">
+
+                    <div class="col-md-1">
+                        <legend><%= $c->l('Time') %></legend>
+                    </div>
+
+                    <div class="col-auto">
+                        <%= $c->l('Hour:') %>
+                    </div>
+                    <div class="col-auto">
+                        % param 'hour' => ($dat_data->{hour}) unless param 'hour';
+                        <%= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select" %>
+                    </div>
+
+                    <div class="col-auto">
+                        %= label_for minute => $c->l('Minute:')
+                    </div>
+                    <div class="col-auto">
+                        % param 'minute' => ($dat_data->{minute}) unless param 'minute';
+                        <%= select_field minute => ($minute_options, id => 'minute'), required => 'required', class=> "form-select", inputmode => 'numeric' %>
+
+                        %#= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+                    </div>
+
+                    <div class="col-auto">
+                        %= label_for second => $c->l('Second:')
+                    </div>
+                    <div class="col-auto">
+                        % param 'second' => ($dat_data->{second}) unless param 'second';
+                        <%= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric' %>
+
+                    </div>
+
+                </div>
+
+
+                <br>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <%= l 'dat_TZ' %>
+                    </div>
+                    <div class="col-auto">
+                        % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
+                        <%= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select" %>
+                    </div>
+                </div>
+
+            </div>
+
+            <br>
+
+            <%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %>
+            <%= hidden_field 'trt' => $dat_data->{trt}; %>
+
+            <% 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-sm"><%= $btn %></button>
+                </div>
+            </div>
+
+        </form>
+
+    % }
 
 </div>
-%end
+% end
+1;

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

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

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

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

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

@@ -1,4 +1,4 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailsettings";
+% layout 'AdminLTE', title => "Sme server 2 - E-Mail";
 
 % content_for 'module' => begin
 
@@ -12,7 +12,7 @@
     % if (config->{debug} == 1) {
         <pre>
             <%= dumper $c->current_route %>
-            <= dumper $mai_datas %>
+            <%= dumper $mai_data->{trt} %>
         </pre>
     % }
 
@@ -24,205 +24,34 @@
     %}
 
     <h1><%= $title%></h1>
+
     <br>
 
+    %#Routing to partials according to trt parameter.
+    %#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
 
-    <form action="/smanager/emailsettings" method="POST">
+    % if ($mai_data->{trt} eq "FRONT") {
+        <%= include 'partials/_mai_FRONT' %>
+    % }
 
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_POP_ACCESS_CONTROL' %>
-            </div>
-            <div class="col-auto">
-            <%= $c->get_current_pop3_access( TRUE ) %>
-            </div>
-        </div>
+    % if ($mai_data->{trt} eq "ACC") {
+        <%= include 'partials/_mai_ACC' %>
+    % }
 
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_imap_access( TRUE ) %>
-            </div>
-        </div>
+    % if ($mai_data->{trt} eq "FIL") {
+        <%= include 'partials/_mai_FIL' %>
+    % }
 
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_WEBMAIL' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_webmail_status( TRUE ) %>
-            </div>
-        </div>
+    % if ($mai_data->{trt} eq "REC") {
+        <%= include 'partials/_mai_REC' %>
+    % }
 
-        <br>
-
-        % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
-        <%= hidden_field 'trt' => 'ACC' %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-    </form>
-
-    <br><br>
-
-    <!--<hr class="" />-->
-
-    <form action="/smanager/emailsettings" method="POST">
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_VIRUS_SCAN' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_virus_status(TRUE) %>
-            </div>
-        </div>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-            <%= l 'mai_LABEL_SPAM_SCAN' %>
-            </div>
-           <div class="col-auto">
-           <%= $c->get_spam_status(TRUE) %>
-           </div>
-        </div>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_patterns_status(TRUE) %>
-            </div>
-        </div>
-
-        <br>
-
-        % my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
-        <%= hidden_field 'trt' => 'FIL' %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-    </form>
-
-    <br><br>
-
-    <!--<hr class="" />-->
-
-    <form action="/smanager/emailsettings" method="POST">
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_MODE' %>
-            </div>
-            <div class="col-auto">
-                <%= $mai_datas->{fetchmailmethod} %>
-            </div>
-        </div>
-
-        % my $smtp_mesg;
-
-        % $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_smtp_auth( TRUE ) %>
-            </div>
-        </div>
-
-        % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %>
-            </div>
-        </div>
-
-        % $smtp_mesg=l 'Submission port %u status:';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) %>
-            </div>
-        </div>
-
-        <br>
-
-        % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
-        <%= hidden_field 'trt' => 'REC' %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-    </form>
-
-    <br><br>
-
-    <!--<hr class="" />-->
-
-    <form action="/smanager/emailsettings" method="POST">
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_UNKNOWN' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_emailunknownuser_status( TRUE ) %>
-            </div>
-        </div>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_DELEGATE' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_value('DelegateMailServer') %>
-            </div>
-        </div>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_SMARTHOST' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_value('SMTPSmartHost') %>
-            </div>
-        </div>
-
-        <br>
+    % if ($mai_data->{trt} eq "DEL") {
+        <%= include 'partials/_mai_DEL' %>
+    % }
 
 
-        % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
-        <%= hidden_field 'trt' => 'DEL' %>
 
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-        <br>
-
-    </form>
 </div>
 
 %end

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

@@ -19,21 +19,36 @@
     %= content_for 'head_contrib'
     %= content_for 'refresh'
 
+    <!-- Specific for AdminLTE -->
     %= include 'common_js'
     %= include 'common_css'
 
+    <!-- should move the JS in here to a proper file if required -->
+    %# if (config 'hasJquery') {
+        %#= include 'partials/_js_imports'
+    %# }
+
     <!-- Custom overrides js/css? -->
     <!-- This needs refining - do contribs add in their own stuff?? -->
     <!-- This needs refining -->
 
-    % if (config 'hasJquery') {
-        %= include 'partials/_js_imports'
 
+    <!-- the sections below should add the correct JS/CSS per panel -->
+    %# if ($c->current_route eq 'nutups') {
+        %#= include 'partials/_nutups_overrides'
+    %# }
+
+    %# panel specific css file
+    % my $controller = stash('controller');
+    % if ($controller) {
+        % my $css_path = "css/$controller.css";
+        %# Use the url_for helper to generate the correct static file URL
+        % if (app->static->file($css_path)) {
+          <link rel="stylesheet" href="<%= url_for("/$css_path") %>">
+        % }
     % }
 
-    % if ($c->current_route eq 'nutups') {
-        %= include 'partials/_nutups_overrides'
-    % }
+
 
 </head>
 
@@ -208,6 +223,16 @@
 
 <div id="adminlte-version"></div>
 
+%# Specific panel js code
+% $controller = stash('controller');
+% if ($controller) {
+    % my $js_path  = "js/$controller.js";
+    %# Use the url_for helper to generate the correct static file URL
+    % if (app->static->file($js_path)) {
+      <script src="<%= url_for("/$js_path") %>"></script>
+    % }
+% }
+
 </body>
 
 </html>

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

@@ -1,74 +1,78 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 % layout 'AdminLTE', title => "Sme server 2 - Letsencrypt certificate", share_dir => './';
 %# css specific to this panel:
 
 % content_for 'module' => begin
 
-<!-- needs moving -->
+<!-- reetp needs moving - probabyl not required -->
 
-%= stylesheet '/css/letsencrypt.css'
+<!-- stylesheet '/css/letsencrypt.css' -->
 
 <div  class="card-body">
 
     % if (config->{debug} == 1) {
     <pre>
-        %= dumper $c->current_route
-        %= dumper $lets_data->{trt}
+        <%= dumper $c->current_route %>
+        <%= dumper $lets_data->{trt}  %>
     </pre>
     % }
-    
+
     <h1><%=$title%></h1>
 
     % if ( stash('modul')) {
-    %= $c->render_to_string(inline => stash('modul') );
+        <br>
+        <div>
+            <%= $c->render_to_string(inline => stash('modul') ); %>
+        </div>
     % }
 
-    %if ($c->stash('first')) {
-        <br><p>
-        %=$c->render_to_string(inline =>$c->l($c->stash('first')))
-        </p>
-
-    %} elsif ($c->stash('success')) {
-        <div class="">
-           <h2><%=$c->l('lets_Status_Report') %></h2><p>
-            %= $c->l($c->stash('success'));
-            </p>
+    % if ($c->stash('first')) {
+        <br>
+        <div>
+            <%=$c->render_to_string(inline =>$c->l($c->stash('first')))  %>
         </div>
 
-    %} elsif ($c->stash('error')) { 
-       <div class="">
-           <h2><%=$c->l('lets_Error_Status_Report') %></h2><p>
-            %= $c->l($c->stash('error'));
-            </p>
+    % } elsif ($c->stash('success')) {
+        <div class="text-success">
+            <h2><%=$c->l('lets_Status_Report') %></h2>
+            <div>
+                <%= $c->l($c->stash('success')); %>
+            </div>
         </div>
-    %}
+
+    % } elsif ($c->stash('error')) {
+       <div class="text-danger">
+            <h2><%=$c->l('lets_Error_Status_Report') %></h2>
+            <div>
+                <%= $c->l($c->stash('error')); %>
+            </div>
+        </div>
+    % }
 
     %#Routing to partials according to trt parameter.
     %#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
 
     % if ($lets_data->{trt} eq "LIST") {
-        %= include 'partials/_lets_LIST'
-    %}
+        <%= include 'partials/_lets_LIST' %>
+    % }
 
     % if ($lets_data->{trt} eq "PARAMS") {
-        %= include 'partials/_lets_PARAMS'
-    %}
+        <%= include 'partials/_lets_PARAMS' %>
+    % }
 
     % if ($lets_data->{trt} eq "CHECKALLDOMAINS") {
-        %= include 'partials/_lets_CHECKALLDOMAINS'
-    %}
+        <%= include 'partials/_lets_CHECKALLDOMAINS' %>
+    % }
 
     % if ($lets_data->{trt} eq "CHECKALLENABLEDDOMAINS") {
-        %= include 'partials/_lets_CHECKALLENABLEDDOMAINS'
-    %}
+        <%= include 'partials/_lets_CHECKALLENABLEDDOMAINS' %>
+    % }
 
     % if ($lets_data->{trt} eq "CHECKONEDOMAIN") {
-        %= include 'partials/_lets_CHECKONEDOMAIN'
-    %}
-
-
+        <%= include 'partials/_lets_CHECKONEDOMAIN' %>
+    % }
 
 </div>
 %end

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">
@@ -89,7 +89,7 @@
               <!-- /.col -->
               <div class="col-4">
                 <div class="d-grid gap-2">
-                  <button type="submit" class="btn btn-primary">Login</button>
+                  <button type="submit" class="btn btn-primary btn-sm">Login</button>
                 </div>
               </div>
               <!-- /.col -->

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

@@ -1,5 +1,5 @@
 %#
-%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 % layout 'AdminLTE', title => "Sme server 2 - NutUPS configuration", share_dir => './';
 %# css specific to this panel:
@@ -9,52 +9,59 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <pre>
-        %= dumper $c->current_route
-        %= dumper $nut_data->{trt}
-    </pre>
+        <pre>
+            %= dumper $c->current_route
+            %= dumper $nut_data->{trt}
+        </pre>
     % }
-    
+
     <h1><%=$title%></h1>
 
     % if ( stash('modul')) {
-    %= $c->render_to_string(inline => stash('modul') );
+        <%= $c->render_to_string(inline => stash('modul') ); %>
     % }
 
     %if ($c->stash('first')) {
         <br><p>
-        %=$c->render_to_string(inline =>$c->l($c->stash('first')))
+            <%=$c->render_to_string(inline =>$c->l($c->stash('first'))) %>
         </p>
 
     %} elsif ($c->stash('success')) {
-        <div class="">
-           <h2><%=$c->l('nut_Status_Report') %></h2><p>
-            %= $c->l($c->stash('success'));
-            </p>
+        <div class="text-success">
+           <h2><%=$c->l('nut_Status_Report') %></h2>
+           <div>
+                <%= $c->l($c->stash('success')); %>
+            </div>
         </div>
-        <br />
+        <br>
 
-    %} elsif ($c->stash('error')) { 
-       <div class="">
-           <h2><%=$c->l('nut_Error_Status_Report') %></h2><p>
-            %= $c->l($c->stash('error'));
-            </p>
+    %} elsif ($c->stash('error')) {
+       <div class="text-danger">
+           <h2><%=$c->l('nut_Error_Status_Report') %></h2>
+           <div>
+                <%= $c->l($c->stash('error')); %>
+            </div>
         </div>
-        <br />
+        <br>
     %}
 
     %#Routing to partials according to trt parameter.
     %#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
-    
+
+    <br>
+
     % if ($nut_data->{trt} eq "STATUS") {
-        %= include 'partials/_nut_STATUS'
+        <%= include 'partials/_nut_STATUS' %>
     %}
-    
+
+    <br>
+
     % if ($nut_data->{trt} eq "CONFIG") {
-        %= include 'partials/_nut_CONFIG'
+
+        <%= include 'partials/_nut_CONFIG' %>
     %}
-    
 
 
 </div>
+
 %end

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

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

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

@@ -7,7 +7,7 @@
         <br>
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
             </div>
         </div>
         <%= hidden_field 'trt' => 'ADD' %>
@@ -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>
 
@@ -47,7 +47,7 @@
                     % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
                     % my $actionModify = qq{
                     % <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
-                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                     %       $modify_text
                     %   </button>
                     % </a>
@@ -60,15 +60,15 @@
                             % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
                             % $actionRemove = qq{
                                 % <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                 %       $remove_text
                                 %   </button>
                                 % </a>
                             %};
-                        %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
+                        %# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
                     %};
-                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
                 </tr>
             % }
 
@@ -112,7 +112,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-auto">
-                <button type="submit" class="btn btn-primary"><%= $btn2 %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn2 %></button>
             </div>
         </div>
 

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

@@ -36,7 +36,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
         <%= hidden_field 'trt' => $dom_datas->{trt} %>

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

@@ -78,7 +78,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
         <%= hidden_field 'trt' => $dom_datas->{trt} %>

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

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

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

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

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

@@ -6,7 +6,7 @@
         <br>
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
             </div>
         </div>
         <%= hidden_field 'trt' => 'ADD' %>
@@ -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>
@@ -39,7 +39,7 @@
                             % my $modify_text = l('MODIFY');  # Localized text
                             % my $actionModify = qq{
                                 % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
-                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                                 %       $modify_text
                                 %   </button>
                                 % </a>
@@ -48,14 +48,14 @@
                             % my $remove_text = l('REMOVE');  # Localized text
                             % my $actionRemove = qq{
                                 % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                 %       $remove_text
                                 %   </button>
                                 % </a>
                             %};
 
-                        <td class="user-valign-center"><%= $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 => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
                     </tr>
                 % }
             </tbody>

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

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

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

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

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

@@ -5,7 +5,7 @@
     <form action="/smanager/hostentriesd" method="POST">
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
         <%= hidden_field 'trt' => $hos_datas->{trt} %>
@@ -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>
 
@@ -47,7 +47,7 @@
                             %my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
                             %$actionModify = qq{
                                 % <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
-                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                                 %     $modify_text
                                 %   </button>
                                 % </a>
@@ -57,14 +57,14 @@
                             %#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
                             %$actionRemove = qq{
                                 % <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                 %     $remove_text
                                 %   </button>
                                 % </a>
                             %};
                         % }
-                        <td class="user-valign-center"><%= $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 => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
                 </tr>
                % }

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@
         <br>
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
             </div>
         </div>
         <%= hidden_field 'trt' => 'ADD'; %>
@@ -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>
 
@@ -60,7 +60,7 @@
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %$actionModify = qq{
                              % <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
-                             %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                             %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                              % $modify_text
                              %   </button>
                              % </a>
@@ -74,7 +74,7 @@
                              %if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
                                  %$actionResetPw = qq{
                                  % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                                 %   <button type='button' class="btn btn-danger" title="$password_text - currently unset" >
+                                 %   <button type='button' class="btn btn-danger btn-sm" title="$password_text - currently unset" >
                                  %       $password_text
                                  %   </button>
                                  % </a>
@@ -82,7 +82,7 @@
                              % } else {
                                  %$actionResetPw = qq{
                                  % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                                 %   <button type='button' class="btn btn-primary" title='$password_text' >
+                                 %   <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
                                  %       $password_text
                                  %   </button>
                                  % </a>
@@ -97,15 +97,15 @@
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %$actionRemove = qq{
                              % <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
-                             %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                             %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                              %       $remove_text
                              %   </button>
                              % </a>
                              %};
                          % }
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw)%></td>
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionResetPw)%></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,39 +19,37 @@
         <br>
 
 
-        <div>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
             <%= l 'PASSWORD_NEW' %>
         </div>
-
-        <br>
-
-        <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 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>
+    <br>
 
-        <div>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
             <%= l 'PASSWORD_VERIFY_NEW' %>
         </div>
-
-        <br>
-
-        <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 class="col-auto">
+            <input name="newPassVerify" id="passVerify" type="password" class="form-control sme-password" placeholder="Password" autocomplete="on">
         </div>
-
-        <br>
+        <div class="col-auto">
+            <span id="togglePasswordVerify" class="bi bi-eye"></span>
+        </div>
+    </div>
 
         <br><br>
 
        <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 

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"
@@ -113,7 +107,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 

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

@@ -53,7 +53,7 @@
             $('#menuadm').toggle({ duration: 300 });
         });
 
-        
+
         $('.section-title').click(function() {
             var $section = $(this).parent().next('div');
             if(!$section.length){

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

@@ -1,49 +1,68 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp Move to JS file -->
+    <!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
-    
+    -->
+
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
-    
+
     % my $btn = l('lets_APPLY');
-    %= form_for "letsencryptu" => (method => 'POST') => begin
-        % param 'trt' => $lets_data->{trt} unless param 'trt';
-        %= hidden_field 'trt' => $lets_data->{trt}
+
+    <!-- reetp  could change this to a form -->
+
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
         %# Inputs etc in here.
 
-        <h1 class=""><%=l('lets_Check_all_enabled_domains')%></h1>
-    
-        <h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-    
-        <span class="">
-            %=l('lets_Enabled_domains_check_result')
-        </span>
-        <span class="">
-            % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
-            %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span>
+        <h1><%= l ('lets_Check_all_enabled_domains')%></h1>
+
         <br>
 
-        <span class="">
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class="" type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-        </span>
-        
-    
-        %# Probably finally by a submit.
-    %end    
+        <h2><%= l ('lets_Loop_through_checking_the_letsencrypt')%></h2>
+
+        <br>
+
+        <!-- Domains being checked -->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_Enabled_domains_check_result') %>
+            </div>
+            <div class="col-auto">
+                % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
+                %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+            </div>
+        </div>
+
+        <br>
+
+        <!-- results box-->
+
+        % my $back_text = l('lets_Back');  # Localized text
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <a href='letsencryptd' class="btn btn-primary btn-sm btn-sm" role="button"><%= $back_text %></a>
+
+            </div>
+        </div>
+
+    <!--
+    </form>
+    -->
+
 </div>

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

@@ -1,59 +1,77 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+    <!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
-    
+    -->
+
     % if (config->{debug} == 1) {
         <pre>
             %= dumper $lets_data
         </pre>
     % }
-    
+
     % my $btn = l('lets_APPLY');
-    %= form_for "letsencryptu" => (method => 'POST') => begin
-        % param 'trt' => $lets_data->{trt} unless param 'trt';
-        %= hidden_field 'trt' => $lets_data->{trt}
+
+    <!-- <form action="/smanager/letsencrypt" method="POST"> -->
+
         %# Inputs etc in here.
 
-        <h1 class=""><%=l('lets_Check_just_one_domain')%></h1>
-    
-        <h2 class=""><%=l('lets_Loop_through_and_check_the')%></h2>
-    
-        <p><span class="">
-            %=l('lets_Domains_name')
-        </span>
-        <span class="">
+        <h1><%=l('lets_Check_just_one_domain')%></h1>
+
+        <br>
+
+        <h2><%=l('lets_Loop_through_and_check_the')%></h2>
+
+        <br>
+
+
+        <!-- Domain being checked -->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_Domains_name') %>
+            </div>
+            <div class="col-auto">
             % param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
             %= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
-    
-        <span class="">
-            %=l('lets_One_domain_check_result')
-        </span>
-        <span class="">
+
+        <!-- results box-->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+            <%= l ('lets_One_domain_check_result') %>
+            </div>
+            <div class="col-auto">
             % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
             %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span>
+            </div>
+        </div>
+
         <br>
-    
-        <span class="">
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class="" type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-        </span>
-        
-    
-        %# Probably finally by a submit.
-    %end    
+
+
+        % my $back_text = l('lets_Back');  # Localized text
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <a href='letsencryptd' class="btn btn-primary btn-sm btn-sm" role="button"><%= $back_text %></a>
+
+            </div>
+        </div>
+
+    <!-- </form> -->
+
 </div>

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

@@ -1,152 +1,208 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp Move to JS file -->
+    <!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
-    
+    -->
+
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
-    
-    % my $btn = l('lets_APPLY');
-    %= form_for "letsencryptu" => (method => 'POST') => begin
-        % param 'trt' => $lets_data->{trt} unless param 'trt';
-        %= hidden_field 'trt' => $lets_data->{trt}
+
+
+    <br>
+
+    <!-- reetp  could change this to a form -->
+
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
+        %# my $btn = l('lets_APPLY');
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+        % my $linkbtn = l ('MODIFY');
+
         %# Inputs etc in here.
-
-        <div>
-
-        <a href='letsencryptd?trt=PARAMS' class="">
-            %= l('lets_CONFIG')
-        </a>
-        %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
-    
-    
-        <a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
-            %= l('lets_CHECK_ALL_DOMAINS')
-        </a>
-        %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
-    
-    
-        <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
-            %= l('lets_CHECK_ALL_ENABLED_DOMAINS')
-        </a>
-        %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
-    
-    
+        %# reetp Needs some language translations?
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l('lets_CONFIG') %>
+            </div>
+            <div class="col-auto">
+                <a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            </div>
         </div>
-        
-    
-        <h2 class=""><%=l('lets_For_this_Server')%></h2>
-    
-        <p>
-        <span class="">
-            %=l('lets_Internal_IP')
-        </span>
-        <span class="">
-            % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
-            %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
+
         <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_External_Interface_IP')
-        </span>
-        <span class="">
-            % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
-            %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+
+        %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_CHECK_ALL_DOMAINS') %>
+            </div>
+            <div class="col-auto">
+                <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            </div>
+        </div>
+
+        %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
+
         <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_Internet_IP')
-        </span>
-        <span class="">
-            % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
-            %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+            </div>
+            <div class="col-auto">
+                <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            </div>
+        </div>
+
+        %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
+
+
+    <!-- </form>  -->
+
+
+        <br><br>
+
+        <h2><%=l('lets_For_this_Server') %></h2>
+
         <br>
-        </span>
-        </p>
-    
-        <h2 class=""><%=l('lets_Current_certificate_details')%></h2>
-    
-        <p>
-        <span class="">
-            %=l('lets_Issuer')
-        </span>
-        <span class="">
-            % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
-            %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_Expiry')
-        </span>
-        <span class="">
-            % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
-            %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_Not_Before')
-        </span>
-                <span class="">
-            % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
-            %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
-    
-        <br />
-        <table class="table table-bordered">
-            <thead class="">
-                <tr table-head-row>
-                    <th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>
-                    <th class=""><%=l('lets_Brief_description')%></th>
-                    <th class=""><%=l('lets_Content')%></th>
-                    <th class=""><%=l('lets_LABEL_NAMESERVERS')%></th>
-                    <th class=""><%=l('lets_LABEL_POINT')%></th>
-                    <th class=""><%=l('lets_LABEL_LECERT')%></th>
-                    <th class=""><%=l('lets_IS_IN_CERT')%></th>
-                    <th class=""><%=l('lets_CHECK')%></th>
-                </tr>
-            </thead>
-            <tbody class="">
-                % my $control_data = $c->stash('DomainList');
-                % foreach my $row (@$control_data) {
-                <tr class="">
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>     
-                </tr>
-                %}
-            </tbody>
-        </table>
-        
-    
-        %# Probably finally by a submit.
-    %end    
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l ('lets_Internal_IP') %>
+                </div>
+                <div class="col-auto">
+                    % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
+                    %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l ('lets_External_Interface_IP') %>
+                </div>
+                <div class="col-auto">
+                    % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
+                    %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l ('lets_Internet_IP') %>
+                </div>
+                <div class="col-auto">
+                    % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
+                    %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+                </div>
+            </div>
+
+            <br><br>
+
+            <h2><%=l('lets_Current_certificate_details') %></h2>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                <%= l ('lets_Issuer') %>
+                </div>
+                <div class="col-auto">
+                    % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
+                    %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l ('lets_Expiry') %>
+                </div>
+                <div class="col-auto">
+                    % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
+                    %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l ('lets_Not_Before') %>
+                </div>
+                <div class="col-auto">
+                    % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
+                    %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
+                </div>
+            </div>
+
+            <br><br>
+
+            <h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
+
+            <br>
+
+            % $linkbtn = l 'lets_CHECK';
+
+            <table class="table table-bordered">
+                <thead>
+                    <tr table-head-row>
+                        <th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
+                        <th><%= l ('lets_Brief_description') %></th>
+                        <th><%= l ('lets_Content') %></th>
+                        <th><%= l ('lets_LABEL_NAMESERVERS') %></th>
+                        <th><%= l ('lets_LABEL_POINT') %></th>
+                        <th><%= l ('lets_LABEL_LECERT') %></th>
+                        <th><%= l ('lets_IS_IN_CERT') %></th>
+                        <th><%= l ('lets_CHECK') %></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    % my $control_data = $c->stash('DomainList');
+                    % foreach my $row (@$control_data) {
+                        % my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
+                        % my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
+                        <tr>
+                            % if  ($type eq "Domain\n"){
+                                <td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
+                            % }
+                            % if ($type eq "Host\n") {
+                                <td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
+                            % }
+
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
+
+                            % if ($link ne "") {
+                            <td><a href= "<%= $link %>" class="btn btn-outline-primary btn-sm" role="button" > <%= $linkbtn %></a></td>
+                            % } else {
+                                <td>&nbsp</td>
+                            % }
+                        </tr>
+                    % }
+                </tbody>
+            </table>
+
 </div>

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

@@ -1,130 +1,152 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp This needs fixing -->
+<!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
-    
+-->
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
-    
-    % my $btn = l('lets_APPLY');
-    %= form_for "letsencryptu" => (method => 'POST') => begin
+
+    <form action="/smanager/letsencryptu" method="POST">
+
         % param 'trt' => $lets_data->{trt} unless param 'trt';
         %= hidden_field 'trt' => $lets_data->{trt}
         %# Inputs etc in here.
 
-        <h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:')%></h2>
-    
-        <p class="">
-            %=l('lets_CONFIG_LETSENCRYPT')
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_SERVICE_STATUS')
-        </span>
-                <span class="">
-            %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
-            % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
-            %# param 'status' => $lets_data->{status} unless param 'status';
-            %= select_field 'status' => @status_options, class => ""
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_HOOKSCRIPT_STATUS')
-        </span>
-        <span class="">
-            % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
-            % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
-            %= select_field 'hookScript' => @hookScript_options, class => ""
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_HOSTOVERRIDE_STATUS')
-        </span>
-        <span class="">
-            % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-            % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
-            %= select_field 'hostOverride' => @hostOverride_options, class => ""
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_ACCEPT_TERMS_STATUS')
-        </span>
-        <span class="">
-            % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-            % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
-            %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
-        <br>
-        </span>
-        </p>
+        <h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:') %></h2>
 
-        <p>
-        <span class="">
-            %=l('lets_API_STATUS')
-        </span>
-                <span class="">
-            % my @API_options = [['2' => '2']];
-            % param 'API' => $lets_data->{API} unless param 'API';
-            %= select_field 'API' => @API_options, class => ""
         <br>
-        </span>
-        </p>
 
-        <p>
-        <span class="">
-            %=l('lets_KEYSIZE_STATUS')
-        </span>
-        <span class="">
-            % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
-            % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
-            %= select_field 'keysize' => @keysize_options, class => ""
+        <div>
+            <%= l ('lets_CONFIG_LETSENCRYPT') %>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_SERVICE_STATUS') %>
+            </div>
+            <div class="col-auto">
+                    % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
+                    %= select_field 'status' => @status_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
-        <span class="">
-            %=l('lets_CONFIGUREMODE_STATUS')
-        </span>
-        <span class="">
-            % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
-            % param 'configure' => $lets_data->{configure} unless param 'configure';
-            %= select_field 'configure' => @configure_options, class => ""
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_HOOKSCRIPT_STATUS') %>
+            </div>
+            <div class="col-auto">
+                % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
+                % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
+                %= select_field 'hookScript' => @hookScript_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
-        <span class="">
-            %=l('lets_EMAIL')
-        </span>
-        <span class="">
-            % param 'email' => $lets_data->{email} unless param 'email';
-            %=email_field 'email', class => ""
-        </span>
-        </p>
 
-        <span class="">
-            %= submit_button l('lets_Save'), class => ""
-        </span>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_HOSTOVERRIDE_STATUS') %>
+            </div>
+            <div class="col-auto">
+                % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
+                % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
+                %= select_field 'hostOverride' => @hostOverride_options, class => "form-select"
+            </div>
+        </div>
 
-        %# Probably finally by a submit.
-    %end    
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_ACCEPT_TERMS_STATUS') %>
+            </div>
+            <div class="col-auto">
+                % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
+                % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
+                %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_API_STATUS') %>
+            </div>
+            <div class="col-auto">
+                % my @API_options = [['2' => '2']];
+                % param 'API' => $lets_data->{API} unless param 'API';
+                %= select_field 'API' => @API_options, class => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_KEYSIZE_STATUS') %>
+            </div>
+            <div class="col-auto">
+                % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
+                % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
+                %= select_field 'keysize' => @keysize_options, class => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_CONFIGUREMODE_STATUS') %>
+            </div>
+            <div class="col-auto">
+                % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
+                % param 'configure' => $lets_data->{configure} unless param 'configure';
+                %= select_field 'configure' => @configure_options, class => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="email_address" class="col-form-label"><%= l ('lets_EMAIL') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'email' => $lets_data->{email} unless param 'email';
+                <input type="email" name="email" id="email_address" class="form-control" aria-describedby="Email Address" value="<%= $lets_data->{email} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('lets_APPLY');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 </div>

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

@@ -1,42 +1,43 @@
 <div>
 
-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
+    % my $retref = $c->stash("ret");
+    % my %ret = $retref ? %$retref : (ret => "");
+    % my @vars = split(/,/, $ret{vars} // '');
+    % 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];
-
-    %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->open();
-
-   % if (config->{debug} == 1) {
-    <div>
-        <%= dumper $c->current_route %>
-        <%= dumper $c->stash("ret") %>
-    </div>
+    % if ($c->app->config->{debug}) {
+        <br>
+        <pre>
+            <%= dumper { ret_data => \%ret } %>
+        </pre>
     % }
 
+	% 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>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $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>
-
-        <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
-        <br>
-        <span class="">
-            <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
-        </span>
-        <span class="">
-            <%= check_box deletehost=>1, checked=>1 %>
-        </span>
-        <br><br>
+            <div>
+                <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
+            <br>
+            <div class="text-danger align-bottom">
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
+            </div>
+            <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>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $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 %ret;
-        % unless (length($retref)) {%ret = (ret=>"");}
-        % else {%ret = %$retref;}
+        % my $retref = $c->stash("ret");
+        % my %ret = $retref ? %$retref : (ret => "");
+        % my @vars = split(/,/, $ret{vars} // '');
+        % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-        % if (config->{debug} == 1) {
-            <div>
-                %= dumper "Ret:".$ret{ret};
-            </div>
+        % if ($c->app->config->{debug}) {
+            <br>
+            <pre>
+                <%= dumper { ret_data => \%ret } %>
+            </pre>
         % }
 
-        % my @vars = split(",",$ret{vars});
-        % my $var1 = @vars[0];
-        % my $var2 = @vars[1];
-        % my $var3 = @vars[2];
-        % my $var4 = @vars[3];
-        % my $var5 = @vars[4];
-        % my $var6 = @vars[5];
-        % my $var7 = @vars[6];
-
-        %if ($ret{ret} eq "") {
+        % 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},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
             </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>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 
-    </form>
-
-    <br>
-    % my $numlocalnetworks = @$localnetworks;
-    % if ($numlocalnetworks == 0) {
-        <%= l 'ln_LOCAL_NETWORK_NONE' %>
-    % } else {
         <br>
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <th><%= l 'NETWORK' %></th>
-                    <th><%= l 'ln_SUBNET_MASK' %></th>
-                    <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
-                    <th><%= l 'ROUTER' %></th>
-                    <th><%= l 'ACTION' %></th>
-                </tr>
-            </thead>
-            <tbody>
-                % foreach my $localnetwork (@$localnetworks ) {
-                    % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
-                    % my $removable = $localnetwork->prop('Removable') || "yes";
-                    % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
-                    % if ( $system eq "yes" ) { $removable = "no"; }
-                        <tr>
-                            <td><%= $localnetwork->key %>
-                            <td><%= $localnetwork->prop('Mask') %>
-                            <td><%= $num_hosts %>
-                            <td><%= $localnetwork->prop('Router') %>
-                            % my $actionRemove = '&nbsp;';
-                            % if ($removable eq "yes") {
-                                %my $remove_text = l('REMOVE');  # Localized text
-                                %my $local_network_entry = $localnetwork->key;
-                                %my $csrf_token = "TOKEN";  # CSRF token for security
-                                %$actionRemove = qq{
-                                % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
-                                %       $remove_text
-                                %   </button>
-                                % </a>
-                                %};
-                            % }
-                            <td><%= $c->render_to_string(inline => $actionRemove) %></td>
-                        </tr>
-                    % }
-            </tbody>
-        </table>
-        <%= hidden_field 'trt' => $ln_datas->{trt} %>
-    % }
+
+        % my $numlocalnetworks = @$localnetworks;
+        % if ($numlocalnetworks == 0) {
+            <%= l 'ln_LOCAL_NETWORK_NONE' %>
+        % } else {
+            <br>
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th><%= l 'NETWORK' %></th>
+                        <th><%= l 'ln_SUBNET_MASK' %></th>
+                        <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
+                        <th><%= l 'ROUTER' %></th>
+                        <th class="text-center"><%= l 'ACTION' %></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    % foreach my $localnetwork (@$localnetworks ) {
+                        % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
+                        % my $removable = $localnetwork->prop('Removable') || "yes";
+                        % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
+                        % if ( $system eq "yes" ) { $removable = "no"; }
+                            <tr class="align-middle">
+                                <td><%= $localnetwork->key %></td>
+                                <td><%= $localnetwork->prop('Mask') %></td>
+                                <td><%= $num_hosts %></td>
+                                <td><%= $localnetwork->prop('Router') %></td>
+                                % my $actionRemove = '&nbsp;';
+                                % if ($removable eq "yes") {
+                                    %my $remove_text = l('REMOVE');  # Localized text
+                                    %my $local_network_entry = $localnetwork->key;
+                                    %my $csrf_token = "TOKEN";  # CSRF token for security
+                                    %$actionRemove = qq{
+                                    % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
+                                    %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
+                                    %       $remove_text
+                                    %   </button>
+                                    % </a>
+                                    %};
+                                % }
+                                <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/_login.html.ep

@@ -38,7 +38,7 @@
               <!-- /.col -->
               <div class="col-4">
                 <div class="d-grid gap-2">
-                  <button type="submit" class="btn btn-primary">Sign In</button>
+                  <button type="submit" class="btn btn-primary btn-sm">Sign In</button>
                 </div>
               </div>
               <!-- /.col -->

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

@@ -1,13 +1,13 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailaccess";
+%# layout 'AdminLTE', title => "Sme server 2 - emailaccess";
 
-% content_for 'module' => begin
+%# content_for 'module' => begin
 
-<div class="card-body">
+<!-- <div class="card-body"> -->
 
     % if (config->{debug} == 1) {
     <pre>
-        %= dumper $c->current_route
-        %= dumper $mai_datas
+        <%= dumper $c->current_route %>
+        <%= dumper $mai_data %>
     </pre>
     % }
 
@@ -18,11 +18,12 @@
         </div>
     % }
 
-    <h1><%= $title%></h1>
+    <!-- <h1><%#= $title%></h1> -->
+    <h2><%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %></h2>
 
     <br>
 
-    <form action="/smanager/emailsettingd" method="POST">
+    <form action="/smanager/emailsettingsu" method="POST">
 
         <div>
             <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
@@ -83,7 +84,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 
@@ -92,4 +93,5 @@
     <br>
 
 </div>
-%end
+
+%#end

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

@@ -1,13 +1,13 @@
-% layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
+%# layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
 
-% content_for 'module' => begin
+%# content_for 'module' => begin
 
-<div class="card-body">
+<!-- <div class="card-body"> -->
 
     % if (config->{debug} == 1) {
         <pre>
-            <<%=  dumper $c->current_route %>
-            <<%=  dumper $mai_datas %>
+            <%= dumper $c->current_route %>
+            <%= dumper $mai_data %>
         </pre>
     % }
 
@@ -15,15 +15,16 @@
     % if ( stash 'error' ) {
         <br>
         <div class="text-danger">
-            <%=  $c->render_to_string(inline => stash 'error') %>
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
-    <h1><%=  $title %></h1>
+    <!-- <h1><%#= $title%></h1> -->
+    <h2><%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %></h2>
 
     <br>
 
-    <form action="/smanager/emailsettingd" method="POST">
+    <form action="/smanager/emailsettingsu" method="POST">
 
         <h2><%= l 'mai_TITLE_UNKNOWN' %></h2>
 
@@ -40,7 +41,7 @@
                 <%= l 'mai_LABEL_UNKNOWN' %>
             </div>
             <div class="col-auto">
-                % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
+                % param 'EmailUnknownUser' => $mai_data->{emailunknownuser} unless param 'EmailUnknownUser';
                 <%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "form-select" %>
             </div>
         </div>
@@ -58,14 +59,14 @@
 
         <br>
 
-        % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
+        % param 'DelegateMailServer' => $mai_data->{delegatemailserver} unless param 'DelegateMailServer';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputDelegateMailServer" class="col-form-label"><%= l 'mai_LABEL_DELEGATE' %></label>
             </div>
             <div class="col-auto">
-                <input type="text" name="DelegateMailServer" id="inputDelegateMailServer" class="form-control" aria-describedby="DelegateMailServer" value="<%= $mai_datas->{delegatemailserver} %>">
+                <input type="text" name="DelegateMailServer" id="inputDelegateMailServer" class="form-control" aria-describedby="DelegateMailServer" value="<%= $mai_data->{delegatemailserver} %>">
             </div>
         </div>
 
@@ -82,20 +83,20 @@
 
         <br>
 
-        % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
+        % param 'SMTPSmartHost' => $mai_data->{smtpsmarthost} unless param 'SMTPSmartHost';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputSMTPSmartHost" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST' %></label>
             </div>
             <div class="col-auto">
-                <input type="text" name="SMTPSmartHost" id="inputSMTPSmartHost" class="form-control" aria-describedby="SMTPSmartHost" value="<%= $mai_datas->{smtpsmarthost} %>">
+                <input type="text" name="SMTPSmartHost" id="inputSMTPSmartHost" class="form-control" aria-describedby="SMTPSmartHost" value="<%= $mai_data->{smtpsmarthost} %>">
             </div>
         </div>
 
         <br>
 
-        % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
+        % param 'SMTPAUTHPROXY_status' => $mai_data->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -108,50 +109,45 @@
 
         <br>
 
-        % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
+        % param 'SMTPAUTHPROXY_Userid' => $mai_data->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputSMTPAuthproxy" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' %></label>
             </div>
             <div class="col-auto">
-                <input type="text" name="SMTPAUTHPROXY_Userid" id="inputSMTPAuthproxy" class="form-control" aria-describedby="SMTPAuthproxy" value="<%= $mai_datas->{smtpauthproxyuserid} %>">
+                <input type="text" name="SMTPAUTHPROXY_Userid" id="inputSMTPAuthproxy" class="form-control" aria-describedby="SMTPAuthproxy" value="<%= $mai_data->{smtpauthproxyuserid} %>">
             </div>
         </div>
 
         <br>
 
-       % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
+       % param 'SMTPAUTHPROXY_Passwd' => $mai_data->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="password" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' %></label>
             </div>
            <div class="col-auto">
-                <input type="password" name="SMTPAUTHPROXY_Passwd" id="password" class="form-control" aria-describedby="SMTPAuthProxyPassword" value="<%= $mai_datas->{smtpauthproxypassword} %>">
+                <input type="password" name="SMTPAUTHPROXY_Passwd" id="password" class="form-control" aria-describedby="SMTPAuthProxyPassword" value="<%= $mai_data->{smtpauthproxypassword} %>">
             </div>
             <div class="col-auto">
                 <span id="togglePassword" class="bi bi-eye"></span>
             </div>
         </div>
 
-
-
-
-
-
         <br>
 
-
         % my $btn = l('SAVE');
         <%= hidden_field 'trt' => 'DEL' %>
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 
     </form>
 </div>
-%end
+
+%#end

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

@@ -1,13 +1,13 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailfilter";
+%# layout 'AdminLTE', title => "Sme server 2 - emailfilter";
 
-% content_for 'module' => begin
+%# content_for 'module' => begin
 
-<div class="card-body">
+<!-- <div class="card-body"> -->
 
     % if (config->{debug} == 1) {
         <pre>
             <%= dumper $c->current_route %>
-            <%= dumper $mai_datas %>
+            <%= dumper $mai_data %>
         </pre>
     % }
 
@@ -18,11 +18,12 @@
         </div>
     % }
 
-    <h1><%= $title%></h1>
+    <!-- <h1><%#= $title%></h1> -->
+    <h2><%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %></h2>
 
     <br>
 
-    <form action="/smanager/emailsettingd" method="POST">
+    <form action="/smanager/emailsettingsu" method="POST">
 
         <div>
             <%= l 'mai_DESC_VIRUS_SCAN' %>
@@ -35,7 +36,7 @@
                     <%= l 'mai_LABEL_VIRUS_SCAN' %>
             </div>
             <div class="col-auto">
-                % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
+                % param 'VirusStatus' => $mai_data->{virusstatus} unless param 'VirusStatus';
                 <%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
             </div>
         </div>
@@ -53,7 +54,7 @@
                 <%= l 'mai_LABEL_SPAM_SCAN' %>
             </div>
             <div class="col-auto">
-                % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
+                % param 'Spamstatus' => $mai_data->{spamstatus} unless param 'Spamstatus';
                 <%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
             </div>
         </div>
@@ -65,7 +66,7 @@
                 <%= l 'mai_LABEL_SPAM_SENSITIVITY' %>
             </div>
             <div class="col-auto">
-                % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
+                % param 'SpamSensitivity' => $mai_data->{spamsensitivity} unless param 'SpamSensitivity';
                 <%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "form-select" %>
             </div>
         </div>
@@ -77,7 +78,7 @@
                 <%= l 'mai_LABEL_SPAM_TAGLEVEL' %>
             </div>
             <div class="col-auto">
-                % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
+                % param 'SpamTagLevel' => $mai_data->{spamtaglevel} unless param 'SpamTagLevel';
                 <%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "form-select" %>
             </div>
         </div>
@@ -89,7 +90,7 @@
                 <%= l 'mai_LABEL_SPAM_REJECTLEVEL' %>
             </div>
             <div class="col-auto">
-                % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
+                % param 'SpamRejectLevel' => $mai_data->{spamrejectlevel} unless param 'SpamRejectLevel';
                 <%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "form-select" %>
             </div>
         </div>
@@ -101,7 +102,7 @@
                 <%= l 'mai_LABEL_SORTSPAM' %>
             </div>
             <div class="col-auto">
-                % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
+                % param 'SpamSortSpam' => $mai_data->{spamsortspam} unless param 'SpamSortSpam';
                  <%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
             </div>
         </div>
@@ -119,14 +120,14 @@
                 <%= l 'mai_LABEL_SPAM_SUBJECTTAG' %>
             </div>
             <div class="col-auto">
-                % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
+                % param 'SpamSubjectTag' => $mai_data->{spamsubjecttag} unless param 'SpamSubjectTag';
                 <%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
             </div>
         </div>
 
         <br>
 
-        % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
+        % param 'SpamSubject' => $mai_data->{spamsubject} unless param 'SpamSubject';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
@@ -134,7 +135,7 @@
             </div>
             <div class="col-auto">
                 <!-- text_field 'Soft' -->
-                <input type="text" name="SpamSubject" id="inputSpamSubjectTag" class="form-control" aria-describedby="SpamSubjectTag" value="<%= $mai_datas->{spamsubject} %>">
+                <input type="text" name="SpamSubject" id="inputSpamSubjectTag" class="form-control" aria-describedby="SpamSubjectTag" value="<%= $mai_data->{spamsubject} %>">
             </div>
         </div>
 
@@ -165,11 +166,12 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 
     </form>
 
 </div>
-%end
+
+%#end

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

@@ -0,0 +1,206 @@
+
+    % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $mai_data %>
+            <br>
+        </pre>
+    % }
+
+    <h2><%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %></h2>
+
+    <form action="/smanager/emailsettings" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+            <%= $c->get_current_pop3_access( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_imap_access( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_WEBMAIL' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_webmail_status( TRUE ) %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
+        <%= hidden_field 'trt' => 'ACC' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+
+    <br><br>
+
+    <!--<hr class="" />-->
+
+    <form action="/smanager/emailsettings" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_VIRUS_SCAN' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_virus_status(TRUE) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <%= l 'mai_LABEL_SPAM_SCAN' %>
+            </div>
+           <div class="col-auto">
+           <%= $c->get_spam_status(TRUE) %>
+           </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_patterns_status(TRUE) %>
+            </div>
+        </div>
+
+        <br>
+
+        % $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
+        <%= hidden_field 'trt' => 'FIL' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+
+    <br><br>
+
+    <!--<hr class="" />-->
+
+    <form action="/smanager/emailsettings" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_MODE' %>
+            </div>
+            <div class="col-auto">
+                <%= $mai_data->{fetchmailmethod} %>
+            </div>
+        </div>
+
+        % my $smtp_mesg;
+
+        % $smtp_mesg=l('SMTP port %u allow client to authenticate:');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_auth( TRUE ) %>
+            </div>
+        </div>
+
+        % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %>
+            </div>
+        </div>
+
+        % $smtp_mesg=l 'Submission port %u status:';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) %>
+            </div>
+        </div>
+
+        <br>
+
+        % $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
+        <%= hidden_field 'trt' => 'REC' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
+
+    <br><br>
+
+    <!--<hr class="" />-->
+
+    <form action="/smanager/emailsettings" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_UNKNOWN' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_emailunknownuser_status( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_DELEGATE' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_value('DelegateMailServer') %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SMARTHOST' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_value('SMTPSmartHost') %>
+            </div>
+        </div>
+
+        <br>
+
+
+        % $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
+        <%= hidden_field 'trt' => 'DEL' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+
+        <br>
+
+    </form>

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

@@ -1,16 +1,16 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailreceive";
+%# layout 'AdminLTE', title => "Sme server 2 - emailreceive";
 
-% content_for 'module' => begin
+%# content_for 'module' => begin
 
-% use constant FALSE => 0;
-% use constant TRUE  => 1;
+%# use constant FALSE => 0;
+%# use constant TRUE  => 1;
 
-<div class="card-body">
+<!-- <div class="card-body"> -->
 
     % if (config->{debug} == 1) {
         <pre>
             <<%=  dumper $c->current_route %>
-            <<%=  dumper $mai_datas %>
+            <<%=  dumper $mai_data %>
             <<%=  dumper $c->param('SMTPAuth') %>
         </pre>
     % }
@@ -22,30 +22,26 @@
         </div>
     % }
 
-    <h1><%=  $title %></h1>
+    <!--<h1><%#=  $title %></h1> -->
+
+    <h2><%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %></h2>
 
     <br>
 
-    <form action="/smanager/emailsettingd" method="POST">
+    <form action="/smanager/emailsettingsu" method="POST">
 
         <div>
             <%= l 'mai_DESC_MODE' %>
         </div>
 
+        <br>
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <%= l 'mai_LABEL_MODE' %>
             </div>
             <div class="col-auto">
-                % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
-                <!--
-                <pre>
-                    <%=  dumper $mai_datas->{fetchmailmethod}  %>
-                    <%=  dumper $c->get_retrieval_opt()  %>
-                    <%=  param 'FetchmailMethod'  %>
-                </pre>
-                -->
+                % param 'FetchmailMethod' => $mai_data->{fetchmailmethod} unless param 'FetchmailMethod';
                 <%=  select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class =>"form-select" %>
             </div>
         </div>
@@ -72,7 +68,6 @@
             <br>
 
             <div>
-
                 <%=  l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %>
             </div>
 
@@ -86,8 +81,6 @@
 
         <br>
 
-
-
         % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
         % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
 
@@ -96,15 +89,6 @@
                 <%=  sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
             </div>
             <div class="col-auto">
-
-                <!--
-                <pre>
-                    <%=  dumper $c->get_smtp_auth_opt() %>
-                    <%=  dumper $c->get_current_smtp_auth(FALSE) %>
-                    <%=  dumper $c->get_db_prop("qpsmtpd","Authentication") %>
-                    <%=  param 'SMTPAuth'  %>
-                </pre>
-                -->
                 <%=  select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "form-select" %>
             </div>
         </div>
@@ -158,14 +142,14 @@
 
         <br>
 
-        % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
+        % param 'SecondaryMailServer' => $mai_data->{secondarymailserver} unless param 'SecondaryMailServer';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputSecondaryMailServer" class="col-form-label"><%= l 'mai_LABEL_SECONDARY' %></label>
             </div>
             <div class="col-auto">
-                <input type="text" name="SecondaryMailServer" id="inputSecondaryMailServer" class="form-control" aria-describedby="SecondaryMailServer" value="<%= $mai_datas->{secondarymailserver} %>">
+                <input type="text" name="SecondaryMailServer" id="inputSecondaryMailServer" class="form-control" aria-describedby="SecondaryMailServer" value="<%= $mai_data->{secondarymailserver} %>">
             </div>
         </div>
 
@@ -175,7 +159,7 @@
             <%= l 'mai_DESC_FETCH_PERIOD' %>
         </div>
 
-        % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
+        % param 'FreqOffice' => $mai_data->{freqoffice} unless param 'FreqOffice';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -188,7 +172,7 @@
 
         <br>
 
-        % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
+        % param 'FreqOutside' => $mai_data->{freqoutside} unless param 'FreqOutside';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -201,7 +185,7 @@
 
         <br>
 
-        % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
+        % param 'FreqWeekend' => $mai_data->{freqweekend} unless param 'FreqWeekend';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -214,27 +198,27 @@
 
         <br>
 
-        % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
+        % param 'SecondaryMailAccount' => $mai_data->{secondarymailaccount} unless param 'SecondaryMailAccount';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputSecondaryMailAccount" class="col-form-label"><%= l 'mai_LABEL_POP_ACCOUNT' %></label>
             </div>
             <div class="col-auto">
-                <input type="text" name="SecondaryMailAccount" id="inputSecondaryMailAccount" class="form-control" aria-describedby="SecondaryMailAccount" value="<%= $mai_datas->{secondarymailaccount} %>">
+                <input type="text" name="SecondaryMailAccount" id="inputSecondaryMailAccount" class="form-control" aria-describedby="SecondaryMailAccount" value="<%= $mai_data->{secondarymailaccount} %>">
             </div>
         </div>
 
         <br>
 
-        % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
+        % param 'SecondaryMailPassword' => $mai_data->{secondarymailpassword} unless param 'SecondaryMailPassword';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="password" class="col-form-label"><%= l 'mai_LABEL_POP_PASS' %></label>
             </div>
             <div class="col-auto">
-                <input type="password" name="SecondaryMailPassword" id="password" class="form-control" aria-describedby="SecondaryMailPassword" value="<%= $mai_datas->{secondarymailpassword} %>">
+                <input type="password" name="SecondaryMailPassword" id="password" class="form-control" aria-describedby="SecondaryMailPassword" value="<%= $mai_data->{secondarymailpassword} %>">
             </div>
             <div class="col-auto">
                 <span id="togglePassword" class="bi bi-eye"></span>
@@ -244,7 +228,7 @@
 
         <br>
 
-        % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
+        % param 'SpecifyHeader' => $mai_data->{specifyheader} unless param 'SpecifyHeader';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -257,30 +241,32 @@
 
         <br>
 
-        % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
+        % param 'SecondaryMailEnvelope' => $mai_data->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputSecondaryMailEnvelope" class="col-form-label"><%= l 'mai_LABEL_SORT_HEADER' %></label>
             </div>
             <div class="col-auto">
-                <input type="text" name="SecondaryMailEnvelope" id="inputSecondaryEnvelope" class="form-control" aria-describedby="SecondaryMailEnvelope" value="<%= $mai_datas->{secondarymailenvelope} %>">
+                <input type="text" name="SecondaryMailEnvelope" id="inputSecondaryEnvelope" class="form-control" aria-describedby="SecondaryMailEnvelope" value="<%= $mai_data->{secondarymailenvelope} %>">
             </div>
         </div>
 
         <br>
 
         % my $btn = l('SAVE');
+        % param 'trt' => $mai_data->{trt} unless param 'trt';
         <%=  hidden_field 'trt' => 'REC' %>
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 
     </form>
 
 </div>
-%end
+
+%#end
 

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

@@ -1,163 +1,206 @@
 %#
-%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 <div>
+
+<!-- reetp This needs fixing -->
+<!--
     <script>
         window.onload = function() {
-        SelectInput(); 
+        SelectInput();
     };
-
     </script>
-    % if (config->{debug} == 1) {
+-->
+
+    % if (config->{debug} == 0) {
         <pre>
             %= dumper $nut_data
         </pre>
     % }
 
-    % my $btn = l('nut_APPLY');
-    %= form_for "nutupsu" => (method => 'POST') => begin
-        % param 'trt' => $nut_data->{trt} unless param 'trt';
-        %= hidden_field 'trt' => $nut_data->{trt}
+
+    <form action="/smanager/nutupsu" method="POST">
+
         %# Inputs etc in here.
 
-        <h2 class=""><%=l('nut_Manage_Nutups-config_settings:')%></h2>
-    
-        <p>
-        <span class="">
-            %=l('nut_Nut_status')
-        </span>
-        <span class="">
+        <!-- reetp - autocomplete="off" ? -->
+
+        <h2><%=l('nut_Manage_Nutups-config_settings:')%></h2>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('nut_Nut_status') %>
+            </div>
+            <div class="col-auto">
             %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
             %# param 'status' => $nut_data->{status} unless param 'status';
 
-            % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
-            %= select_field 'status' => @status_options, class => "", id => ""
+                % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
+                <%= select_field 'status' => @status_options, class => "form-select"  %>
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('nut_Nut_mode')
-        </span>
-        <span class="">
-            % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
-            % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
-            %= select_field 'Nutmode' => @Nutmode_options, class => "", id => ""
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('nut_Nut_mode') %>
+            </div>
+            <div class="col-auto">
+                % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
+                % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
+                <%= select_field 'Nutmode' => @Nutmode_options, class => "form-select" %>
+            </div>
+        </div>
+
+        <br><br>
+
+        <h2><%=l('nut_if_Net_Server')%></h2>
+
         <br>
-        </span>
-        </p>
-    
-        <div class="">
-            <h2 class=""><%=l('nut_if_Net_Server')%></h2>
-        
-            <p>
-            <span class="">
-                %=l('nut_MasterUPS_UPSNAME@IP')
-            </span>
-            <span class="">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputMasterUPSName" class="col-form-label"><%= l ('nut_MasterUPS_UPSNAME@IP') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
-                %= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
-            <br>
-            </span>
-            </p>
+                <input type="text" name="MasterUPS_Name" pattern=".*" size="50" id="inputMasterUPSName" class="form-control" aria-describedby="Master UPS Name" placeholder="ups@localhost" value="<%= $nut_data->{MasterUPS_Name} %>" >
+            </div>
+        </div>
 
-            <p>
-            <span class="">
-                %=l('nut_MasterUPS_Password')
-            </span>
-            <span class="">
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="MasterUPSPassword" class="col-form-label"><%= l ('nut_MasterUPS_Password') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
-                %=password_field 'MasterUPS_Password', class => ""
-            </span>
-            </p>
+                <input type="password" name="MasterUPS_Password" id="MasterUPSPassword" class="form-control" aria-describedby="Master UPS Password" value="<%= $nut_data->{MasterUPS_Password} %>">
+            </div>
+            <!-- reetp fix toggle password -->
+            <!-- <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+            -->
+        </div>
 
-            <p>
-            <span class="">
-                %=l('nut_UPS_Model')
-            </span>
-            <span class="">
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('nut_UPS_Model') %>
+            </div>
+            <div class="col-auto">
                 % my @UPS_Model_options = $c->get_model_options();
                 % param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
-                %= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => ""
-            <br>
-            </span></p>
+                %= select_field 'UPS_Model' => \@UPS_Model_options, class => "form-select"
+            </div>
+        </div>
 
-            <p><span class="">
-                %=l('nut_UPS_Device')
-            </span><span class="">
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputUPSDevice" class="col-form-label"><%= l ('nut_UPS_Device') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
-                %= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)'
-            <br></span></p>
+                <input type="text" name="UPS_Device" pattern=".*" size="50" id="inputUPSDevice" class="form-control" aria-describedby="UPS Device" placeholder="auto (for usb)" value="<%= $nut_data->{UPS_Device} %>" >
+            </div>
+        </div>
+
+        <br><br>
+
+        <h2><%=l('nut_if_Net_Client')%></h2>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSlaveUPSDevice" class="col-form-label"><%= l ('nut_SlaveUPS_UPSNAME@IP') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
+                <input type="text" name="SlaveUPS_Name" pattern=".*" size="50" id="inputSlaveUPSDevice" class="form-control" aria-describedby="Slave UPS Name" placeholder="upsname@IP" value="<%= $nut_data->{SlaveUPS_Name} %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="SlaveUPSPassword" class="col-form-label"><%= l ('nut_SlaveUPS_Password') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'SlaveUPS_Pass' => $nut_data->{SlaveUPS_Pass} unless param 'SlaveUPS_Pass';
+                <input type="password" name="SlaveUPS_Pass" id="SlaveUPSPassword" class="form-control" aria-describedby="Slave UPS Password" value="<%= $nut_data->{SlaveUPS_Pass} %>">
+            </div>
+            <!-- reetp fix toggle password -->
+            <!-- <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+            -->
+        </div>
+
+        <br><br>
+
+        <h2><%=l('nut_if_genericups')%></h2>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputUPSGenericType" class="col-form-label"><%= l ('nut_UPS_Generic_Type') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
+                <input type="text" name="UPS_gen_Type" pattern=".*" size="50" id="inputUPSGenericType" class="form-control" aria-describedby="UPS Generic Type" placeholder="UPS_Gen_Type" value="<%= $nut_data->{UPS_gen_Type} %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputUPSManufacturer" class="col-form-label"><%= l ('nut_UPS_Generic_Manufacturer') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
+                <input type="text" name="UPS_gen_Mfr" pattern=".*" size="50" id="inputUPSManufacturer" class="form-control" aria-describedby="UPS Generic Manufacturer" placeholder="UPS_sen_Mfr" value="<%= $nut_data->{UPS_gen_Mfr} %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputUPSModel" class="col-form-label"><%= l ('nut_UPS_Generic_Model') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
+                <input type="text" name="UPS_gen_Model" pattern=".*" size="50" id="inputUPSModel" class="form-control" aria-describedby="UPS Generic Model" placeholder="UPS_gen_Model" value="<%= $nut_data->{UPS_gen_Model} %>" >
+            </div>
+        </div>
+
+        <br>
+
+        % param 'trt' => $nut_data->{trt} unless param 'trt';
+        <%= hidden_field 'trt' => $nut_data->{trt} %>
+
+        % my $btn = l ('nut_Save');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
         </div>
-        
-        <div class="">
-            <h2 class=""><%=l('nut_if_Net_Client')%></h2>
-            <p>
-            <span class="">
-                %=l('nut_SlaveUPS_UPSNAME@IP')
-            </span>
-            <span class="">
-                % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
-                %= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP'
-            <br>
-            </span>
-            </p>
-        
-            <p>
-            <span class="">
-                %=l('nut_SlaveUPS_Password')
-            </span>
-            <span class="">
-                % param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
-                %=password_field 'SlaveUPS_Password', class => ""
-            </span>
-            </p>
-        </div>
-    
-        <div class="">
-`           <h2 class=""><%=l('nut_if_genericups')%></h2>
-            <p>
-            <span class="">
-                %=l('nut_UPS_Generic_Type')
-            </span>
-            <span class="">
-                % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
-                %= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type'
-            <br>
-            </span>
-            </p>
-        
-            <p>
-            <span class="">
-                %=l('nut_UPS_Generic_Manufacturer')
-            </span>
-            <span class="">
-                % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
-                %= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
-            <br>
-            </span>
-            </p>
-        
-            <p>
-            <span class="">
-                %=l('nut_UPS_Generic_Model')
-            </span>
-            <span class="">
-                % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
-                %= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model'
-            <br>
-            </span>
-            </p>
-`       </div>
-            
-        <span class="">
-            %= submit_button l('nut_Save'), class => ""
-        </span>
-    
 
-        
-    
         %# Probably finally by a submit.
-    %end    
+    </form>
+    <br>
+
 </div>

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

@@ -1,19 +1,22 @@
 %#
-%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 <div>
+
+<!--
     <script>
         window.onload = function() {
-        SelectInput(); 
+        SelectInput();
     };
-    
     </script>
+-->
+
     % if (config->{debug} == 1) {
         <pre>
             %= dumper $nut_data
         </pre>
     % }
-    
+
     % my $btn = l('nut_APPLY');
     %= form_for "nutupsu" => (method => 'POST') => begin
         % param 'trt' => $nut_data->{trt} unless param 'trt';
@@ -21,22 +24,22 @@
         %# Inputs etc in here.
 
         <div class="">
-        
-    
+
+
         <a href='nutupsd?trt=CONFIG' class="">
             %= l('nut_Configure_NutUPS')
         </a>
         %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1'
-    
-    
+
+
+        </div>
+
+
+        <h2><%= l ('nut_Status_of_the_controlled_UPS')%></h2>
+
+        <div >
+            <%= l ('nut_Descriptive_paragraph') %>
         </div>
-        
-    
-        <h2 class=""><%=l('nut_Status_of_the_controlled_UPS')%></h2>
-    
-        <p class="">
-            %=l('nut_Descriptive_paragraph')
-        </p>
 
 <!--
         <span class="">
@@ -48,9 +51,9 @@
         </span>
         <br>
 -->
-        
+
         %= include 'partials/_nut_UPS_STATUS'
-    
+
         %# Probably finally by a submit.
-    %end    
+    %end
 </div>

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

@@ -1,45 +1,107 @@
 <h1>UPS Status</h1>
+
 %= stylesheet '/css/nut_ups-status-page.css'
+
 <div class="container-md">
-        <div>
-            <h2>Device Information</h2>
-            <table class="table table-bordered">
-                <tr><td>Manufacturer:</td><td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td></tr>
-                <tr><td>Model:</td><td><%= $nut_data->{'ups_data'}->{'device.model'} %></td></tr>
-                <tr><td>Serial:</td><td><%= $nut_data->{'ups_data'}->{'device.serial'} %></td></tr>
-                <tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'device.type'} %></td></tr>
-            </table>
-        </div>
-        
-        <div>
-            <h2>Battery Status</h2>
-            <table class="table table-bordered">
-                <tr><td>Charge:</td><td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td></tr>
-                <tr><td>Runtime:</td><td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td></tr>
-                <tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td></tr>
-                <tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'battery.type'} %></td></tr>
-            </table>
-        </div>
-        
-        <div>
-            <h2>Input Power</h2>
-            <table class="table table-bordered">
-                <tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td></tr>
-                <tr><td>Nominal Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V</td></tr>
-                <tr><td>Sensitivity:</td><td><%= $nut_data->{'ups_data'}->{'input.sensitivity'} %></td></tr>
-                <tr><td>Transfer High:</td><td><%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V</td></tr>
-                <tr><td>Transfer Low:</td><td><%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V</td></tr>
-            </table>
-        </div>
-        
-        <div>
-            <h2>UPS Status</h2>
-            <table class="table table-bordered">
-                <tr><td>Status:</td><td><%= $nut_data->{'ups_data'}->{'ups.status'} %></td></tr>
-                <tr><td>Load:</td><td><%= $nut_data->{'ups_data'}->{'ups.load'} %>%</td></tr>
-                <tr><td>Beeper:</td><td><%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %></td></tr>
-                <tr><td>Firmware:</td><td><%= $nut_data->{'ups_data'}->{'ups.firmware'} %></td></tr>
-                <tr><td>Test Result:</td><td><%= $nut_data->{'ups_data'}->{'ups.test.result'} %></td></tr>
-            </table>
-        </div>
+    <div>
+        <h2>Device Information</h2>
+        <table class="table table-bordered">
+            <tr>
+                <td>Manufacturer:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td>
+            </tr>
+            <tr>
+                <td>Model:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.model'} %></td>
+            </tr>
+            <tr>
+                <td>Serial:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.serial'} %></td>
+            </tr>
+            <tr>
+                <td>Type:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.type'} %></td>
+            </tr>
+        </table>
+    </div>
+
+    <br>
+
+    <div>
+        <h2>Battery Status</h2>
+        <table class="table table-bordered">
+            <tr>
+                <td>Charge:</td>
+                <td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td>
+            </tr>
+            <tr>
+                <td>Runtime:</td>
+                <td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td>
+            </tr>
+            <tr>
+                <td>Voltage:</td>
+                <td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td>
+            </tr>
+            <tr>
+                <td>Type:</td>
+                <td><%= $nut_data->{'ups_data'}->{'battery.type'} %></td>
+            </tr>
+        </table>
+    </div>
+
+    <br>
+
+    <div>
+        <h2>Input Power</h2>
+        <table class="table table-bordered">
+            <tr>
+                <td>Voltage:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td>
+            </tr>
+            <tr>
+                <td>Nominal Voltage:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V</td>
+            </tr>
+            <tr>
+                <td>Sensitivity:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.sensitivity'} %></td>
+            </tr>
+            <tr>
+                <td>Transfer High:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V</td>
+            </tr>
+            <tr>
+                <td>Transfer Low:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V</td>
+            </tr>
+        </table>
+    </div>
+
+    <br>
+
+    <div>
+        <h2>UPS Status</h2>
+        <table class="table table-bordered">
+            <tr>
+                <td>Status:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.status'} %></td>
+            </tr>
+            <tr>
+                <td>Load:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.load'} %>%</td>
+            </tr>
+            <tr>
+                <td>Beeper:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %></td>
+            </tr>
+            <tr>
+                <td>Firmware:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.firmware'} %></td>
+            </tr>
+            <tr>
+                <td>Test Result:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.test.result'} %></td>
+            </tr>
+        </table>
+    </div>
 </div>

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

@@ -1,95 +1,122 @@
 <div>
 
-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
-    
-    % my @vars = split(",",$ret{vars});
-    % my $var1 = @vars[0];
-    % my $var2 = @vars[1];
-    % my $var3 = @vars[2];
-    % my $var4 = @vars[3];
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
+    % my $retref = $c->stash("ret");
+    % my %ret = $retref ? %$retref : (ret => "");
+    % my @vars = split(/,/, $ret{vars} // '');
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
     <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-sm"><%= $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-sm"><%= $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 %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
- 
+    % my $retref = $c->stash("ret");
+    % my %ret = $retref ? %$retref : (ret => "");
+    % my @vars = split(/,/, $ret{vars} // '');
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+
     % my $numtcpforwards = @$tcpforwards;
     % my $numudpforwards = @$udpforwards;
 
-    % 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];
+    % if ($c->app->config->{debug}) {
+        <pre>
+            <%= dumper { ret_data => \%ret } %>
+        </pre>
+    % }
 
-    %if ($ret{ret} eq "") {
-        %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-        <br>
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+    % if ($ret{ret} eq "") {
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
         </div>
-       %} else { 
-        <br>
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </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 {
+        <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   
-   
-    %   if ($empty){
+    % my $btn = l('pf_CREATE_RULE');
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+        </div>
+    </div>
+
+    </form>
+
+    <br>
+
+    % if ($empty) {
             <br>
-        %=l 'pf_NO_FORWARDS'
-    %   } else {
+            <%= l 'pf_NO_FORWARDS' %>
+    % } else {
         <br>
-        %=l 'pf_SHOW_FORWARDS'
-    <br><br />
+        <%= l 'pf_SHOW_FORWARDS' %>
+        <br><br>
         <table class="table table-bordered">
-        <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} }) {
+            <thead>
             <tr>
-        %           my $sport = $entry->key;
-        %           my $dhost = $entry->prop('DestHost');
-        %           my $dport = $entry->prop('DestPort') || '';
-        %           my $cmmnt  = $entry->prop('Comment') || '';
-        %           my $allow  = $entry->prop('AllowHosts') || '';
-        %=          t td => (class => "") => $proto
-        %=          t td => (class => "") => $sport
-        %=          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>
+                <th><%= l 'pf_LABEL_PROTOCOL' %></th>
+                <th><%= l 'pf_LABEL_SOURCE_PORT' %></th>
+                <th><%= l 'pf_LABEL_DESTINATION_HOST' %></th>
+                <th><%= l 'pf_LABEL_DESTINATION_PORT' %></th>
+                <th><%= l 'pf_ALLOW_HOSTS' %></th>
+                <th><%= l 'pf_RULE_COMMENT' %></th>
+                <th class="text-center"><%= l 'ACTION' %></th>
             </tr>
-         %       }
-         %   }
-        %}
-    %}
-    </tbody>
-    </table>
-    %= hidden_field 'trt' => $pf_datas->{trt}
- 
+            </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 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 btn-sm" 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>
-    <span class="">
-    %=l 'prt_PRINTER_NAME', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Name', class => ""
-    </span>
-    </p>
+    <form action="/smanager/printers2" method="POST">
 
-    <p>
-    <span class="">
-    %=l 'DESCRIPTION_BRIEF', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Description', class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'LOCATION', class => ""
-    </span>
-    <span class="">
-    %= select_field 'Location' => $c->printerLocation_list(), class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'prt_CREATE_NEW_DESC' %>
+        </div>
 
-    <p>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <br>
 
-    %= hidden_field 'trt' => $prt_datas->{trt}
-    
-    % end    
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputPrinterName" class="col-form-label"><%= l 'prt_PRINTER_NAME' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Name" id="inputPrinterName" class="form-control" aria-describedby="Printer Name">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputPrinterDesc" class="col-form-label"><%= l 'DESCRIPTION_BRIEF' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Description" id="inputPrinterDesc" class="form-control" aria-describedby="Printer Description">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l 'LOCATION'%>
+                </div>
+                <div class="col-auto">
+                    <%= select_field 'Location' => $c->printerLocation_list(), class => "form-select" %>
+                </div>
+            </div>
+
+        <br><br>
+
+        <%= hidden_field 'trt' => $prt_datas->{trt} %>
+
+        % my $btn = l('ADD');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $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}%>
-    (<%=$prt_datas->{description}%>)
+    <h2><%= l 'prt_REMOVE_PRINTER' %></h2>
+
+    <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'
-    </p>
+    <div class="text-danger">
+       <%= 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-sm"><%= $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>
-    <h2>
-    %=l 'prt_CURRENT_LIST'
-    </h2>
+    <form action="/smanager/printers" method="POST">
+
+        % my $btn = l('prt_INITIAL_BTN');
+        <%= 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-sm"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
+
+    <br>
+
+    <h2><%= l 'prt_CURRENT_LIST' %></h2>
     <br><br>
-    %   my $numPrinters = @$printerDrivers;
-    %   if ($numPrinters == 0){
-        %=l 'prt_NO_PRINTERS'
-    %   } else {
-    <table class="table table-bordered">
-    <thead>
-    <tr>
-            <th class="">
-            %=l 'NAME'
-            </th>
-            <th class="">
-            %=l 'DESCRIPTION'
-            </th>
-            <th class="">
-            %=l 'LOCATION'
-            </th>
-            <th class="">
-            %=l 'prt_REMOTE_ADDRESS'
-            </th>
-            <th class="">
-            %=l 'prt_REMOTE_NAME'
-            </th>
-            <th class="">
-            %=l 'ACTION'
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-    %    foreach my $printer (@$printerDrivers)
-    %    {
-    %        my $address = ($printer->prop('Location') eq 'remote')
-    %        ? $printer->prop('Address') : 'N/A';
-    %        my $remoteName = ($printer->prop('Location') eq 'remote')
-    %        ? $printer->prop('RemoteName') : 'N/A';
-    %        $remoteName = 'raw' unless ($remoteName);
-        <tr>
-            %= t td => (class => "") => $printer->key
-            %= t td => (class => "") => $printer->prop('Description')
-            %= t td => (class => "") => $printer->prop('Location')
-            %= t td => (class => "") => $address
-            %= t td => (class => "") => $remoteName
-            <td class="">
-                %my $remove_text = l('REMOVE');  # Localized text
-                %my $csrf_token = "TOKEN";  # CSRF token for security
-                %my $printer_name = $printer->key;
-                %my $actionRemove = qq{
-                                %       <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
-                %   <button type='button' class="" title='$remove_text' >
-                %       $remove_text
-                %   </button>
-                                %       </a>
-                %};
-            <%= $c->render_to_string(inline => $actionRemove) %>
-            </td>
-        </tr>
-    %    }
-        </tbody>
-        </table>
-    <%} %>
-    </p>
+
+    % my $numPrinters = @$printerDrivers;
+    % if ($numPrinters == 0){
+          <%= l 'prt_NO_PRINTERS' %>
+    % } else {
+            <table class="table table-bordered">
+               <thead>
+                   <tr>
+                           <th><%= l 'NAME' %></th>
+                           <th><%= l 'DESCRIPTION' %></th>
+                           <th><%= l 'LOCATION' %></th>
+                           <th><%= l 'prt_REMOTE_ADDRESS' %></th>
+                           <th><%= l 'prt_REMOTE_NAME' %></th>
+                           <th><%= l 'ACTION' %></th>
+                   </tr>
+                   </thead>
+                <tbody>
+                % foreach my $printer (@$printerDrivers) {
+                %     my $address = ($printer->prop('Location') eq 'remote')
+                %     ? $printer->prop('Address') : 'N/A';
+                %     my $remoteName = ($printer->prop('Location') eq 'remote')
+                %     ? $printer->prop('RemoteName') : 'N/A';
+                %     $remoteName = 'raw' unless ($remoteName);
+
+                    <tr class="align-middle">
+                        <td><%= $printer->key %></td>
+                        <td><%= $printer->prop('Description') %></td>
+                        <td><%= $printer->prop('Location') %></td>
+                        <td><%= $address %></td>
+                        <td><%= $remoteName %></td>
+                        <td>
+                            % my $remove_text = l('REMOVE');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $printer_name = $printer->key;
+                            % my $actionRemove = qq{
+                            % <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
+                            %   $remove_text
+                            %   </button>
+                            % </a>
+                            % };
+                            <%= $c->render_to_string(inline => $actionRemove) %>
+                        </td>
+                    </tr>
+                % }
+                </tbody>
+            </table>
+    % }
+
 
 
 </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>
 
@@ -37,7 +37,7 @@
 
             <div class="row g-3 align-items-center">
                 <div class="col-md-2">
-                    <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
                 </div>
             </div>
 

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

@@ -14,7 +14,7 @@
         <br><br>
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-danger"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
             </div>
         </div>
 

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

@@ -6,7 +6,7 @@
         <%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
         <%= hidden_field 'trt' => 'ADD' %>
@@ -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_USER_OR_GROUP' %></th>
-                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
+                <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
+                <th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
                 <!-- <th class="" style="display: normal;"></th> -->
             </tr>
         </thead>
@@ -53,11 +53,11 @@
                             %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                             %$actionModify = qq{
                             % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
-                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                             %   $modify_text
                             %   </button>
                             % </a>
-                            %};
+                            % };
                         % }
 
                         % if ($removable eq 'yes')  {
@@ -66,15 +66,15 @@
                             %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                             %$actionRemove = qq{
                             % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
-                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                             %   $remove_text
                             %   </button>
                             % </a>
-                            %};
+                            % };
                         % }
 
-                    <td class="user-valign-center"><%= $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 => $actionModify) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
                 </tr>
             % }

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

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

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) {
-            %       warn($self->localise('COULD_NOT_GET_UID'),$user->key);
-            %       next;
-            %     }
-            %     my $name = $user->prop("FirstName")." ".$user->prop("LastName");
-            %     my $dev = Quota::getqcarg('/home/e-smith/files');
-            %     my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+
+            % my $uid = getpwnam($user->key);
+
+            % if (config->{debug} == 1) {
+                UID <%= l 'quo_COULD_NOT_GET_UID' %> <%= dumper $user->key %><br>
+            % }
+
+            <br>
+            % unless ($uid) {
+            %     warn (l 'quo_COULD_NOT_GET_UID', $user->key);
+            %     next;
+            % }
+            % my $name = $user->prop("FirstName")." ".$user->prop("LastName");
+            % my $dev = Quota::getqcarg('/home/e-smith/files');
+            % my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
 
                 <tr>
                     <td><%= $user->key %></td>
@@ -53,13 +71,13 @@
                     % my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
                     % my $actionModify = qq{
                     % <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
-                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                     %       $modify_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>
                 </tr>
             %    }
             </tbody>

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

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

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

@@ -19,7 +19,7 @@
 <li class="nav-header">ADMINISTRATION</li>
 
     %    my $cc = 100;
-    %    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
+    %    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
     %        <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
 
     % # Retrieve the icon based on the value of $h
@@ -33,10 +33,10 @@
                 <i class="nav-arrow bi bi-chevron-right"></i>
             </a>
             <ul class="nav nav-treeview">
-    
+
             %   my ($classNew, $target, $href) = '';
             %   foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
-            %       next if ($_->{'MENUCAT'} ne 'A' );  # menu Admin 
+            %       next if ($_->{'MENUCAT'} ne 'A' );  # menu Admin
             %       if ( $_->{'FILENAME'} =~ m/^2\// ) {
             %       $target = '_self';
             %           (my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
@@ -45,7 +45,7 @@
             %       $target = 'main';
             %           my $host = $c->req->url->to_abs->host;
             %           $href = "/smanager/legacypanel?url=https://$host/server-manager" . $_->{'FILENAME'};
-            % 
+            %
             %       }
 
             <li class="nav-item">
@@ -54,12 +54,12 @@
                  <%= $_->{'DESCRIPTION'} %>
                  </a>
             </li>
-    
-    
+
+
             <!-- End trying tree view menus -->
             %           $cc++;
             %   }
-            
+
             </ul>
         </li>
     % }

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

@@ -31,7 +31,7 @@
       </div>
 
       <div class="col-auto">
-        <button type="submit" class="btn btn-primary">Theme</button>
+        <button type="submit" class="btn btn-primary btn-sm">Theme</button>
       </div>
   </div>
 </form>

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

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

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

@@ -5,7 +5,7 @@
     <form action="/smanager/useraccounts" method="POST">
         <br>
         <div>
-            <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+            <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
         </div>
     </form>
 
@@ -22,12 +22,12 @@
     <div class="table-responsive">
         <table class="table table-bordered">
             <thead>
-                <tr class="">
-                    <th><%=l 'ACCOUNT' %></th>
-                    <th><%=l 'USER_NAME' %></th>
-                    <th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
-                    <th><%=l 'usr_FORWARDING_ADDRESS' %></th>
-                    <th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
+                <tr>
+                    <th><%= l 'ACCOUNT' %></th>
+                    <th><%= l 'USER_NAME' %></th>
+                    <th><%= l 'usr_VPN_CLIENT_ACCESS' %></th>
+                    <th><%= l 'usr_FORWARDING_ADDRESS' %></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>
@@ -63,14 +63,14 @@
                     % if ($useraccounts_user_name eq 'admin')  {
                         %$actionModify = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$modify_text'>
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text'>
                             %       $modify_text
                             %   </button>
                             %</a>
                         %};
                         %$actionResetPw = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$password_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
                             %       $password_text
                             %   </button>
                             %</a>
@@ -78,7 +78,7 @@
                     % } else {
                         %$actionModify = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                             %       $modify_text
                             %   </button>
                             %</a>
@@ -93,14 +93,14 @@
                        <!-- Sets BOTH columns - possibly leave out Reset Password here?-->
                        %$actionLock = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                                %   <button type='button' class="btn btn-danger" title="$password_text - currently unset">
+                                %   <button type='button' class="btn btn-danger btn-sm" title="$password_text - currently unset">
                                 %       Unlock
                                 %   </button>
                             %</a>
                             %};
                        %$actionResetPw = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                                %   <button type='button' class="btn btn-primary" title="$password_text - currently unset">
+                                %   <button type='button' class="btn btn-primary btn-sm" title="$password_text - currently unset">
                                 %       $password_text
                                 %   </button>
                             %</a>
@@ -109,14 +109,14 @@
                     % } elsif ($useraccounts_user_name ne 'admin') {
                         %$actionLock = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
-                                %   <button type='button' class="btn btn-primary" title='$lock_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$lock_text' >
                                 %       $lock_text
                                 %   </button>
                             %</a>
                             %};
                         %$actionResetPw = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$password_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
                             %       $password_text
                             %   </button>
                             %</a>
@@ -126,7 +126,7 @@
                     % if ( $removable eq 'yes' )  {
                         %$actionRemove = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                             %       $remove_text
                             %   </button>
                             %</a>
@@ -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 btn-sm" title='$roundcube_text' >
                         %       $roundcube_text
                         %   </button>
                         %</a>
                     %};
 
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
-                    <td class="user-valign-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 => $actionModify) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionLock) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
                 </tr>
                 % }
             </tbody>

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

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

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

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

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

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

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

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

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

@@ -1,13 +1,12 @@
-% content_for 'module' => begin
 
-<div class="container-sm">
-    <br>
-    <h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
-     
-    <br><br>
- 
+
+<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
+
+<div>
+  <br><br>
+
     <form action="/smanager/useraccountsd" method="POST">
-    %#= form_for '/useraccountsd' => (method => 'POST') => begin
+
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -17,10 +16,11 @@
               <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
             </div>
         </div>
-    
+
         <br>
+
         % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-    
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
               <label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
@@ -35,9 +35,9 @@
             </div>
         </div>
         <br>
-    
+
        % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
               <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
@@ -51,22 +51,24 @@
               </span>
             </div>
         </div>
+
         <br>
-    
+
         % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
             </div>
             <div class="col-auto">
-                %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select"
+                <%= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" %>
             </div>
         </div>
+
         <br>
-        
+
         % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
               <label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
@@ -80,36 +82,34 @@
               </span>
             </div>
         </div>
+
         <br>
-    
+
         % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
             </div>
             <div class="col-auto">
-                    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select"
+                    <%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" %>
             </div>
             <br>
         </div>
 
+        <br>
+
         % my $btn = l('SAVE');
+        %= hidden_field 'trt' => $usr_datas->{trt}
+        %= hidden_field 'user' => $usr_datas->{user}
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= l 'SAVE' %></button>
             </div>
         </div>
 
 
-        trt: <%= dumper $usr_datas->{trt} %>
-        user: <%= dumper $usr_datas->{user} %>
-        
-        %= hidden_field 'trt' => $usr_datas->{trt}
-        %= hidden_field 'user' => $usr_datas->{user}
-        
-    %# end
     </form>
 </div>
 

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

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

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

@@ -5,56 +5,72 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <div>
-    (DBG)route: <%= $c->current_route %><br>
-    (DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
-    (DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>
-    </div>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $prx_datas->{http_proxy_status} %>
+            <%= dumper $prx_datas->{smtp_proxy_status} %>
+        </pre>
     % }
+
+
     <h1><%= $title %></h1>
+
     <br>
+
     <%= $modul %>
 
-    <% my $btn = l('SAVE'); %>
-
     <form action="/smanager/hostentriesd" method="POST">
+
+        <br>
+
         <div>
-            <div>
-                <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+           <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+        </div>
 
-                <br><br>
+        <br>
 
-                <div>
-                    <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
-                </div>
-
-                <div>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
+            </div>
+            <div class="col-auto">
                     % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status';
-                    <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %>
-                </div>
+                    <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        % if ( $prx_datas->{smtp_proxy_status} ) {
+
+            <br>
+
+            <div>
+                <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
             </div>
 
-            % if ( $prx_datas->{smtp_proxy_status} ) {
-                <div>
-                    <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
-                <br><br>
-                <div>
-                    <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %>
-                </div>
-                <div>
-                    % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
-                    <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} %>
-                    <br><br>
-                </div>
-            % }
+            <br>
 
             <div class="row g-3 align-items-center">
                 <div class="col-md-2">
-                    <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                    <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %>
+                </div>
+                <div class="col-auto">
+                    % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
+                    <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} , class => "form-select" %>
                 </div>
             </div>
+        % }
+
+        <br>
+
+        % my $btn = l('SAVE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
         </div>
 
+
     </form>
 
 </div>

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

@@ -2,10 +2,6 @@
 
 % content_for 'module' => begin
 
-<!-- should be moved -->
-
-%= javascript '/js/qmailanalog.js'
-
 <div class="card-body">
 
     % if (config->{debug} == 1) {
@@ -60,7 +56,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 

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

@@ -4,37 +4,46 @@
 
 <div class="card-body">
 
-    %if (config->{debug} == 1) {
-    <p>
-    (DBG)route: <%= $c->current_route %><br>
-    </p>
-    %}
+    % if (config->{debug} == 1) {
+        <pre>
+            <%=  dumper $c->current_route %>
+        </pre>
+    % }
+
+    <h1><%=  $title %></h1>
 
-    <h1><%= $title %></h1>
     <br>
 
-    %= $modul
+    <%= $modul %>
 
-    <%  my $btn = l('PERFORM'); %>
-    %= form_for 'reboot' => (method => 'POST') => begin
+    <form action="/smanager/reboot" method="POST">
 
-    <p>
-    %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
-    <br><br>
+        <div class="col-md-6">
+            <%= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION')) %>
+        </div>
 
-    <span class="">
-    %=l 'rbo_LABEL_REBOOT'
-    </span>
-    <span class="">
-    %= select_field 'function' => $c->rebootFunction_list()
-    </span>
-    </p><br>
+        <br>
 
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rbo_LABEL_REBOOT' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'function' => $c->rebootFunction_list(), class => "form-select"  %>
+             </div>
+        </div>
 
-    % end
+        <br>
 
-    %= hidden_field 'debug' => '1'
+        % my $btn = l('PERFORM');
+        <%= hidden_field 'debug' => '1' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>
 %end

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

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

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

@@ -6,36 +6,62 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-        <p>
-            %= dumper $c->current_route
-        </p>
+        <pre>
+            <%= dumper $c->current_route %>
+        </pre>
     % }
     % if ( stash 'error' ) {
-        <br><div class="">
-            %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
-    <h1><%=$title %></h1><br>
-    <p>If the Webmail panel does not appear after logging in, then please check your password.</p><br />
+    % }
+
+    <h1><%=$title %></h1>
+    <br>
+
+    <div>
+        If the Webmail panel does not appear after logging in, then please check your password.
+    </div>
+
+    <br>
 
     % my $thisdomain = $c->req->url->to_abs->host;
     % my $url = $c->stash('modul');
-    % if (!$url) {
-    %   $url = $thisdomain."/roundcube";
-    %}
     % my $username = 'admin';
+
+    % if (!$url) {
+        % $url = $thisdomain."/roundcube";
+    % }
+
     % if ($url =~ /[?&]_user=([^&]+)/) {
-    %   $username = $1;
-    %}
+        % $username = $1;
+    % }
+
     % if (!($url =~ /https:/)) {
-    % $url = 'https://' . $url;
+        % $url = 'https://' . $url;
     %}
 
-    <div class="">
-        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
+    <div class="container-fluid">
+        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>">
+            <button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %>
+            </button>
+        </a>
         <object id="" data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
     </div>
 </div>
 
 
+<iframe width="100%" height="600" style="border:1px solid black;" src="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>">
+</iframe>
+
+    % my $btn = l('Full Window');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
+            </div>
+        </div>
+
+
 %end

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,20 +93,20 @@
     <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>
 
     <div class="row g-3 align-items-center">
         <div class="col-md-2">
-            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
         </div>
     </div>
 

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

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

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

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

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

@@ -5,12 +5,12 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <div>
-        (DBG)route: <%= $c->current_route %><br>
-        (DBG)pdc: <%= $wkg_datas->{ServerRole}%><br>
-        (DBG)roam: <%= $wkg_datas->{RoamingProfiles}%><br>
-    </div>
-    %}
+        <pre>
+            route: <%= dumper $c->current_route %>
+            pdc: <%= dumper $wkg_datas->{ServerRole}%>
+            roam: <%= dumper $wkg_datas->{RoamingProfiles}%>
+        </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}%>" >
-            </div>
+                    <input type="text" name="Workgroup" id="inputWorkgroup" class="form-control" aria-describedby="inputWorkgroup" maxlength="15" size="15" value="<%= $wkg_datas->{Workgroup}%>" >
+                </div>
                 <div class="col-auto">
                   <span id="passwordHelpInline" class="form-text">
                     Limited to 15 characters by the NETBIOS
@@ -92,7 +92,7 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
             </div>
         </div>
 

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

@@ -5,117 +5,141 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $yum_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+        </pre>
     % }
-    
+
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
-    <br>
-    <span class="">
-    %= $notif
-    </span>
-    %}
+        <br>
+        <div class="text-warn">
+            <%= $notif %>
+        </div>
+        <br>
+    % }
 
     % if ( $c->is_empty('updates') ) {
-    <br>
-    <div class=""><h2>
-    %=l 'yum_TITLE_UPTODATE'
-    </h2>
-    %=l 'yum_DESC_UPTODATE'
-    </div>
-    <br>
-    %}
+        <br>
+        <div>
+            <h2><%=l 'yum_TITLE_UPTODATE' %></h2>
+            <br>
+            <%=l 'yum_DESC_UPTODATE' %>
+        </div>
+        <br>
+    % }
 
     % if ( $c->non_empty('updates') ) {
-    <br>
-    <div class="">
-    <h2>
-    %=l 'yum_TITLE_UPDATES_AVAILABLE'
-    </h2>
-    %=l 'yum_DESC_UPDATES_AVAILABLE'
-    </div>
-    <br>
+        <br>
+        <div>
+            <h2><%= l 'yum_TITLE_UPDATES_AVAILABLE' %></h2>
+            <%= l 'yum_DESC_UPDATES_AVAILABLE' %>
+        </div>
+        <br>
 
-    %= form_for 'yum' => (method => 'POST') => begin
-            %=  hidden_field 'trt' => 'UPDT'
-        %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => ""
-    % end
-    %}
+        <form action="/smanager/yum" method="POST">
+            % my $btnInUp = $c->l('yum_BUTTON_INSTALL_UPDATES');
+            <%= hidden_field 'trt' => 'UPDT' %>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btnInUp %></button>
+                </div>
+            </div>
+        </form>
+    % }
 
     % if ( $c->non_empty('available') ) {
-    %= form_for 'yum' => (method => 'POST') => begin
-        <br>
-            %=  hidden_field 'trt' => 'INST'
-        %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => ""
-    % end
-    %}
+        <form action="/smanager/yum" method="POST">
+            <br>
+            % my $btnInAv = $c->l('yum_BUTTON_INSTALL_AVAILABLE');
+            <%= hidden_field 'trt' => 'INST' %>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btnInAv %></button>
+                </div>
+            </div>
+        </form>
+    % }
 
     % if ( $c->non_empty('installed') ) {
-    %= form_for 'yum' => (method => 'POST') => begin
-        <br>
-            %=  hidden_field 'trt' => 'REMO'
-        %= submit_button $c->l('yum_BUTTON_REMOVE'), class => ""
-    % end
-    %}
+        <form action="/smanager/yum" method="POST">
+            <br>
+            % my $btnInRm = $c->l('yum_BUTTON_REMOVE');
+            <%= hidden_field 'trt' => 'REMO' %>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btnInRm %></button>
+                </div>
+            </div>
 
+    % }
+
+    </form>
+
+    <br>
     <!--<br><hr class=""><br>-->
 
-    %= form_for 'yum' => (method => 'POST') => begin
+    <form action="/smanager/yum" method="POST">
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_STATUS'
-    </span>
-    <span class="">
-    %= $c->get_status('status', 'localise')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2 border-bottom">
+                <%= l 'yum_LABEL_YUM_STATUS' %>
+            </div>
+            <div class="col-auto border-bottom">
+                <%= $c->get_status('status', 'localise') %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS'
-    </span>
-    <span class="">
-    %= $c->get_status('PackageFunctions', 'localise')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2 border-bottom">
+                <%= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' %>
+            </div>
+            <div class="col-auto border-bottom">
+                <%= $c->get_status('PackageFunctions', 'localise') %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_DELTARPMPROCESS'
-    </span>
-    <span class="">
-    %= $c->get_status('DeltaRpmProcess', 'localise')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2 border-bottom">
+                <%= l 'yum_LABEL_YUM_DELTARPMPROCESS' %>
+            </div>
+            <div class="col-auto border-bottom">
+                <%= $c->get_status('DeltaRpmProcess', 'localise') %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_DOWNLOADONLY'
-    </span>
-    <span class="">
-    %= $c->get_status('DownloadOnly', 'localise')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2 border-bottom">
+                <%= l 'yum_LABEL_YUM_DOWNLOADONLY' %>
+            </div>
+            <div class="col-auto border-bottom">
+                <%= $c->get_status('DownloadOnly', 'localise') %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES'
-    </span>
-    <span class="">
-    %= $c->get_status('AutoInstallUpdates', 'localise')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2 border-bottom">
+                <%= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' %>
+            </div>
+            <div class="col-auto border-bottom">
+                <%= $c->get_status('AutoInstallUpdates', 'localise') %>
+            </div>
+        </div>
 
-    %=  hidden_field 'trt' => 'CONF'
-    <br>
-    %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => ""
+        <br>
 
-    % end
+        % my $btnConfig = $c->l('yum_BUTTON_CONFIGURATION');
+        <%=  hidden_field 'trt' => 'CONF' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btnConfig %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 

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

@@ -5,105 +5,157 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $yum_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+        </pre>
     % }
-    
+
+
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
-    <br>
-    <div class="">
-    %= $notif
-    </div>
-    %}
+        <br>
+        <div class="text-warn">
+            <%= $notif %>
+        </div>
+        <br>
+    % }
 
-    %= form_for 'yumd' => (method => 'POST') => begin
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_STATUS'
-    </span>
-    <span class="">
-    % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates';
-    %= select_field 'yum_check4updates' => $c->get_check_freq_opt()
-    </span>
-    </p>
+    <form action="/smanager/yumd" method="POST">
 
-    <br>
-    %=l 'yum_DESC_YUM_PACKAGEFUNCTIONS'
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_STATUS' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates';
+                <%= select_field 'yum_check4updates' => $c->get_check_freq_opt(), class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS'
-    </span>
-    <span class="">
-    % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions';
-    %= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
+        <br>
 
-    <br>
-    %=l 'yum_DESC_ENABLED_REPOSITORIES'
+        <%= l 'yum_DESC_YUM_PACKAGEFUNCTIONS' %>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_ENABLED_REPOSITORIES'
-    </span>
-    <span class="">
-    % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories';
-    %= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => "", multiple => '1'
-    </span>
-    </p>
+        <br><br>
 
-    <br>
-    %=l 'yum_DESC_YUM_DELTARPMPROCESS'
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions';
+                <%= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_DELTARPMPROCESS'
-    </span>
-    <span class="">
-    % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess';
-    %= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
+        <br>
 
-    <br>
-    %=l 'yum_DESC_YUM_DOWNLOADONLY'
+        <%= l 'yum_DESC_ENABLED_REPOSITORIES' %>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_DOWNLOADONLY'
-    </span>
-    <span class="">
-    % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly';
-    %= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
+        <br><br>
 
-    <br>
-    %=l 'yum_DESC_YUM_AUTOINSTALLUPDATES'
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES'
-    </span>
-    <span class="">
-    % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates';
-    %= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
 
-    %=  hidden_field 'trt' => 'CONF'
-    <br>
-    <!--<div class="">-->
-    %= submit_button $c->l('SAVE'), class => ""
-    <!--</div>-->
 
-    % end
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_ENABLED_REPOSITORIES' %>
+            </div>
+            <div class="col-auto">
+                % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories';
+
+                <%= select_field 'SelectedRepositories' => $c->get_repository_options2(), multiple => '1', size => "16", class => "form-select" %>
+            </div>
+        </div>
+
+<br>
+        <%= dumper $c->get_repository_options2() %>
+<br>
+        <%= dumper $c->get_repository_current_options () %>
+<br>
+        <%= dumper $c->every_param('SelectedRepositories') %>
+<br>
+
+
+        %# my @repo ();
+        %# my %repositories = $c->get_repository_options2();
+        <%#= dumper %repositories %>
+
+        %# foreach my @repository (keys %$repositories) {
+            <%#= dumper @repository %>
+            <br>
+            %# my $repoName = $_->{Name};
+            %# my $repoStatus = $_ -> {Status};
+        %# }
+
+
+
+        <br>
+
+        <%= l 'yum_DESC_YUM_DELTARPMPROCESS' %>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_DELTARPMPROCESS' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess';
+                <%= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%= l 'yum_DESC_YUM_DOWNLOADONLY' %>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_DOWNLOADONLY' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly';
+                <%= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%= l 'yum_DESC_YUM_AUTOINSTALLUPDATES' %>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates';
+                <%= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btnSave = $c->l('SAVE');
+        <%=  hidden_field 'trt' => 'CONF' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btnSave %></button>
+            </div>
+        </div>
+
+    </form>
+
+
 
 </div>