Hosts done and a few tweaks

.gitignore

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

root/usr/share/smanager/themes/AdminLTE/public/dist/css/jquery-ui.min.css

@@ -0,0 +1 @@
+/usr/share/javascript/jquery-ui/jquery-ui.min.css

root/usr/share/smanager/themes/AdminLTE/public/dist/js/jquery-ui.min.js

@@ -0,0 +1 @@
+/usr/share/javascript/jquery-ui/jquery-ui.min.js

root/usr/share/smanager/themes/AdminLTE/public/dist/js/jquery.min.js

@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.min.js

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

@@ -51,6 +51,7 @@
 
 .login-page {
     min-height: 10vh;
+    vertical-align: top !important;
 }
 
 .nav-icon {
@@ -88,3 +89,22 @@
    cursor: default;                   /* Prevent text cursor */
 
 }
+
+
+/* TD and buttons in user lists */
+
+.user-td-no-right {
+    border-left-width: 0px;
+}
+
+.user-td-no-left {
+    border-left-width: 0px;
+}
+
+.user-valign-center {
+    text-align: center;
+}
+
+.user-table-max-wdith {
+    max-width: 50%;
+}

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

@@ -0,0 +1,298 @@
+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

@@ -0,0 +1,28 @@
+$(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/overlayscrollbarscript.js

@@ -0,0 +1,51 @@
+/* 
+This should work on class sidebar-wrapper
+*/
+
+const SELECTOR_SIDEBAR_WRAPPER = '.sidebar-wrapper';
+
+const Default = {
+    scrollbarTheme: 'os-theme-light',
+    scrollbarAutoHide: 'leave',
+    scrollbarClickScroll: true,
+};
+
+document.addEventListener('DOMContentLoaded', function () {
+    const sidebarWrapper = document.querySelector(SELECTOR_SIDEBAR_WRAPPER);
+    if (sidebarWrapper && typeof OverlayScrollbarsGlobal?.OverlayScrollbars !== 'undefined') {
+        OverlayScrollbarsGlobal.OverlayScrollbars(sidebarWrapper, {
+            scrollbars: {
+                theme: Default.scrollbarTheme,
+                autoHide: Default.scrollbarAutoHide,
+                clickScroll: Default.scrollbarClickScroll,
+            },
+            overflow: {
+                x: 'hidden',
+                y: 'scroll',
+              },
+        });
+    }
+});
+
+
+/* This should work with class=data-overlayscrollbars-initialize and id=scrolltarget */
+
+/* https://kingsora.github.io/OverlayScrollbars/ */
+
+/* const { OverlayScrollbars, ClickScrollPlugin } = OverlayScrollbarsGlobal;
+
+// optional: use the ClickScrollPlugin to make the option "scrollbars.clickScroll: true" available
+OverlayScrollbars.plugin(ClickScrollPlugin);
+
+OverlayScrollbars(document.body, {
+  scrollbars: {
+    clickScroll: true,
+  },
+  overflow: {
+    x: 'hidden',
+    y: 'scroll',
+  },
+});
+OverlayScrollbars(document.getElementById('scrollTarget'), {});
+
+ */

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

@@ -0,0 +1,25 @@
+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/public/koozali/js/sme-password.js

@@ -0,0 +1,33 @@
+// js/sme-password.js
+
+$(document).ready(function() {
+/*     // For each password input
+    $('.sme-password').each(function() {
+        // Create a new container
+        //alert("sme-password");
+        var $inputContainer = $('<div class="input-container"></div>');
+        
+        // Move the input into the new container
+        $(this).wrap($inputContainer);
+        
+        // Create the toggle image
+        var $togglePassword = $('<img src="images/visible.png" alt="Show Password" class="toggle-password" />');
+        
+        // Append the toggle image to the container
+        $(this).after($togglePassword);
+    }); */
+
+    $('.toggle-password').on('click', function() {
+        // Find the associated password field
+        var input = $(this).siblings('.sme-password');
+
+        // Toggle the type attribute between password and text
+        var inputType = input.attr('type') === 'password' ? 'text' : 'password';
+        input.attr('type', inputType);
+        
+        // Toggle the icon source based on the input type
+        // Check boostrap colours?
+//        var iconSrc = inputType === 'password' ? 'images/visible.png' : 'images/visible-slash.png';
+//        $(this).attr('src', iconSrc);
+    });
+});

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -29,7 +29,8 @@
     <p>
     <span class="">
     %=l 'bac_ENABLE_TAPE_BACKUP'
-    </span><span class="">
+    </span>
+    <span class="">
     % if ( $bac_datas->{status} eq 'checked' ) {
     <input type='checkbox' name='Tapebackup' checked >
     %} else {
@@ -42,7 +43,8 @@
     <p>
     <span class="">
     %=l 'bac_TAPE_BACKUP_TIME'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
     %= text_field 'BackupHour', size => '2'
     % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
@@ -50,7 +52,8 @@
     </span>
     <!--span class="">
     %=l 'AM/PM:'
-    <!--/span--><span class="">
+    <!--/span-->
+    <span class="">
     % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
     %= select_field 'BackupAMPM' => ['AM', 'PM'], class => ""
     </span>
@@ -59,7 +62,8 @@
     <p>
     <span class="">
     %=l 'bac_LOAD_TAPE_REMINDER_TIME'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
     %= text_field 'ReminderHour', size => '2'
     % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
@@ -67,7 +71,8 @@
     </span>
     <!--span class="">
     %=l 'AM/PM:'
-    <!--/span--><span class="">
+    <!--/span-->
+    <span class="">
     % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
     %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => ""
     </span>

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -29,19 +30,24 @@
     %=l 'bac_WORKSTN_BACKUP_ENABLED'
     <span class="">
     %= $bac_datas->{status}
-    </span><br>
+    </span>
+    <br>
 
     %= $c->render_to_string(inline => $c->workstnBackupConfig())
 
-    <p><h3>
+    <p>
+    <h3>
     %= l 'bac_WORKSTATION_BACKUP_SETCONF'
-    </h3><br>
+    </h3>
+    <br>
     <span class="">
     %=l 'bac_SELECT_VFS_TYPE'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
     %= select_field 'VFSType' => $c->get_VFSType_options(), class => ""
-    </span></p>
+    </span>
+    </p>
 
     %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
     %= submit_button $c->l('NEXT'), class => ""

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -11,7 +12,7 @@
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br><div>
         %= $c->render_to_string(inline => stash 'error') 
     </div>
     %}
@@ -29,7 +30,8 @@
     <p>
     <span class="">
     %=l 'bac_ENABLE_WORKSTN_BACKUP'
-    </span><span class="">
+    </span>
+    <span class="">
     % if ( $bac_datas->{status} eq 'checked' ) {
     <input type='checkbox' name='Workstnbackup' checked >
     %} else {
@@ -38,39 +40,48 @@
     </span>
 
     </p>
-    <p><h3>
+    <p>
+    <h3>
     %= l 'bac_WORKSTATION_BACKUP_DEST'
-    </h3><br>
+    </h3>
+    <br>
 
     % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
         <span class="">
         %=l 'bac_WORKSTN_NAME'
-    </span><span class="">
+        </span>
+        <span class="">
         % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
         %= text_field 'BackupwkStation', size => 20, class => ""
-    </span><br>
+        </span>
+    <br>
     %}
     % if (  $bac_datas->{vfstype} eq 'usb' ) {
         <span class="">
         %=l 'bac_local removable disk'
-    </span><span class="">
+        </span>
+        <span class="">
         % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder';
         %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
-    </span><br>
+        </span>
+        <br>
     % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
     <span class="">
         %=l 'bac_Mounted disk'
-    </span><span class="">
+        </span>
+        <span class="">
         % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
         %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
-    </span><br>
+        </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>
+        </span>
+        <br>
     %}
     % if (  $bac_datas->{vfstype} eq 'cifs' ) {
         <span class="">
@@ -78,7 +89,9 @@
         </span><span class="">
         % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin';
         %= text_field 'BackupwkLogin', size => 12, class => ""
-    </span><br><span class="">
+        </span>
+        <br>
+        <span class="">
         %=l 'bac_PASSWORD'
         </span><span class="">
         % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword';
@@ -89,9 +102,11 @@
     %= l 'bac_WORKSTN_BACKUP_SETTINGS'
     </h3><br>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'bac_NUMBER_OF_SETS'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber';
     %= text_field 'SetsNumber', size => '3'
     </span>
@@ -104,7 +119,8 @@
     <p>
     <span class="">
     %=l 'bac_WORKSTN_BACKUP_TIME'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour';
     %= text_field 'BackupwkHour', size => '2'
     % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin';
@@ -119,7 +135,8 @@
 
     <p><span class="">
     %=l 'bac_WORKSTN_TIMEOUT'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout';
     %= text_field 'BackupwkTimeout', size => '2'
     </span>
@@ -135,7 +152,8 @@
     <p>
     <span class="">
     %=l 'bac_COMPRESSION_LEVEL'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'Compression' => $bac_datas->{compression} unless param 'Compression';
     %= text_field 'Compression', size => '1'
     </span>
@@ -143,7 +161,8 @@
     <span class="">
     % param 'Dof' => $bac_datas->{dof} unless param 'Dof';
     %= select_field 'Dof' => $c->get_dow_list(), class => ""
-    </p><br>
+    </p>
+    <br>
 
 
     %= hidden_field 'Function' => $bac_datas->{function}

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -33,7 +34,8 @@
 
     <br><br><span class="">
     %=l 'bac_SELECT_BACKUP_FILE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
     </span><br><br>
 

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -26,17 +27,22 @@
 
     <h3><%=l 'bac_BACKUP_CHOICE' %></h3>
 
-    <br><span class="">
+    <br>
+    <span class="">
     %=l 'bac_SELECT_BACKUP_FILE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= select_field 'Backupset' => $c->get_Restoreset_options(), class => ""
-    </span><br>
-
-    <br><span class="">
+    </span>
+    <br>
+    <br>
+    <span class="">
     %=l 'bac_FILTER_EXPRESSION'
-    </span><span class="">
+    </span>
+    <span class="">
     %= text_field 'Filterexp', size => 32, class => ""
-    </span><br>
+    </span>
+    <br>
     <br>
     %= hidden_field 'Function' => $bac_datas->{'function'}
     %= submit_button $c->l('PERFORM'), class => ""

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -19,7 +20,8 @@
     <h1><%= $title%></h1>
 
 
-    <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2><br>
+    <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
+    <br>
 
     %= $c->render_to_string(inline => (l 'bac_READ_COMPLETE'))
 
@@ -27,15 +29,19 @@
 
     <br><span class="">
     %=l 'bac_SELECT_FILES_TO_RESTORE'
-    </span><span class="">
+    </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="">
+    </span>
+    <br>
+    <br>
+    <span class="">
     %=l 'bac_SELECT_DATE_BEFORE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= text_field 'Seldatebefore', size => 32, class => ""
-    </span><br>
+    </span>
+    <br>
     <br>
     %= hidden_field 'Function' => $bac_datas->{'function'}
     %= hidden_field 'Backupset' => $bac_datas->{'backupset'}

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -11,7 +12,8 @@
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - backup - verify";
 % content_for 'module' => begin
 
-<div id="" class="">
+<div  class="card-body">
+
     % if (config->{debug} == 1) {
         <p>
         %= dumper $c->current_route
@@ -10,7 +11,8 @@
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
@@ -28,21 +30,30 @@
     % } else {
         %= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify())
     %}
-    <br><br><span class="">
+    <br>
+    <br>
+    <span class="">
     %=l 'bac_SELECT_BACKUP_FILE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
-    </span><br>
+    </span>
+    <br>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= check_box 'Verifyall'
-    </span></p><br>
+    </span>
+    </p>
+    <br>
 
     %=l 'bac_CHECK_INTEGRITY_WARNING'
 
-    <br><br>
+    <br>
+    <br>
     %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
     %= submit_button $c->l('bac_VERIFY'), class => ""
 

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - backup - verify";
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
@@ -11,7 +12,8 @@
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}

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

@@ -2,21 +2,24 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $bac_datas
-    </p>
+    </div>
     % }
 
     % if ( stash 'warning' ) {
-        <br><div class="">
+        <br>
+        <div>
         %= $c->render_to_string(inline => stash 'warning') 
         </div>
     %}
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div>
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
@@ -29,49 +32,47 @@
     <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module}, 
         $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
 
-    %= form_for '/backup' => (method => 'POST') => begin
+    <form action="/smanager/backup" method="POST">
+        %#= form_for '/backup' => (method => 'POST') => begin
     
-    <h2>
-    %=l 'bac_BACKUP_CONFIG_STATUS'
-    </h2>
+    <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
+
+    <div>
+    <%= l 'bac_TAPE_BACKUPS' %>,
+    <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
 
-    <p><span class="">
-    %=l 'bac_TAPE_BACKUPS',
-    </span><span class="">
-    %= $c->l(uc($bac_datas->{'backupStatus'})).'.'
-    </span>
     % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
         %= $c->l('bac_BACKUPS_RUN_AT')
-    <span class="">
         %=  $bac_datas->{'backupTime'}
-    </span>
         %= $c->l('bac_REMINDER_MESSAGE_AT')
-    <span class="">
         %= $bac_datas->{'reminderTime'}
-    </span>    
-    %}
-    <p><span class="">
-    %=l 'bac_WORKSTN_BACKUPS',
-    </span><span class="">
-    %= $c->l(uc($bac_datas->{'backupwkStatus'})).'.'
-    </span>
-    % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
-    %= $c->l('bac_WKBACKUPS_RUN_AT')
-    <b>
-    %= $bac_datas->{'backupwkTime'}
-    </b>
-    %}
+    % }
+    </div>
     
-    <p><span class="">
-    %=l 'bac_SELECT_AN_ACTION'
-    </span><span class="">
+    <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(), class => ""
-    </span></p>
+    <%= select_field 'Function' => $c->get_function_options() %>
+    </div>
 
     <br>
-    %= submit_button $c->l('PERFORM'), class => ""
 
+        <%  my $btn = $c->l('PERFORM'); %>
+         <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
     % end
 
 </div>

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
@@ -19,34 +19,48 @@
     </b>
     <p>
         %=l ('bugr_SME_EXPERIENCE')
-    </p><p>
+    </p>
+    <p>
     %=l ('bugr_USE_TEMPLATE')
 : <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
  target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>.
-    </p><p>
+    </p>
+    <p>
     %=l ('bugr_PLEASE_REPORT_HERE')
 : <a href="https://bugs.koozali.org" target="_blank">https://bugs.koozali.org</a>.
-    </p><p> 
+    </p>
+    <p> 
         %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP')
-    </p><p>
+    </p>
+    <p>
         %=l ('bugr_REPORT_CONTENT')
-    <br><ul><li>
+        <br>
+        <ul>
+        <li>
         %=l ('bugr_SME_VERSION')
-    </li><li>
+        </li>
+        <li>
         %=l ('bugr_SERVER_MODE')
-    </li><li>
+        </li>
+        <li>
         %=l ('bugr_PREVIOUS_SERVER_MODE')
-    </li><li>
+        </li>
+        <li>
         %=l ('bugr_KERNEL_AND_ARCH')
-    </li><li>
+        </li>
+        <li>
         %=l ('bugr_INSTALLED_RPMS')
-    </li><li>
+        </li>
+        <li>
         %=l ('bugr_ALTERED_TEMPLATES')
-    </li><li>
+        </li>
+        <li>
         %=l ('bugr_ALTERED_EVENTS')
-    </li><li>
+        </li> <li>
         %=l ('bugr_YUM_REPOS')
-    </li><br></ul>
+        </li>
+        <br>
+        </ul>
         %=l ('bugr_PRIVACY')
     </p>
 
@@ -58,11 +72,14 @@
 
     <p><b>
         %=l ('bugr_DONATING')
-    </b><br><br>
+        </b>
+        <br><br>
         %=l ('bugr_AWARE_SME')
-    <br><br><b>
+        <br><br>
+        <b>
         %=l ('bugr_YOUR_HELP')
-    </b><br><br>
+        </b>
+        <br><br>
         %=l ('bugr_CONSIDER_DONATING')
         <br><br>
     </p>

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>

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

@@ -1,45 +1,59 @@
 % layout 'AdminLTE', title => "Sme server 2 - clamav";
 
 % content_for 'module' => begin
-<div id="" class="">
-    %if (config->{debug} == 1) {
-    <p>(DBG)route: <%= $c->current_route %><br>
+
+<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} %>
-    </p>
-    %}
+    </div>
+    % }
+
     <h1><%= $title %></h1>
     <br>
-    <%= $modul %>
-    <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'clamav' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD'
-    </span><span class="">
+    <%= $modul %>
+
+    <%  my $btn = l('SAVE'); %>
+    <br><br>
+    <form action="/smanager/clamav" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-auto">
+                <h6><%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>:</h6>
                 % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
-    %= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'clm_LABEL_QUARANTINE'
-    </span><span class="">
+                <%= 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>
                 % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine';
-    %= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => ""
+                <%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
             <br>
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'clm_LABEL_CLAM_VERSIONS'
-    </span><span class="">
-    %= $clm_datas->{clam_versions}
+            </div>
+        </div>
+
+        <div>
+            <div>
+                <h6><%= l 'clm_LABEL_CLAM_VERSIONS' %>:</h6>
+            </div>
+            <div>
+                <%= $clm_datas->{clam_versions} %>
+            </div>
+        </div>
         <br>
-    </span>
-    </p>
-    %= submit_button "$btn", class => ""
-    % end
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 </div>
 %end

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

@@ -1,7 +1,9 @@
 <!-- common_css.html.ep -->
-
-%= stylesheet 'css/sme-jquery-overrides.css'
-%= stylesheet 'dist/css/adminlte.min.css'
 %= stylesheet 'koozali/css/adminlte.koozali.css'
 %= stylesheet 'koozali/css/flag-icon.min.css'
+
+%#= stylesheet 'css/sme-jquery-overrides.css'
+
+%= stylesheet 'dist/css/adminlte.min.css'
 %= stylesheet 'dist/icons/font/bootstrap-icons.min.css'
+%#= stylesheet 'dist/css/overlayscrollbars.min.css' 

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

@@ -1,6 +1,9 @@
-<!-- Include files across the whole site -->
-%= javascript 'js/jquery.min.js'
+<!-- 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 '/js/flag-by-locale.js'
-%= javascript '/js/sme-password.js'
+%= javascript 'koozali/js/flag-by-locale.js'
+%= javascript 'koozali/js/sme-password.js'
+

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

@@ -1,8 +1,9 @@
 % layout 'AdminLTE', title => "Sme server 2 - err 400";
 
 % content_for 'module' => begin
-<div id="" class="">
-    <div class="">
+
+<div  class="card-body">
+    <div class="text-danger">
     %= l 'CSRF_VALIDATION_FAILURE'
     </div>
 

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - datetime";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
@@ -11,7 +12,8 @@
     % }
 
     % if ( stash 'error' ) {
-    <br><div class="">
+    <br>
+    <div class="">
         %= $c->render_to_string(inline => stash 'error') 
     </div>
     %}
@@ -49,7 +51,8 @@
         <br>
         <span class="">
         %=l 'dat_NTP_SERVER'
-        </span><span class="">
+        </span>
+        <span class="">
         %= text_field 'Ntpserver' =>  $dat_datas->{ntpserver}, class => ""
         </span>
         </p>
@@ -78,36 +81,44 @@
         <br>
         <span class="">
         %=l 'dat_NEW_M/D/Y'
-        </span><span class="">
+        </span>
+        <span class="">
         % param 'Month' => $dat_datas->{month} unless param 'Month';
         %= select_field 'Month' => $c->getMonth_list(), class => ""
-        </span><span class="">
+        </span>
+        <span class="">
         % param 'Day' => $dat_datas->{day} unless param 'Day';
         %= text_field 'Day', size => '2', class => ""
-        </span><span 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="">
+        </span>
+        <span class="">
         % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
         %= text_field 'Hour', size => '2', class => ""
-        </span><span class="">
+        </span>
+        <span class="">
         % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
         %= text_field 'Minute', size => '2', class => ""
-        </span><span 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="">
+        </span>
+        <span class="">
         % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
         %= select_field 'Ampm' =>  ['AM', 'PM'], class => ""
-        </span><span class="">
+        </span>
+        <span class="">
         % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
         %= select_field 'Timezone' =>  $c->getZone_list(), class => ""
         </span>

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

@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div  class="card-body">
+
     <p><%= $title %></p>
     <%= $modul %>
     <p>

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

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

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

@@ -1,32 +1,34 @@
 % layout 'AdminLTE', title => "Sme server 2 - domains";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $dom_datas
-    </p>
+    </div>
     % }
 
     % 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>
 
     % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') {
         %= include 'partials/_dom_upd'
-    %} elsif ($dom_datas->{trt} eq 'DEL') {
+    % } elsif ($dom_datas->{trt} eq 'DEL') {
         %= include 'partials/_dom_del'
-    %} elsif ($dom_datas->{trt} eq 'UP2') {
+    % } elsif ($dom_datas->{trt} eq 'UP2') {
         %= include 'partials/_dom_up2'
-    %} else {
+    % } else {
         %= include 'partials/_dom_list'
-    %}
+    % }
 
 </div>
 %end

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

@@ -1,57 +1,76 @@
 % layout 'AdminLTE', title => "Sme server 2 - emailaccess";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $mai_datas
-    </p>
+    </div>
     % }
     
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <form action="/smanager/emailsettingd" method="POST">
+    %#= form_for '/emailsettingd' => (method => 'POST') => begin
 
-    %=l 'mai_DESC_POP_ACCESS_CONTROL'
+        <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
     
-    <p><span class="">
-    %=l 'mai_LABEL_POP_ACCESS_CONTROL'
-    </span><span class="">
+        <div>
+            <%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+        </div>
+        
+        <div>
             % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
-    %= select_field 'POPAccess' => $c->get_pop_opt(), class => ""
-    </span></p>
+            <%= select_field 'POPAccess' => $c->get_pop_opt() %>
+        </div>
     
-    %=l 'mai_DESC_IMAP_ACCESS_CONTROL'
+        <div>
+            <%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
+        </div>
         
-    <p><span class="">
-    %=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-    </span><span class="">
+        <div>
+            <%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+        </div>
+        
+        <div>
             % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
-    %= select_field 'IMAPAccess' => $c->get_imap_opt(), class => ""
-    </span></p>
+            <%= select_field 'IMAPAccess' => $c->get_imap_opt() %>
+        </div>
     
-    %=l 'mai_DESC_WEBMAIL'
+        <div>
+            <%= l 'mai_DESC_WEBMAIL' %>
+        <div>
     
-    <p><span class="">
-    %=l 'mai_LABEL_WEBMAIL'
-    </span><span class="">
+        <div>
+            <%=l 'mai_LABEL_WEBMAIL' %>
+        </div>
+    
+        <div>
             % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
-    %= select_field 'WebMail' => $c->get_webmail_opt(), class => ""
-    </span></p>
+            <%= select_field 'WebMail' => $c->get_webmail_opt() %>
+        </div>
     
         % my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
     
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                </div>
+            </div>
         %= hidden_field 'trt' => 'ACC'
-    % end    
+
+    %# end    
+    </form>
     
 </div>
 %end

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
@@ -11,7 +12,8 @@
     % }
     
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
@@ -26,12 +28,15 @@
 
     %=l 'mai_DESC_UNKNOWN'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_UNKNOWN'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
     %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => ""
-    </span></p>
+    </span>
+    </p>
 
     <!--<hr class="" />-->
     <h2>
@@ -40,12 +45,15 @@
 
     %=l 'mai_DESC_DELEGATE'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_DELEGATE'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
     %= text_field 'DelegateMailServer', class => ""
-    </span></p>
+    </span>
+    </p>
 
     <!--<hr class="" />-->
     <h2>
@@ -54,33 +62,45 @@
 
     %=l 'mai_DESC_SMARTHOST'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SMARTHOST'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
     %= text_field 'SMTPSmartHost', class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
     %= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
     %= text_field 'SMTPAUTHPROXY_Userid', class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
     %= password_field 'SMTPAUTHPROXY_Passwd', class => ""
-    </span></p>
+    </span>
+    </p>
 
     %   my $btn = l('SAVE');
     %= submit_button "$btn", class => ""

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - emailfilter";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body"
 
     % if (config->{debug} == 1) {
     <p>
@@ -11,7 +12,8 @@
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
@@ -22,74 +24,102 @@
 
     %=l 'mai_DESC_VIRUS_SCAN'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_VIRUS_SCAN'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
     %= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span><br></p>
+    </span>
+    <br>
+    </p>
 
     %=l 'mai_DESC_SPAM_SCAN'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_SCAN'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
     %= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_SENSITIVITY'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
     %= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_TAGLEVEL'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
     %= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_REJECTLEVEL'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
     %= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SORTSPAM'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
     %= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span></p>
+    </span>
+    </p>
 
     %=l 'mai_DESC_SPAM_SUBJECT'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_SUBJECTTAG'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
     %= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_SUBJECT'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
     %= text_field 'SpamSubject' => class => ""
-    </span></p>
+    </span>
+    </p>
 
     %=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_CONTENT_TO_BLOCK'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
     %= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "", multiple => "1"
-    </span></p>
+    </span>
+    </p>
 
     %   my $btn = l('SAVE');
     %= submit_button "$btn", class => ""

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

@@ -5,7 +5,7 @@
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
-<div id="" class="">
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
@@ -16,7 +16,8 @@
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
         %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
@@ -27,9 +28,11 @@
 
     %=l 'mai_DESC_MODE'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_MODE'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
 <!--
     <pre>
@@ -39,7 +42,8 @@
     </pre>
 -->
     %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => ""
-    </span></p>
+    </span>
+    </p>
 
     %#=l 'mai_DESC_SMTP_AUTH_CONTROL'
     <br />
@@ -51,9 +55,11 @@
     <br />
 
     % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-    <p><span class="">
+    <p>
+    <span class="">
         %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-    </span><span class="">
+    </span>
+    <span class="">
         % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
 <!--
     <pre>
@@ -64,23 +70,28 @@
     </pre>
 -->
         %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => ""
-    </span></p>
+    </span>
+    </p>
 
     % my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-    <p><span class="">
+    <p>
+    <span class="">
         %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-    </span><span class="">
+    </span>
+    <span class="">
         % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';    
-    
         %= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
-    </span></p>
+    </span>
+    </p>
 
     %my $smtp_mesg=l('Submission port %u status:');
-    <p><span class="">
+    <p>
+    <span class="">
         %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-    </span><span class="">
+    </span>
+    <span class="">
         % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
-<!--
+    <!--
     <pre>
         %= dumper $c->get_smtp_ssl_auth_opt()
         %= dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE)
@@ -88,9 +99,10 @@
         %= dumper $c->get_db_prop("uqpsmtpd","access")
         %= param 'uSMTPAuth'
     </pre>
--->
+    -->
     %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
-    </span></p>
+    </span>
+    </p>
 
     <!--<hr class="" />-->
     <h2>
@@ -99,63 +111,87 @@
 
     %=l 'mai_DESC_SECONDARY'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SECONDARY'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
     %= text_field 'SecondaryMailServer', class => ""
-    </span></p>
+    </span>
+    </p>
 
     %=l 'mai_DESC_FETCH_PERIOD'
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_FETCH_PERIOD'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
     %= select_field 'FreqOffice' => $c->fetchmail_freq(), class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
     %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
     %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_POP_ACCOUNT'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
     %= text_field 'SecondaryMailAccount', class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_POP_PASS'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
     %= password_field 'SecondaryMailPassword', class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SORT_METHOD'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
     %= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => ""
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SORT_HEADER'
-    </span><span class="">
+    </span>
+    <span class="">
     % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
     %= text_field 'SecondaryMailEnvelope', class => ""
-    </span></p>
+    </span>
+    </p>
 
     %   my $btn = l('SAVE');
     %= submit_button "$btn", class => ""

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

@@ -5,9 +5,9 @@
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
-<div id="" class="">
+<div class="card-body">
 
-    % if (config->{debug} == TRUE) {
+    % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
     %= dumper $mai_datas
@@ -23,23 +23,32 @@
     <h1><%= $title%></h1>
 
     %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_POP_ACCESS_CONTROL'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_current_pop3_access( TRUE )
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_current_imap_access( TRUE )
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_WEBMAIL'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_current_webmail_status( TRUE )
-    </span></p>
+    </span>
+    </p>
 
     %  my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
     <div class="">
@@ -53,23 +62,32 @@
     <!--<hr class="" />-->
     
     %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_VIRUS_SCAN'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_virus_status(TRUE)
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SPAM_SCAN'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_spam_status(TRUE)
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_patterns_status(TRUE)
-    </span></p>
+    </span>
+    </p>
 
     %   my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
     <div class="">
@@ -83,34 +101,46 @@
     <!--<hr class="" />-->
 
     %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_MODE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $mai_datas->{fetchmailmethod}
-    </span></p>
+    </span>
+    </p>
     
     % my $smtp_mesg;
 
     % $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-    <p><span class="">
+    <p>
+    <span class="">
         %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-    </span><span class="">
+    </span>
+    <span class="">
         %= $c->get_current_smtp_auth( TRUE )
-    </span></p>
+    </span>
+    </p>
 
     % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-    <p><span class="">
+    <p>
+    <span class="">
         %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-    </span><span class="">
+    </span>
+    <span class="">
         %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )
-    </span></p>
+    </span>
+    </p>
 
     % $smtp_mesg=l 'Submission port %u status:';
-    <p><span class="">
+    <p>
+    <span class="">
         %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE )
-    </span></p>
+    </span>
+    </p>
     <br />
 
     % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
@@ -125,23 +155,32 @@
     <!--<hr class="" />-->
 
     %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_UNKNOWN'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_emailunknownuser_status( TRUE )
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_DELEGATE'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_value('DelegateMailServer')
-    </span></p>
+    </span>
+    </p>
 
-    <p><span class="">
+    <p>
+    <span class="">
     %=l 'mai_LABEL_SMARTHOST'
-    </span><span class="">
+    </span>
+    <span class="">
     %= $c->get_value('SMTPSmartHost')
-    </span></p>
+    </span>
+    </p>
 
     % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
     <div class="">

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

@@ -2,18 +2,21 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
         <p>
             %= dumper $c->current_route
         </p>
     % }
     % if ( stash 'error' ) {
-        <br><div class="">
+        <br>
+        <div class="">
             %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
-    <h1> Embedded - <%=$title %></h1><br>
+    <h1> Embedded - <%=$title %></h1>
+    <br>
     <p>If the legacy panel does not appear, then you may not be logged into the original Server manager.<br />You can log in by clicking <a href="/server-manager" target='_blank'>here</a>. Or by clicking on the "Legacy SM" button at the top of the window.</p>
     % my $height = $c->stash('height') | '600px';
     % if ($height !~ /px$/) { $height = $height.'px';}

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
     <p>
     <br>dev<br>
         Oups !!! 

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

@@ -1,32 +1,35 @@
 % layout 'AdminLTE', title => "Sme server 2 - groups";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $grp_datas
-    </p>
+    </div>
     % }
 
+<!-- reetp error here -->
+
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
     % if ($grp_datas->{trt} eq 'ADD') {
         %= include 'partials/_grp_add'
-    %} elsif ($grp_datas->{trt} eq 'DEL') {
+    % } elsif ($grp_datas->{trt} eq 'DEL') {
         %= include 'partials/_grp_del'
-    %} elsif ($grp_datas->{trt} eq 'UPD') {
+    % } elsif ($grp_datas->{trt} eq 'UPD') {
         %= include 'partials/_grp_upd'
-        %} else {
+    % } else {
         %= include 'partials/_grp_list'
-        %}
+    % }
 
 </div>
 %end

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

@@ -1,23 +1,24 @@
 % layout 'AdminLTE', title => "Sme server 2 - hostentries";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $hos_datas
-    </p>
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $hos_datas %>
+    </div>
     % }
 
-    <h1><%= $title%></h1>
-
     % if ( $notif ) {
     <br>
-    <span class="">
+        <div class="text-danger">
             <%= $c->render_to_string(inline => $notif) %>
-    </span>
-    %}
+        </div>
+    % }
+
+    <h1><%= $title%></h1>
 
     % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') {
         %= include 'partials/_hos_upd'

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

@@ -1,20 +1,22 @@
 % layout 'AdminLTE', title => "Sme server 2 - ibays";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $iba_datas
-    </p>
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $iba_datas %>
+    </div>
     % }
 
     % 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>
 

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

@@ -8,7 +8,7 @@
     </p>
     % }
 
-<div>
+<div class="card-body">
 
     % if ( stash 'error' ) {
         <br>
@@ -18,11 +18,10 @@
     % }
 
     <h3><%= $title %> </h3> 
-<!--     <h3>template: initial.html.ep</h3> -->
-<!--     <H1>Initial AdminLTE</H1> -->
-    <p>
+    <!--     <h3>template: initial.html.ep</h3> -->
+    <!--     <H1>Initial AdminLTE</H1> -->
+    
     %= $modul
-    </p>
 
 </div>
 

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

@@ -1,38 +1,43 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!-- default +jquery -->
 <!-- https://icons.getbootstrap.com/ -->
 
+<!-- Nice mojo links -->
+<!-- https://en.mojolicious.perlzemi.com/blog/20140414139745.html -->
+<!-- https://en.mojolicious.perlzemi.com/blog/20110616130993.html -->
+
 <head>
     <title>
         <%= $title %>
     </title>
     <link rel="made" href="mailto:bugs%40koozali.org">
+    <link rel="icon" type="image/x-icon" href="koozali/assets/img/favicon.ico">
     <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     %= content_for 'head_contrib'
-    % if (config 'hasJquery') {
-    %= include 'partials/_js_imports'
-    %= include 'common_js'
-    % }
-
     %= content_for 'refresh'
 
+    %= include 'common_js'
     %= include 'common_css'
   
+    <!-- Custom overrides js/css? -->
+    <!-- This needs refining - do contribs add in their own stuff?? -->
+    <!-- This needs refining -->
 
-<!-- Custom overrides? -->
-
-% if ($c->current_route eq 'nutups') {
-%= include 'partials/_nutups_overrides'
-% }
+    % if (config 'hasJquery') {
+        %= include 'partials/_js_imports'
 
+    % }
 
+    % if ($c->current_route eq 'nutups') {
+        %= include 'partials/_nutups_overrides'
+    % }
 
 </head>
 
-<body class="sidebar-expand-lg bg-body-tertiary">
+<body class="sidebar-expand-lg bg-body-tertiary app-loaded">
 
 
 <!-- This is set from the data at the top of the _partials -->
@@ -47,9 +52,12 @@
     <div class="app-wrapper">
 
 
-        <!-- Should create a new separate header partial -->
+        <!-- Should create a new separate header partial?? -->
+
         <!--begin::Header-->
+
             <nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
+    
                 <!--begin::Container-->
                 <div class="container-fluid">
                   <!--begin::Start Navbar Links-->
@@ -72,12 +80,12 @@
                     </li>
                   </ul>
                   <!--end::Start Navbar Links-->
+    
                     <!-- this can do direct to header so always available-->
                     % if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
                     %= include 'partials/_swt_theme'
                     % }
     
-
                 </div>
                 <!--end::Container-->
             </nav>
@@ -87,6 +95,7 @@
 
 
         <!--begin::Sidebar-->
+
             <aside class="app-sidebar bg-success-subtle" data-bs-theme="light">
                 <!--begin::Sidebar Brand-->
                 <div class="sidebar-brand sidebar-dark-primary">
@@ -105,7 +114,7 @@
                 <!--end::Sidebar Brand-->
     
                 <!--begin::Sidebar Wrapper-->
-            <div class="sidebar-wrapper">
+                <div class="sidebar-wrapper navbar-nav-scroll">
                     <nav class="mt-2">
                         <!--begin::Sidebar Menu-->
                         <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
@@ -126,10 +135,12 @@
                 </div>
                 <!--end::Sidebar Wrapper-->
             </aside>
+
         <!--end::Sidebar-->
 
 
         <!--begin::App Main-->
+
             <main class="app-main">
     
             <!-- Can add a header row here? -->
@@ -143,15 +154,30 @@
                         <!-- Add breadcrumb here -->
                         %= include 'partials/_app_content_breadcrumb'
     
-                    <! We can add extra rows in the main panel here -->
+                        <!-- We can add extra rows in the main panel here -->
+    
                         <!-- %#= include 'partials/_app_content_first_row' -->
                         <!-- %#= include 'partials/_app_content_demo_row' -->
     
                         <!--end::Rows-->
-                    <br>
+    
+                        <!-- <br> -->
     
                         <!-- This is the main page content depening on the calling module -->
+                        <!-- nameofpanel.html.ep -->
+                        <!-- That will also include it's own _partials -->
+                        %#= dumper $c->current_route
+                        % if ($c->current_route ne 'login') {
+                            %= include 'partials/_panel_card_top'
+                            %= include 'partials/_panel_card_header'
+                        % }
+                        
                         %= content 'module'
+
+                        % if ($c->current_route ne 'login') {
+                            %= include 'partials/_panel_card_footer'
+                            %= include 'partials/_panel_card_bottom'
+                        % }    
                     </div>
                 </div>
                 <!--end::App Content-->
@@ -159,6 +185,7 @@
             </main>
         <!--end::App Main-->
 
+        <!-- This is the original footer - move content to new one -->
         <!--  %= include 'partials/_footer'  -->
 
         <!--begin::Footer-->

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

@@ -6,9 +6,11 @@
 
 % content_for 'module' => begin
 
+<!-- needs moving -->
+
 %= stylesheet '/css/letsencrypt.css'
 
-<div>
+<div  class="card-body">
 
     % if (config->{debug} == 1) {
     <pre>

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - localnetworks";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>

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

@@ -2,20 +2,20 @@
 
 % content_for 'module' => begin
 
-  %if ( config 'debug' ) {
-  <p>
+  % if ( config 'debug' ) {
+  <div>
   <!-- %= dumper $c->current_route -->
-  %if ( stash 'trt' ) {
+      % if ( stash 'trt' ) {
           %= dumper stash 'trt'
-  %}
-  </p>
-    %}
+      % }
+  </div>
+  % }
 
 % if ( stash 'error' ) {
       <br><div class="">
       %= $c->render_to_string(inline => stash 'error') 
   </div>
-%}
+% }
 
 % my $btn = l('use_SIGNIN');
 % if ( $trt eq 'RESET' ) {
@@ -23,7 +23,7 @@
       %= $c->render_to_string(inline => l 'use_DESC_RESET') 
   </h2></div>
   % $btn = l('use_RESET');
-%}
+% }
 
 <div class="login-page bg-body-secondary-subtle app-loaded">
       <!-- /.login-logo -->
@@ -77,7 +77,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">Login</button>
                 </div>
               </div>
               <!-- /.col -->

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

@@ -1,69 +0,0 @@
-% layout 'AdminLTE' , title => "Sme server 2 - login";
-
-% content_for 'module' => begin
-
-<div id="" class="">
-
-    %if ( config 'debug' ) {
-	<p>
-	%= dumper $c->current_route
-	%if ( stash 'trt' ) {
-	    %= dumper stash 'trt'
-	%}
-	</p>
-    %}
-
-% if ( stash 'error' ) {
-    	<br><div class="">
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-%}
-
-% my $btn = l('use_SIGNIN');
-% if ( $trt eq 'RESET' ) {
-    	<br><div class=""><h2>
-    	%= $c->render_to_string(inline => l 'use_DESC_RESET') 
-	</h2></div>
-	% $btn = l('use_RESET');
-%}
-
-    <h1>
-    %=l 'use_TITLE'
-    </h1>
-
-    %= form_for '/login' => (method => 'POST') => begin
-
-    <p><span class="">
-    %=l 'USER_NAME'
-    </span><span class="">
-    %= text_field 'Username'
-    </span></p>
-
-% if ( $trt ne 'RESET' ) {
-    <p><span class="">
-    %=l 'PASSWORD'
-    </span><span class="">
-    %= password_field 'Password', id => "", autocomplete => 'current-password', class=>""
-    % if (config 'hasJquery') {
-	%#<a href='#' id="" class=""> <img src="images/visible.png" height="16" alt="Visible"></a>
-    % }
-    </span></p>
-%}
-
-    %= hidden_field 'From' => $c->tx->req->url
-    %= hidden_field 'Trt' => $trt
-
-    <br>
-    <div class="">
-    %= submit_button "$btn", class => ""
-    </div>
-    %if ( config 'pwdreset' ) {
-	<div class=""><a href='login2'>
-        %=l 'use_FORGOT'
-        </a></div>
-    %}
-
-  % end
-
-</div>
-%end

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

@@ -1,8 +1,11 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Manual';
 
 % content_for 'module' => begin
-<div id="" class="">
-    <p><h1><%= $title %></h1></p>
+
+<div class="card-body">
+    <p>
+    <h1><%= $title %></h1>
+    </p>
     %= $c->render_to_string( inline => stash 'modul' )
 </div>
 

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

@@ -2,9 +2,11 @@
 
 % content_for 'module' => begin
 
+<!-- should be moved? -->
+
 %= stylesheet '/css/module.css'
 
-<div id="" class="">
+<div class="card-body">
     % if (config->{debug} == 1) {
         <p>
             <strong>Debug Info:</strong>

root/usr/share/smanager/themes/AdminLTE/templates/not_found.development.html.ep

@@ -2,8 +2,9 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
-    <p><br>dev<br> Oups !!! 
+<div class="card-body">
+    <p>
+    <br>dev<br> Oups !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
         could not be found.

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

@@ -1,6 +1,7 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Error P';
-<div id="" class="">
-    <p><br><br>
+<div class="card-body">
+    <p>
+    <br><br>
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
         could not be found.

root/usr/share/smanager/themes/AdminLTE/templates/not_found.production.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
     <p><br>dev<br> Oups !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"

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

@@ -6,7 +6,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <pre>

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

@@ -8,7 +8,10 @@
                         <div class="col-sm-6">
                             <ol class="breadcrumb float-sm-start">
                                 <li class="breadcrumb-item"><a href="initial">Home</a></li>
-                                <li class="breadcrumb-item active" aria-current="page"><%= $c->current_route %></li>
+                                <li class="breadcrumb-item active" aria-current="page">
+                                <a href="<%= $c->stash('controller') %>"> <%= $c->stash('controller') %>
+                                </a>
+                                </li>
                             </ol>
                         </div>
                     </div>

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

@@ -1,5 +1,5 @@
 
-                         <div id="flag-container" class = "flag-style">
+                         <div id="flag-container" class="flag-style">
                          <!-- class=flag-style" -->
                             <!-- The flag icon will be inserted here -->
                          </div>

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

@@ -1,14 +1,12 @@
-<div id="" class="">
+<div>
 <!--<HR class="">-->
 <a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
-<font class="">
-%   if ( $c->is_logged_in && $c->is_admin) {
+    %   if ( $c->is_logged_in && $c->is_admin) {
         SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
         % my $mode;
         % if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';}
         (Mojo:<%= Mojolicious->VERSION %><%= $mode %>)
-% }
-<br>Copyright 1999-2006 Mitel Corporation<br>
-%= session 'copyRight'
-<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
-</font>
+    % }
+    <br>Copyright 1999-2006 Mitel Corporation<br>
+    %= session 'copyRight'
+    <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>

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

@@ -1,62 +1,80 @@
 <div>
+    <br>
+    <!-- <h2><%#= l 'grp_FORM_TITLE' %></h2> -->
+
+    <h2><%= l 'CREATE_GROUP' %></h2>
+    <br>
+    <%= l 'grp_GROUP_NAMING' %>
+    <br><br>
 
     % my $btn = l('ADD');
 
-    %= form_for '/groups2' => (method => 'POST') => begin
-	<p><h2>
-	%=l 'CREATE_GROUP'
-	</h2>
+    <form action="/smanager/groups2" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputGroupName" class="col-form-label"><%= l 'GROUP_NAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="groupName" id="inputGroupName" class="form-control" aria-describedby="GroupName"  >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Group
+              </span>
+            </div>
+        </div>
+
         <br><br>
-	%=l 'grp_GROUP_NAMING'
-	</p>
 
-	<p>
-	<span class="">
-	%=l 'GROUP_NAME', class => ""
-	</span>
-	<span class="">
-	%= text_field 'groupName', class => ""
-	</span>
-	</p>
+        <%= l 'grp_GROUP_DESC_EXPL' %>
 
-	<p>
-	%=l 'grp_GROUP_DESC_EXPL'
         <br><br>
-	<span class="">
-	%=l 'grp_GROUP_DESC', class => ""
-	</span>
-	<span class="">
-	%= text_field 'groupDesc', class => ""
-	</span>
-	</p>
 
-	<p>
-	<span class="">
-	%=l 'GROUP_MEMBERS', class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc"  >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Group Alias
               </span>
+            </div>
+        </div>
+
         <br>
-	<span class="">
-	%= check_box 'groupMembers' => 'admin'
-	Administrator (admin)
+
+        <div>
+            <%= l 'GROUP_MEMBERS' %>
+        </div>
+
+        <br>
+        <div>
+            <%= check_box 'groupMembers' => 'admin' %>
+            &nbspAdministrator (admin)
             <br>
             % my $users = $c->gen_users_list();
-    %    foreach my $key ( sort keys %$users )
-    %    {
+            % foreach my $key ( sort keys %$users ) {
                 %= check_box 'groupMembers' => $key
-	    %=$users->{$key}
-            %= "(" . $key . ")"
+                &nbsp
+                %= $users->{$key}
+                %= " (" . $key . ")"
                 <br>
             % }
-    </span>
-	</p>
+        </div>
 
-	<p>
         <br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
         %= hidden_field 'trt' => $grp_datas->{trt}
-	
-    % end    
+    </form>
 
 </div>

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

@@ -1,44 +1,51 @@
 <div>
 
     % my $btn = l('REMOVE');
-    %= form_for '/groups2' => (method => 'POST') => begin
-	<p><h2>
-	%=l 'REMOVE_USER_GROUP'
-	</h2>
 
-	<p>
-	%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) 
-	</p>
+    <form action="/smanager/groups2" method="POST">
+        <br><br>
+
+        <h2><%=l 'REMOVE_USER_GROUP' %></h2>
+
+        <br>
+
+        <%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %>
+
+        <br><br>
+
+        <div>
 
-	<p>
         % my $size = keys %$members;
         % if ( ! $size ){
-        %=l 'ACCOUNT_GROUP_NONE'
+          %= l 'ACCOUNT_GROUP_NONE'
         % } else {
-	%=l 'grp_GROUP_HAS_MEMBERS'
-	<br>
+          %= l 'grp_GROUP_HAS_MEMBERS'
+
+        <br><br>
+
         <ul>
-    %    foreach my $key ( keys %$members)
-    %    {
+            % foreach my $key ( keys %$members) {
                 <li>
                     %=$key
-            (
-            %=$members->{$key}
-            )
+                    ( <%=$members->{$key} %> )
                 </li>
             % }
         </ul>
         % }
-	</p>
 
-	<p>
+        </div>
+
+        <br><br>
+
+        <div>
+
         % $size = keys %$ibays;
+
         % if ( $size ) {
             %=l 'grp_IBAYS_WILL_BE_CHANGED'
             <br>
             <ul>
-    %		foreach my $key (sort ( keys %$ibays ))
-    %    	{
+            % foreach my $key (sort ( keys %$ibays )) {
                 <li>
                 %=$key
                 (
@@ -48,16 +55,17 @@
             % }
             </ul>
         % }
-	</p>
+        </div>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
         %= hidden_field 'trt' => $grp_datas->{trt}
         %= hidden_field 'groupName' => $grp_datas->{group}
 
-    % end    
+      </form>
 
 </div>

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

@@ -2,73 +2,63 @@
 
     % my $btn = l('GROUP_ADD');
 
-    %= form_for '/groups' => (method => 'POST') => begin
+    <form action="/smanager/groups2" method="POST">
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+        </div>
+        <%= hidden_field 'trt' => 'ADD' %>
+    </form>
 
-        %= hidden_field 'trt' => 'ADD'
-
-	<p>	<br>
-	%= submit_button "$btn", class => ""
-	</p>
-    % end    
-
-
-	<p>	<h2>
-	%=l 'grp_CURRENT_LIST'
-	</h2><br><br>
+    <br>
+    <h2><%= l 'grp_CURRENT_LIST' %></h2>
+    <br><br>
     % my $numGroups = @$groups;
     % if ($numGroups == 0){
-        %=l 'ACCOUNT_GROUP_NONE'
+        <%= l 'ACCOUNT_GROUP_NONE' %>
     % } else {
-	<table class="table table-bordered">
+        <table class="table table-bordered user-table-max-width">
             <thead>
                 <tr>
-    	    <th class="">
-    	    %=l 'GROUP'
-    	    </th>
-    	    <th class="">
-    	    %=l 'DESCRIPTION'
-    	    </th>
-    	    <th class="">
-	    %=l 'ACTION'
-    	    </th>
+                    <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>
                 </tr>
             </thead>
             <tbody>
-
-    %    foreach my $group ( @$groups )
-    %    {
+                % foreach my $group ( @$groups ) {
                     <tr>
-            %= t td => (class => "") => $group->key
-            %= t td => (class => "") => $group->prop('Description')
-			<td class="" style="min-width:15em">
-				%my $modify_text = l('MODIFY');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
-				%my $group_name = $group->key;  # group name extracted from the data structure
-				%my $actionModify = qq{
+                        <td><%= $group->key %></td>
+                        <td><%= $group->prop('Description') %></td>
+
+                            % my $modify_text = l('MODIFY');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $group_name = $group->key;  # group name extracted from the data structure
+                            % my $actionModify = qq{
                                 % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
-				%	<button type='button' class="" title='$modify_text' >
+                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
                                 %       $modify_text
                                 %   </button>
                                 % </a>
                             %};
-				%my $remove_text = l('REMOVE');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
-				%my $group_name = $group->key;  # group name extracted from the data structure
-				%my $actionRemove = qq{
+                            % my $remove_text = l('REMOVE');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $group_name = $group->key;  # group name extracted from the data structure
+                            % my $actionRemove = qq{
                                 % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
-				%	<button type='button' class="" title='$remove_text' > 
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
                                 %       $remove_text
                                 %   </button>
                                 % </a>
                             %};
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-			</td>
+
+                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
                     </tr>
                 % }
             </tbody>
         </table>
-	<%} %>
-	</p>
-
+    % }
 
 </div>

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

@@ -2,70 +2,91 @@
 
     % my $btn = l('SAVE');
 
-    %= form_for '/groups2' => (method => 'POST') => begin
+    <form action="/smanager/groups2" method="POST">
 
-	<p><h2>
-	%=l 'MODIFY_USER_GROUP'
-	</h2><br></p>
-
-	<p>
-	<span class="">
-	%=l 'GROUP_NAME', class => ""
-	</span>
-	<span class="">
-	%= $grp_datas->{group}, class => ""
-	</span>
-	</p>
-
-	<p>
-	%=l 'grp_GROUP_DESC_EXPL'
-	<br><br>
-	<span class="">
-	%=l 'grp_GROUP_DESC', class => ""
-	</span>
-	<span class="">
-	% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
-	%= text_field 'groupDesc', class => ""
-	</span>
-	</p>
-
-	<p>
-	<span class="">
-	%=l 'GROUP_MEMBERS', class => ""
-	</span>
         <br>
-    <span class="">
+
+        <div>
+            <h2><%= l 'MODIFY_USER_GROUP' %></h2>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputGroupName" class="col-form-label"><%= l 'GROUP_NAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $grp_datas->{group} %>">
+            </div>
+        </div>
+
+        <br><br>
+
+        <%= l 'grp_GROUP_DESC_EXPL'%>
+
+        <br><br>
+
+        % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc" value="<%= $grp_datas->{description} %>">
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Group Alias
+              </span>
+            </div>
+        </div>
+
+        <br><br>
+
+        <div>
+            <%= l 'GROUP_MEMBERS' %>
+        </div>
+
+        <br>
+
+        <div>
         % if ( $members->{'admin'} ) {
             %= check_box 'groupMembers', value => 'admin', checked => undef
-	%} else {
+        % } else {
             %= check_box 'groupMembers' => 'admin'
-	%}
-	Administrator (admin)
+        % }
+        &nbspAdministrator (admin)
+        </div>
+
         <br>
 
         % my $users = $c->gen_users_list();
-    %    foreach my $key ( sort keys %$users )
-    %    {
+        % foreach my $key ( sort keys %$users ) {
             % if ( $members->{ $key } ) {
-		<!-- % = check_box 'groupMembers', value => $key, checked => 'checked' -->
                 <input type='checkbox' name='groupMembers' checked value='<%= $key %>'>
-	    %} else {
+            % } else {
                 %= check_box 'groupMembers' => $key
-	    %}
-	    %=$users->{$key} . " (" . $key . ")"
+                &nbsp
+            % }
+                <%= $users->{$key} %>
+                <%= " (" . $key . ")" %>
             <br>
         % }
-    </span>
-	</p>
 
-	<p>
         <br><br>
-	%= submit_button "$btn", class => ""
-	</p>
 
-	%= hidden_field 'trt' => $grp_datas->{trt}
-        %= hidden_field 'groupName' => $grp_datas->{group}
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
-    % end    
+
+        <%= hidden_field 'trt' => $grp_datas->{trt} %>
+        <%= hidden_field 'groupName' => $grp_datas->{group} %>
+
+    </form>
 
 </div>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,39 +3,41 @@
 
     % my $btn = l('iba_ADD_IBAY');
 
-    %= form_for '/ibays' => (method => 'POST') => begin
-
-    <p>
+    <form action="/smanager/ibays" method="POST">
         <br>
-    %= submit_button "$btn", class => ""
-    </p>
-    %= hidden_field 'trt' => 'ADD';
+        <div>
+            <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+        </div>
+        <%= hidden_field 'trt' => 'ADD'; %>
+    </form>
 
-    % end    
+    <br>
+    <div>
+        <%= l 'iba_FIRSTPAGE_DESC' %>
+    </div>
 
-    <p>
-    %=l 'iba_FIRSTPAGE_DESC'
-    <br><br>
-    </p>
+    <br>
+
+    <div>
+        <h2>Current List of i-bays - translation string required</h2>
+    </div>
+
+    <br>
 
     % my $numIbays = @$ibays;
-    %   if ($numIbays == 0){
-        %=l 'iba_NO_IBAYS'
+    % if ($numIbays == 0) {
+        <%= l 'iba_NO_IBAYS' %>
     % } else {
+
          <table class="table table-bordered">
              <thead>
                  <tr>
-            <th class="">
-            %=l 'NAME'
-            </th>
-            <th class="">
-            %=l 'DESCRIPTION'
-            </th>
-            <th class="">
-                %=l 'ACTION'
-            </th>
+                     <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>
                  </tr>
              </thead>
+
              <tbody>
              % foreach my $ibay (@$ibays)
              % {
@@ -46,68 +48,67 @@
              % qw(local-pw global-pw global-pw-remote);
 
                  <tr>
-            %= t td => (class => "") => $ibay->key
-            %= t td => (class => "") => $ibay->prop('Name')
-            <td class="" style="min-width:15em">
-                %my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
-                %if ($modifiable eq 'yes') { 
+                     <td><%= $ibay->key %>
+                     <td><%= $ibay->prop('Name') %>
+                     <td class="">
+                         % my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
+                         % if ($modifiable eq 'yes') {
                              %my $modify_text = l('MODIFY');  # Localized text
                              %my $csrf_token = "TOKEN";  # CSRF token for security
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %$actionModify = qq{
                              % <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
-                    %   <button type='button' class="" title='$modify_text' > 
+                             %   <button type='button' class="btn btn-primary" title='$modify_text' >
                              % $modify_text
                              %   </button>
                              % </a>
                              %};
-                %}
+                         % }
 
-                %if ($passwordable eq 'yes')  { 
+                         % if ($passwordable eq 'yes') {
                              %my $password_text = l('PASSWORD_RESET');  # Localized text
                              %my $csrf_token = "TOKEN";  # CSRF token for security
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
                                  %$actionResetPw = qq{
                                  % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                        %   <button type='button' class="" title="$password_text - currently unset" style = background:pink; >
+                                 %   <button type='button' class="btn btn-danger" title="$password_text - currently unset" >
                                  %       $password_text
                                  %   </button>
                                  % </a>
-                        %};
-                    %} else {
+                                 % };
+                             % } else {
                                  %$actionResetPw = qq{
                                  % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                        %   <button type='button' class="" title='$password_text' > 
+                                 %   <button type='button' class="btn btn-primary" title='$password_text' >
                                  %       $password_text
                                  %   </button>
                                  % </a>
                                  %};
-                    %}
+                             % }
 
-                %}
+                         % }
 
-                %if ($removable eq 'yes')  { 
+                         % if ($removable eq 'yes')  {
                              %my $remove_text = l('REMOVE');  # Localized text
                              %my $csrf_token = "TOKEN";  # CSRF token for security
                              %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                              %$actionRemove = qq{
                              % <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                             %   <button type='button' class="btn btn-primary" title='$remove_text' >
                              %       $remove_text
                              %   </button>
                              % </a>
                              %};
-                %}
-                <%= $c->render_to_string(inline => $actionModify) %>
-                <%= $c->render_to_string(inline => $actionResetPw)%>
-                <%= $c->render_to_string(inline => $actionRemove) %>
+                         % }
+                         <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>
                  </tr>
              % }
              </tbody>
          </table>
-    <%} %>
-
+    % }
 
 </div>

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

@@ -2,43 +2,62 @@
 
     %   my $btn = l('SAVE');
 
-    %= form_for '/ibaysd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'PASSWORD_RESET'
-    </h2>
+    <form action="/smanager/ibaysd" method="POST">
+
+        <br>
+
+        <div>
+            <h2><%= l 'PASSWORD_RESET' %></h2>
+        <div>
+
+        <br>
+
+        <div>
+            <%= l 'iba_PASSWORD_DESC' %>&nbsp<%= $iba_datas->{ibay} %>
+        </div>
+
+        <br>
+
+
+        <div>
+            <%= 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>
+
+        <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>
+        </div>
+
+        <br>
 
         <br><br>
-    %=l 'iba_PASSWORD_DESC'
-    %= $iba_datas->{ibay}
-    </p>
 
-    <p>
-    <span class="">
-    %=l 'PASSWORD_NEW', class => ""
-    </span>
-    <span class="">
-    %= password_field 'newPass', class => "" , class="">'sme-password'
-    </span>
-    </p>
+       <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'PASSWORD_VERIFY_NEW', class => ""
-    </span>
-    <span class="">
-    %= password_field 'newPassVerify', class => "", class="">'sme-password'
-    </span>
-    </p>
-
-    <p>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
-
-    %= hidden_field 'trt' => $iba_datas->{trt}
-    %= hidden_field 'ibay' => $iba_datas->{ibay}
-    
-    % end    
+        <%= hidden_field 'trt' => $iba_datas->{trt} %>
+        <%= hidden_field 'ibay' => $iba_datas->{ibay} %>
 
+    </form>
+    <br>
 </div>

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

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

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

@@ -25,19 +25,19 @@
         <a href='letsencryptd?trt=PARAMS' class="">
             %= l('lets_CONFIG')
         </a>
-		%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class="">'link link2'
+        %#= 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'
+        %#= 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'
+        %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
     
     
         </div>
@@ -105,7 +105,8 @@
         <p>
         <span class="">
             %=l('lets_Not_Before')
-		</span><span class="">
+        </span>
+                <span class="">
             % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
             %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
         <br>

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

@@ -29,7 +29,8 @@
         <p>
         <span class="">
             %=l('lets_SERVICE_STATUS')
-		</span><span class="">
+        </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';
@@ -77,7 +78,8 @@
         <p>
         <span class="">
             %=l('lets_API_STATUS')
-		</span><span class="">
+        </span>
+                <span class="">
             % my @API_options = [['2' => '2']];
             % param 'API' => $lets_data->{API} unless param 'API';
             %= select_field 'API' => @API_options, class => ""

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

@@ -26,7 +26,7 @@
         <a href='nutupsd?trt=CONFIG' class="">
             %= l('nut_Configure_NutUPS')
         </a>
-		%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class="">'link link1'
+        %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1'
     
     
         </div>

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

@@ -1,4 +1,4 @@
 
                                 <!-- card footer -->
-                                <div class="card-footer">Footer</div>
+                                <div class="card-footer">Card Footer</div>
                                 <!-- /.card-footer-->

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

@@ -1,7 +1,7 @@
 
                                 <div class="card-header">
-                                    <h3 class="card-title">Card Title <%= $title%></h3>
+                                    <h3 class="card-title">Card Title - <%= $title%></h3>
 
-%= include 'partials/_panel_card_tools'
+                                    %= include 'partials/_panel_card_tools'
 
                                 </div>

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

@@ -1,5 +1,7 @@
 
+                                    <!-- 
                                     <div class="card-tools">
+                                        
                                         <button type="button" class="btn btn-tool" data-lte-toggle="card-collapse"
                                             title="Collapse">
                                             <i data-lte-icon="expand" class="bi bi-plus-lg"></i>
@@ -10,3 +12,4 @@
                                             <i class="bi bi-x-lg"></i>
                                         </button>
                                     </div>
+                                    -->

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

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

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

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

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

@@ -8,40 +8,32 @@
 
         %= hidden_field 'trt' => 'ADD'
 
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
+         <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
     % end
-
-
-    <p><h2>
-    %=l 'pse_CURRENT_PSEUDONYMS'
-    </h2><br>
+    <br>
+    <h2><%= l 'pse_CURRENT_PSEUDONYMS' %></h2>
+    <br>
     % my $numPseudonyms = @$pseudonyms;
-    %   if ($numPseudonyms == 0){
-        %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
+    % if ($numPseudonyms == 0) {
+        <%= l 'pse_ACCOUNT_PSEUDONYM_NONE' %>
     % } else {
-    <table class="table table-bordered">
+    <table class="table table-bordered user-table-max-width">
         <thead>
             <tr>
-            <th class="">
-            %=l 'pse_PSEUDONYM'
-            </th>
-            <th class="">
-            %=l 'pse_USER_OR_GROUP'
-            </th>
-            <th class="">
-            %=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 user-valign-center" colspan="2"><%= l 'ACTION' %></th>
                 <!-- <th class="" style="display: normal;"></th> -->
             </tr>
         </thead>
         <tbody>
 
-    %    foreach my $pseudonym ( @$pseudonyms )
-    %    {
+            % foreach my $pseudonym ( @$pseudonyms ) {
             % my $modifiable = $pseudonym->prop('Changeable') || 'yes';
             % my $removable = $pseudonym->prop('Removable') || 'yes';
 
@@ -54,45 +46,43 @@
             % if (defined $visible && $visible eq "internal");
 
                 <tr>
-            %= t td => (class => "") => $pseudonym->key
-            %= t td => (class => "") => $account
+                    <td><%= $pseudonym->key%></td>
+                    <td><%= $account%></td>
 
-            <td class="">
-                %my ($actionModify, $actionRemove) = '&nbsp;'; 
-                %if ($modifiable eq 'yes') { 
+                        % my ($actionModify, $actionRemove) = '&nbsp;';
+                        % if ($modifiable eq 'yes') {
                             %my $modify_text = l('MODIFY');  # Localized text
                             %my $csrf_token = "TOKEN";  # CSRF token for security
                             %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                             %$actionModify = qq{
                             % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
-                    %   <button type='button' class="" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
                             %   $modify_text
                             %   </button>
                             % </a>
                             %};
-                %}
+                        % }
 
-                %if ($removable eq 'yes')  { 
+                        % if ($removable eq 'yes')  {
                             %my $remove_text = l('REMOVE');  # Localized text
                             %my $csrf_token = "TOKEN";  # CSRF token for security
                             %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                             %$actionRemove = qq{
                             % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
                             %   $remove_text
                             %   </button>
                             % </a>
                             %};
-                %}
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+                        % }
+
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
-            </td>
                 </tr>
             % }
             </tbody>
         </table>
-    <%} %>
-    </p>
-
+    % }
 
 </div>

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

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

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

@@ -1,17 +1,16 @@
 <div>
 
-    <p>
     % my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC'));
-    %= $modul
 
-    <h3>
-    %=l 'quo_CURRENT_USAGE_AND_SETTINGS'
-    </h3>
+    <%= $modul %>
+
+    <h2><%= l 'quo_CURRENT_USAGE_AND_SETTINGS' %></h2>
 
     <br>
+
     % my $numUsers = @$userAccounts;
     % if ($numUsers == 0){
-        %=l 'ACCOUNT_USER_NONE'
+        <%= l 'ACCOUNT_USER_NONE' %>
     % } else {
 
         % my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
@@ -21,30 +20,18 @@
         <table class="table table-bordered">
             <thead>
                 <tr>
-            <th class="">
-            %=l 'ACCOUNT'
-            </th>
-            <th class="">
-            %=l 'USER_NAME'
-            </th>
-            <th class="">
-            %= $limit
-            </th>
-            <th class="">
-            %= $absolute
-            </th>
-            <th class="">
-            %= $current
-            </th>
-            <th class="">
-            %=l 'ACTION'
-            </th>
+                    <th class="col-sm"><%= l 'ACCOUNT' %></th>
+                    <th class="col-sm"><%= l 'USER_NAME' %></th>
+                    <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>
                 </tr>
             </thead>
+
             <tbody>
 
-    %    foreach my $user (@$userAccounts)
-    %    {
+            % foreach my $user (@$userAccounts) {
             %     my $uid = getpwnam($user->key);
             %     unless ($uid) {
             %       warn($self->localise('COULD_NOT_GET_UID'),$user->key);
@@ -53,32 +40,33 @@
             %     my $name = $user->prop("FirstName")." ".$user->prop("LastName");
             %     my $dev = Quota::getqcarg('/home/e-smith/files');
             %     my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+
                 <tr>
-            %= t td => (class => "") => $user->key
-            %= t td => (class => "") => $name
-            %= t td => (class => "") => sprintf("%.2f", $bs / 1024 )
-            %= t td => (class => "") => sprintf("%.2f", $bh / 1024 )
-            %= t td => (class => "") => sprintf("%.2f", $bc / 1024 )
-            <td class="">
-                %my $modify_text = l('MODIFY');  # Localized text
-                %my $csrf_token = "TOKEN";  # CSRF token for security
-                %my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
-                %my $actionModify = qq{
+                    <td><%= $user->key %></td>
+                    <td><%= $name %></td>
+                    <td><%= sprintf("%.2f", $bs / 1024 ) %></td>
+                    <td><%= sprintf("%.2f", $bh / 1024 ) %></td>
+                    <td><%= sprintf("%.2f", $bc / 1024 ) %></td>
+
+                    % my $modify_text = l('MODIFY');  # Localized text
+                    % my $csrf_token = "TOKEN";  # CSRF token for security
+                    % my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
+                    % my $actionModify = qq{
                     % <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
-                %   <button type='button' class="" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
                     %       $modify_text
                     %   </button>
                     % </a>
                     %};
-                <%= $c->render_to_string(inline => $actionModify) %>
-            </td>
+
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
                 </tr>
             %    }
             </tbody>
         </table>
-    <%} %>
-    </p>
 
-        %= hidden_field 'trt' => $quo_datas->{trt}
+    % }
+
+    <%= hidden_field 'trt' => $quo_datas->{trt} %>
 
 </div>

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

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

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

@@ -0,0 +1,121 @@
+<div>
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_NETWORKING_PARAMS' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_SERVER_MODE' %></td>
+            <td><%= $rvw_datas->{servermode} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %></td>
+            <td><%= $rvw_datas->{localip} %></td>
+            </tr>
+            
+            % if ( $rvw_datas->{publicip} ) {
+                <tr>
+                <td><%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %></td>
+                <td><%= $rvw_datas->{publicip} %></td>
+                </tr>        
+            % }
+            
+            <tr>
+            <td><%= l 'rvw_GATEWAY'%></td>
+            <td>
+            <%= $rvw_datas->{gateway} %>
+            <%= $rvw_datas->{serveronly} %>
+            </td>
+            </tr>
+            
+            <tr>
+            <td>Local Networks (not translated?)</td>
+            <td><%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%> </td>
+            <tr>
+            
+            <tr>
+            <td><%= l 'rvw_DHCP_SERVER' %></td>
+            <td><%= $rvw_datas->{dhcpserver} %></td>
+            </tr>
+        </tbody>
+    </table>
+            
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_SERVER_NAMES' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_DNS_SERVER' %></td>
+            <td><%= $rvw_datas->{dnsserver} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_WEB_SERVER' %></td>
+            <td><%= $rvw_datas->{webserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_PROXY_SERVER' %></td>
+            <td><%= $rvw_datas->{proxyserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_FTP_SERVER' %></td>
+            <td><%= $rvw_datas->{ftpserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %></td>
+            <td><%= $rvw_datas->{smtpserver} %></tr>
+            </tr>
+        </tbody>
+    </table>
+            
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_PRIMARY_DOMAIN' %></td>
+            <td><%= $rvw_datas->{domainname} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_VIRTUAL_DOMAINS' %></td>
+            <td><%= $rvw_datas->{virtualdomains} %></td>
+            </tr>
+            <tr>
+            <td><%= l 'rvw_PRIMARY_WEB_SITE' %></td>
+            <td><%= $rvw_datas->{primarywebsite} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_SERVER_MANAGER' %></td>
+            <td><%= $rvw_datas->{servermanager} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_USER_PASSWORD_PANEL' %></td>
+            <td><%= $rvw_datas->{usermanager} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_EMAIL_ADDRESSES' %></td>
+            <td><%= $rvw_datas->{emailaddresses} %></td>
+            </tr>
+      
+        </tbody>
+    </table>
+</div>

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

@@ -1,40 +1,32 @@
 
 <!-- Both Theme drop downs but only the first works curently -->
 
-<div id="">
-    % my $btn = l('swt_THEME');
-    %= form_for $c->url_for('swttheme') => (method => 'POST') => begin
-    % my $value = $c->session->{'CurrentTheme'};
-    % $value = session 'CurrentTheme';
+<div>
+%# content_for 'module' => begin
 
-    % param 'Theme' => $value unless param 'Theme';
-    %= select_field 'Theme' => $c->theme_list(), class => ""
-    %= hidden_field 'From' => $c->tx->req->url
-    %= submit_button "$btn"
-</div>
-
-
-
-
-
-%# my $value = $c->session->{'CurrentTheme'};
+% my $value = $c->session->{'CurrentTheme'};
 % $value = session 'CurrentTheme';
 % my $formUrl = $c->url_for('swttheme');
 % param 'Theme' => $value unless param 'Theme';
-% my @themes = $c->theme_list();
+
+%# my @themes = $c->theme_list();
+
+%#= dumper $c
+
+%#= my $size = keys ($c->theme_list)
+
+% my @themeList = $c->theme_list();
+%# = dumper @themeList
+% my @themes = $themeList[0];
 
 
+% param 'Theme' => $value unless param 'Theme';
 
 <form action="<%= $formUrl %>" method="POST" >
   <div class="row g-3 align-items-center">
       <div class="col-auto">
-        <label class="visually-hidden" for="inlineFormSelectPref">Preference</label>
-        <select class="form-select" id="inlineFormSelectPref">
-          <option selected><%= $value %></option>
-          % foreach my $theme (@themes) {
-              <option value="<%= $theme %>"><%= $theme %></option>
-          % };
-        </select>
+        <!--<label class="visually-hidden" for="inlineFormSelectPref">Preference</label> -->
+        %= select_field 'Theme' => $c->theme_list(), class => "form-select", id => "Preference"
         %= hidden_field 'From' => $c->tx->req->url
       </div>
 
@@ -45,4 +37,7 @@
 </form>
 
 
-% end
+%# end
+</div>
+
+

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

@@ -1,28 +1,56 @@
-<div id="">
+<div>
 
     % my $btn = l('REMOVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'usr_REMOVE_ACCOUNT_TITLE'
-    </h2>
+    <form action="/smanager/useraccountsd" method="POST">
+    %#= form_for '/useraccountsd' => (method => 'POST') => begin
         
+        <div>
+            <h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
+        </div>
+        <br>
+        <div>
+        Needs a text change in the Lex files
         <br>
         %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
+        </div>
+    
+        <br><br>
+    
+        <table class="table table-bordered user-table-max-wdith">
+            <thead>
+                <tr>
+                    <th class="col-sm">
+                        %=l 'ACCOUNT'
+                    </th>
+                    <th class="col-sm">
+                        %=l 'USER_NAME'
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><%= $usr_datas->{user} %></td>
+                    <td><%= $usr_datas->{name} %></td>
+               </tr>
+           </tbody>
+        </table>
+    
         <br>
         %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
-    </p>
     
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
     
         %= hidden_field 'trt' => $usr_datas->{trt}
         %= hidden_field 'user' => $usr_datas->{user}
         %= hidden_field 'name' => $usr_datas->{name}
         
-    % end    
+    %# end 
+    </form>
+       
 
 </div>

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

@@ -1,46 +1,36 @@
 <div>
 
-
     % my $btn = l('usr_ADD_USER');
 
-    %= form_for '/useraccounts' => (method => 'POST') => begin
-
-    <p>
+    <form action="/smanager/useraccounts" method="POST">
         <br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div>
+            <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+        </div>
+    </form>
 
-    % end    
-
-    <p>
-    %= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
     <br>
-    </p>
+    <%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) %>
+    <br>
+
+    %#= dumper @$users
 
     % my $numUsers = @$users;
-    %   if ($numUsers == 0){
-        %=l 'usr_NO_USER_ACCOUNTS'
+    % if ($numUsers == 0) {
+        <%=l 'usr_NO_USER_ACCOUNTS' %>
     % } else {
+    <div class="table-responsive">
         <table class="table table-bordered">
             <thead>
-    <tr>
-            <th>
-            %=l 'ACCOUNT'
-            </th>
-            <th>
-            %=l 'USER_NAME'
-            </th>
-            <th>
-            %=l 'usr_VPN_CLIENT_ACCESS'
-            </th>
-            <th>
-            %=l 'usr_FORWARDING_ADDRESS'
-            </th>
-            <th>
-            %=l 'ACTION'
-            </th>
+                <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>
-        </thead><tbody>
+            </thead>
+            <tbody>
 
             % foreach my $user (@$users) {
 
@@ -54,106 +44,118 @@
             % my $vpnaccess = $user->prop('VPNClientAccess') || 'no';
             % $vpnaccess = $vpnaccess eq 'yes' ? $c->l('YES') : $c->l('NO');
             % my $password_set = $user->prop('PasswordSet');
+            % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+            % my $csrf_token = "TOKEN";  # CSRF token for security
+            % my $modify_text = l('MODIFY');  # Localized text
+            % my $remove_text = l('REMOVE');  # Localized text
+            % my $password_text = l("PASSWORD_RESET");
+            % my $lock_text = l('usr_LOCK');  # Localized text
+            % my $roundcube_text = l('Webmail');  # Localized text
+            % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
+            % my $thisdomain = $c->req->url->to_abs->host;
 
                 <tr>
-            %= t td => (class => "") => $username
-            %= t td => (class => "") => "$first  $last"
-            %= t td => (class => "") => $vpnaccess
-            %= t td => (class => "") => $fwd
-            % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
-            % my $modify_text = l('MODIFY');  # Localized text
-            % my $csrf_token = "TOKEN";  # CSRF token for security
-            % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-            % my $password_text = l("PASSWORD_RESET");
-            %if ($useraccounts_user_name eq 'admin')  { 
+                    <td><%= $username %></td>
+                    <td><%= $first %>&nbsp<%=$last %></td>
+                    <td><%= $vpnaccess %></td>
+                    <td><%= $fwd %></td>
+
+                    % if ($useraccounts_user_name eq 'admin')  {
                         %$actionModify = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$modify_text'>
+                            %   <button type='button' class="btn btn-primary" 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="" title='$password_text' >
+                            %   <button type='button' class="btn btn-primary" title='$password_text' >
                             %       $password_text
                             %   </button>
                             %</a>
                         %};
-            %} else {
+                    % } else {
                         %$actionModify = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
                             %       $modify_text
                             %   </button>
                             %</a>
                         %};
-            %}
-            %if ($password_set ne 'yes') {
-                %$actionLock = l('ACCOUNT_LOCKED');
+                    % }
+
+
+                    % if ($password_set ne 'yes') {
+
+                       <!-- Needs a fix here -->
+                       %#$actionLock = l('ACCOUNT_LOCKED');
+                       <!-- Sets BOTH columns - possibly leave out Reset Password here?-->
+                       %$actionLock = qq{
+                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
+                                %   <button type='button' class="btn btn-danger" title="$password_text - currently unset">
+                                %       Unlock
+                                %   </button>
+                            %</a>
+                            %};
                        %$actionResetPw = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                        %   <button type='button' class="" title="$password_text - currently unset" style = background:pink; >
+                                %   <button type='button' class="btn btn-primary" title="$password_text - currently unset">
                                 %       $password_text
                                 %   </button>
                             %</a>
                        %};
-            %} elsif ($useraccounts_user_name ne 'admin') {
-                % my $lock_text = l('ACCOUNT LOCKED');  # Localized text
-                % my $csrf_token = "TOKEN";  # CSRF token for security
-                % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+
+                    % } elsif ($useraccounts_user_name ne 'admin') {
                         %$actionLock = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
-                        %   <button type='button' class="" title='$lock_text' >
+                                %   <button type='button' class="btn btn-primary" 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="" title='$password_text' >
+                            %   <button type='button' class="btn btn-primary" title='$password_text' >
                             %       $password_text
                             %   </button>
                             %</a>
                             %};
-            %}
-            %if ( $removable eq 'yes' )  { 
-                % my $remove_text = l('REMOVE');  # Localized text
-                % my $csrf_token = "TOKEN";  # CSRF token for security
+                    % }
+
+                    % if ( $removable eq 'yes' )  {
                         %$actionRemove = qq{
                             %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
                             %       $remove_text
                             %   </button>
                             %</a>
                         %};
-            %}
+                    % }
 
-            % my $thisdomain = $c->req->url->to_abs->host;
-            % my $roundcube_text = l('Webmail');  # Localized text
-            % $csrf_token = "TOKEN";  # CSRF token for security
-            % $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+                    <!-- 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="" title='$roundcube_text' >
+                        %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
                         %       $roundcube_text
                         %   </button>
                         %</a>
                     %};
-            <td class="">
-                    <%= $c->render_to_string(inline => $actionModify) %>
-                    <%= $c->render_to_string(inline => $actionResetPw) %>
-                    <%= $c->render_to_string(inline => $actionLock) %>
-                    <%= $c->render_to_string(inline => $actionRemove) %>
-                    <%= $c->render_to_string(inline => $actionroundcube) %>
-            </td>
+
+                    <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>
                 </tr>
                 % }
             </tbody>
         </table>
+    </div>
 
-    <%} %>
+    % }
 
-        %= hidden_field 'trt' => $usr_datas->{trt}
+    <%= hidden_field 'trt' => $usr_datas->{trt} %>
 
 </div>
+

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

@@ -2,27 +2,56 @@
 
     %   my $btn = l('usr_LOCK');
     
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'usr_LOCK_ACCOUNT_TITLE'
-    </h2>
+    <form action="/smanager/useraccountsd" method="POST">
 
+    %#= form_for '/useraccountsd' => (method => 'POST') => begin
+    
+    <div>
+    <h2><%= l 'usr_LOCK_ACCOUNT_TITLE' %></h2>
+    </div>
     <br>
-    %= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} );
+    <div>
+    Needs a text change in the Lex files
+    <br>
+    <%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %> 
+    </div>
+
+    <br><br>
+
+    <table class="table table-bordered user-table-max-wdith">
+        <thead>
+            <tr>
+                <th class="col-sm">
+                    %=l 'ACCOUNT'
+                </th>
+                <th class="col-sm">
+                    %=l 'USER_NAME'
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td><%= $usr_datas->{user} %></td>
+                <td><%= $usr_datas->{name} %></td>
+           </tr>
+       </tbody>
+    </table>
+
     <br>
     %= $c->render_to_string(inline => $c->l('usr_LOCK_DESC2'))
-    </p>
 
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
 
     %= hidden_field 'trt' => $usr_datas->{trt}
     %= hidden_field 'user' => $usr_datas->{user}
     %= hidden_field 'name' => $usr_datas->{name}
     
-    % end    
+    </form>
+    %# end    
 
 </div>

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

@@ -2,44 +2,87 @@
 
     % my $btn = l('SAVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'RESET_PASSWORD_TITLE'
-    </h2>
+    <form action="/smanager/useraccountsd" method="POST">
 
     <br>
-    %= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} );
+
+    <div>
+        <h2><%= l 'RESET_PASSWORD_TITLE' %></h2>
+    </div>
+
     <br>
-    %= l 'usr_RESET_DESC2'
-    </p>
 
-    <p>
-    <span class="">
-    %=l 'PASSWORD_NEW', class => ""
-    </span><span class="">
-    %= password_field 'newPass', class => "", class="">'sme-password'
-    </span>
-    </p>
+    <div>
+        <%= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} ); %>
+    </div>
 
-    <p>
-    <span class="">
-    %=l 'PASSWORD_VERIFY_NEW', class => ""
-    </span>
-    <span class="">
-    %= password_field 'newPassVerify', class => "", class="">'sme-password'
-    </span>
-    </p>
+    <br>
 
-    <p>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
+    <table class="table table-bordered user-table-max-wdith">
+        <thead>
+            <tr>
+                <th class="col-sm">
+                    %=l 'ACCOUNT'
+                </th>
+                <th class="col-sm">
+                    %=l 'USER_NAME'
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td><%= $usr_datas->{user} %></td>
+                <td><%= $usr_datas->{name} %></td>
+           </tr>
+       </tbody>
+    </table>
+
+    <br>
+
+    <div>
+        <%= l 'usr_RESET_DESC2' %>
+    </div>
+
+    <br>
+
+    <div>
+        <%= 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>
+
+    <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>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
 
     %= hidden_field 'trt' => $usr_datas->{trt}
     %= hidden_field 'user' => $usr_datas->{user}
     %= hidden_field 'name' => $usr_datas->{name}
 
-    % end    
-
+    </form>
+    <br>
 </div>

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

@@ -1,48 +1,78 @@
 <div>
 
     % my $btn = l('SAVE');
+    <form action="/smanager/useraccountsd" method="POST">
+    %#= form_for '/useraccountsd' => (method => 'POST') => begin
     
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    %= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
-    </p>
+        <div>
+        <h2><%= l 'PASSWORD_RESET' %></h2>
+        </div>
         
-    <p>
-    <span class="">
-    %=l 'usr_CURRENT_SYSTEM_PASSWORD', class => ""
-    </span>
-    <span class="">
-    %= password_field 'CurPass', class => "", class="">'sme-password'
-    </span>
-    </p>
+        <br>
     
-    <p>
-    <span class="">
-    %=l 'usr_NEW_SYSTEM_PASSWORD', class => ""
-    </span>
-    <span class="">
-    %= password_field 'Pass', class => "", class="">'sme-password'
-    </span>
-    </p>
+        <div>
+        <%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
+        </div>
     
-    <p>
-    <span class="">
-    %=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => ""
-    </span>
-    <span class="">
-    %= password_field 'PassVerify', class => "", class="">'sme-password'
-    </span>
-    </p>
+        <br>
     
-    <p>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div>
+        <%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
+        </div>
+        
+        <br>
+    
+       <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <input name="CurPass" id="Pass" type="password" class="form-control sme-password" placeholder="Current Password">
+            </div>
+        </div>  
+    
+        <br>
+    
+        <div>
+        <%= l 'usr_NEW_SYSTEM_PASSWORD' %>
+        </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="New Password">
+            </div>
+        </div>  
+    
+    
+        <br>
+    
+    
+        <div>
+        <%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %>
+        </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="New Password verify">
+            </div>
+        </div>  
+    
+        <br>
+    
+        <br>
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
     
         %= hidden_field 'trt' => $usr_datas->{trt}
         %= hidden_field 'user' => $usr_datas->{user}
         %= hidden_field 'name' => $usr_datas->{name}
     
-    % end
+    %# end
+    </form>
 
 </div>

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

@@ -1,155 +1,252 @@
-<div>
+
+<div class="container-sm">
+    <br>
+    <h2><%= l 'usr_P2_TITLE' %></h2>
+    <br>
+    <%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %>
+    <br><br>
     
     % my $btn = l('ADD');  
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'usr_P2_TITLE'
-    </h2>
-    <br>
-    %= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC'))
-    </p>
+    <form action="/smanager/useraccountsd" method="POST">
+        %#= form_for '/useraccountsd' => (method => 'POST') => begin
     
-    <p>
-    <span class="">
-    %=l 'usr_ACCOUNT_NAME'
-    </span>
-    <span class="">
         % if ( $usr_datas->{trt} eq 'ADD' ) {
+        
         % param 'user' => $usr_datas->{user} unless param 'user';
-        %= text_field 'user', class => ""
+    
+        <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>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="user" id="inputAccountName" class="form-control" aria-describedby="AccountName" value="<%= $usr_datas->{user} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                User
+              </span>
+            </div>
+        </div>
+    
         % } else {
+            <!-- If not user set Button Save not Add -->
             % $btn = l('SAVE');
-        %= $usr_datas->{user}, class => ""
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                  <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
+                </div>
+                <div class="col-auto">
+                  <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
+                </div>
+        
+            </div>
         % }
-    </span>
-    </p>
        
-    <p>
-    <span class="">
-    %=l 'usr_FIRSTNAME'
-    </span><span class="">
-    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-    %= text_field 'FirstName', class => ""
+        <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>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="FirstName" id="inputFirstName" class="form-control" aria-describedby="FirstName" value="<%= $usr_datas->{firstname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                First Name
               </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_LASTNAME'
-    </span>
-    <span class="">
+            </div>
+        </div>
+        <br>
+    
        % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    %= text_field 'LastName', class => ""
-    </span>
-    </p>
     
-    <p>
-    <span class="">
-    %=l 'usr_DEPARTMENT'
-    </span><span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="LastName" id="inputLastName" class="form-control" aria-describedby="LastName" value="<%= $usr_datas->{lastname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Last Name
+              </span>
+            </div>
+        </div>
+        <br>
+    
+    
         % param 'Dept' => $usr_datas->{dept} unless param 'Dept';
-    %= text_field 'Dept', class => ""
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputDepartment" class="col-form-label"><%= l 'usr_DEPARTMENT' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Dept" id="inputEmail" class="form-control" aria-describedby="Dept" value="<%= $usr_datas->{dept} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Department
               </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_COMPANY'
-    </span>
-    <span class="">
+            </div>
+        </div>
+        <br>
+    
+    
         % param 'Company' => $usr_datas->{company} unless param 'Company';
-    %= text_field 'Company', class => ""
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputCompany" class="col-form-label"><%= l 'usr_COMPANY' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Company" id="inputCompany" class="form-control" aria-describedby="Company" value="<%= $usr_datas->{company} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Company
               </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_STREET_ADDRESS'
-    </span><span class="">
+            </div>
+        </div>
+        <br>
+    
+    
         % param 'Street' => $usr_datas->{street} unless param 'Street';
-    %= text_field 'Street', class => ""
+    
+        <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>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Street" id="inputCompany" class="form-control" aria-describedby="Street" value="<%= $usr_datas->{street} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Street
               </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_CITY'
-    </span>
-    <span class="">
+            </div>
+        </div>
+        <br>
+        
         % param 'City' => $usr_datas->{city} unless param 'City';
-    %= text_field 'City', class => ""
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputCity" class="col-form-label"><%= l 'usr_CITY' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="City" id="inputCity" class="form-control" aria-describedby="City" value="<%= $usr_datas->{city} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                City
               </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_PHONE_NUMBER'
-    </span>
-    <span class="">
+            </div>
+        </div>
+        <br>
+       
         % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
-    %= text_field 'Phone', class => ""
+    
+        <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>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Phone" id="inputPhone" class="form-control" aria-describedby="City" value="<%= $usr_datas->{phone} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Phone
               </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_EMAIL_DELIVERY'
-    </span>
-    <span class="">
+            </div>
+        </div>
+        <br>
+        
         % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    %= select_field 'EmailForward' => $c->emailForward_list(), class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_FORWARDING_ADDRESS'
-    </span>
-    <span class="">
+    
+        <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"
+            </div>
+        </div>
+        <br>
+    
         % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    %= text_field 'ForwardAddress', class => ""
-    </span>
-    </p>
     
-    <p>
-    <span class="">
-    %=l 'usr_VPN_CLIENT_ACCESS'
+        <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>
+            </div>
+            <div class="col-auto">
+              <input type="email" name="ForwardAddresss" id="inputEmail" class="form-control" aria-describedby="Email" value=<%= $usr_datas->{forwardaddress} %>>
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Email forwarding address
               </span>
-    <span class="">
+            </div>
+        </div>
+        <br>
+    
+    
         % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
-    </span>
-    </p>
     
+        <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"
+            </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');
             %= form_for '/useraccountso' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
-    </span>
-    <span class="">
+            %= l 'usr_LABEL_IPSECRW_DOWNLOAD'
             %= submit_button $btn2, class => ""
-    </span>
-    </p>
             %= hidden_field 'trt' => 'CRT'
             %= hidden_field 'user' => $usr_datas->{user}
-    %end
+            % end
         % }
+        <!-- End if ipsec  -->
     
+    
+        <!-- Groups begin -->
+        <div>
             % my @groups = @{$c->get_groups()};
+            
+            %#= dumper @groups
+        
             % if ( @groups ) {
-    <p>
-    <span class="">
+
+                <br><br>
+                
                 %=l 'usr_GROUP_MEMBERSHIPS'
-    </span>
-    <span class="">
-    <table class="tabel table-bordered">
+                
+                <br><br>
+                
+                <table class="table table-bordered user-table-max-wdith">
                 <thead>
-    <tr><th class="">
-            %=l 'usr_MEMBER'
-            </th><th class="">
-            %=l 'GROUP'
-            </th><th class="">
-            %=l 'DESCRIPTION'
-        </th>
+                  <tr>
+                    <th class="col-sm-1"><%= l 'usr_MEMBER' %></th>
+                    <th class="col-sm-1"><%=l 'GROUP' %></th>
+                    <th class="col-sm-1"><%=l 'DESCRIPTION' %></th>
                   </tr>
-        </thead><tbody>
+                </thead>
+                    <tbody>
                         
                         % foreach my $g ( @groups) {
                             % my $user = $usr_datas->{user};
@@ -159,37 +256,41 @@
                                 % if ( $user and $c->is_user_in_group($user, $groupname) ) {
                                 %     $checked = 'checked';
                                 % }
-        <tr>
             
+                            <tr>
                                 <td>
                                 % if ( $checked eq 'checked' ) {
-        <!-- % = check_box 'groupMemberships', value => $groupname, checked => $checked -->
                                 <input type='checkbox' name='groupMemberships' checked value='<%= $groupname %>'>
                                 %} else {
                                 %= check_box 'groupMemberships' => $groupname
                                 %}
                                 </td>
-            <!-- t td => (class => "") => (check_box ' groupMemberships' => $groupname  $checked) -->
-            %= t td => (class => "") => $groupname
-            %= t td => (class => "") => "$description"
+                                <td><%= $groupname %></td>
+                                <td><%= $description %></td>
                             </tr>
                             % }
+        
                         </tbody>
                     </table>
-        </span>
-    </p>
-    %   }
             
-    <p>
-    <br><br>
-    %= submit_button $btn, class => ""
-    </p>
+            % }
+        <!-- Groups End -->
+        </div>
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
     
         %= hidden_field 'trt' => $usr_datas->{trt}
+    
         % if ( $usr_datas->{trt} eq 'UPD' ) {
                 %= hidden_field 'user' => $usr_datas->{user}
         % }
         
-    % end
-
+    </form>
+    %#end
 </div>
+
+<!-- End of containers-sm -->

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

@@ -1,96 +1,115 @@
-<div>
+% content_for 'module' => begin
+
+<div class="container-sm">
+    <br>
+    <h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
+     
+    <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">
+              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
+            </div>
+            <div class="col-auto">
+              <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>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="FirstName" id="inputFirstName" class="form-control" aria-describedby="FirstName" value="<%= $usr_datas->{firstname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                First Name
+              </span>
+            </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>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="LastName" id="inputLastName" class="form-control" aria-describedby="LastName" value="<%= $usr_datas->{lastname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Last Name
+              </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"
+            </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>
+            </div>
+            <div class="col-auto">
+              <input type="email" name="ForwardAddress" id="inputEmail" class="form-control" aria-describedby="Email" value="<%= $usr_datas->{forwardaddress} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Email forwarding address
+              </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"
+            </div>
+            <br>
+        </div>
 
         % my $btn = l('SAVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'usr_MODIFY_ADMIN_TITLE'
-    </h2><br>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'usr_ACCOUNT_NAME'
-    </span>
-    <span class="">
-    % $btn = l('SAVE');
-    %= $usr_datas->{user}, class => ""
-    </span>
-    </p>
 
-    <p>
-    <span class="">
-    %=l 'usr_FIRSTNAME'
-    </span>
-    <span class="">
-    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-    %= text_field 'FirstName', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_LASTNAME'
-    </span>
-    <span class="">
-    % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    %= text_field 'LastName', class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_EMAIL_DELIVERY'
-    </span>
-    <span class="">
-    % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    %= select_field 'EmailForward' => $c->emailForward_list(), class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_FORWARDING_ADDRESS'
-    </span>
-    <span class="">
-    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    %= text_field 'ForwardAddress', class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_VPN_CLIENT_ACCESS'
-    </span>
-    <span class="">
-    % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
-    </span>
-    </p>
-
-    %   if ( $c->ipsec_for_acct eq 'OK' ) {
-    %   my $btn2 = $c->l('DOWNLOAD');
-    %= form_for '/useraccountso' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
-    </span>
-    <span class="">
-    %= submit_button $btn2, class => ""
-    </span>
-    </p>
-    %= hidden_field 'trt' => 'CRT'
-        %= hidden_field 'user' => $usr_datas->{user}
-    %end
-    %   }
-
-    <p>
-    <br>
-    %= submit_button $btn, class => ""
-    </p>
+        trt: <%= dumper $usr_datas->{trt} %>
+        user: <%= dumper $usr_datas->{user} %>
         
         %= hidden_field 'trt' => $usr_datas->{trt}
         %= hidden_field 'user' => $usr_datas->{user}
         
-    % end
-
+    %# end
+    </form>
 </div>
+

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

@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - Port Forwards";
 
 % content_for 'module' => begin
-<div>
+
+<div  class="card-body">
 
     % if (config->{debug} == 1) {
     <p>

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

@@ -1,32 +1,34 @@
 % layout 'AdminLTE', title => "Sme server 2 - printers";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
+    <div>
         %= dumper $c->current_route
         %= dumper $prt_datas
-    </p>
-    %}
+    </div>
+    % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-            %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div>
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
     % if ($prt_datas->{trt} eq 'ADD') {
         %= include 'partials/_prt_add'
-    %} elsif ($prt_datas->{trt} eq 'DEL') {
+    % } elsif ($prt_datas->{trt} eq 'DEL') {
         %= include 'partials/_prt_del'
-    %} elsif ($prt_datas->{trt} eq 'NET') {
+    % } elsif ($prt_datas->{trt} eq 'NET') {
         %= include 'partials/_prt_net'
-        %} else {
+    % } else {
         %= include 'partials/_prt_list'
-        %}
+    % }
 
 </div>
 %end

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

@@ -1,43 +1,64 @@
 % layout 'AdminLTE', title => "Sme server 2 - proxy";
 
 % content_for 'module' => begin
-<div id="" class="">
-    %if (config->{debug} == 1) {
-    <p>(DBG)route: <%= $c->current_route %><br>
+
+<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} %>
-    </p>
-    %}
+    </div>
+    % }
     <h1><%= $title %></h1>
     <br>
     <%= $modul %>
+
     <% my $btn = l('SAVE'); %>
 
-    %= form_for 'proxy' => (method => 'POST') => begin
-    <p>
-    %=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION'
+    <form action="/smanager/hostentriesd" method="POST">
+    %#= form_for 'proxy' => (method => 'POST') => begin
+
+    <div>
+        <div>
+            <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+            
             <br><br>
-    <span class="">
-    %=l 'prx_HTTP_PROXY_STATUS_LABEL'
-    </span><span class="">
+    
+            <div>
+                <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
+            </div>
+            
+            <div>
                 % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status';
-    %= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "", id => ""
-    </span>
-    </p>
-    %if ( $prx_datas->{smtp_proxy_status} ) {
-        <p>
-        %=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION'
+                <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %>
+            </div>
+        </div>
+    
+        % if ( $prx_datas->{smtp_proxy_status} ) {
+            <div>
+                <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
             <br><br>
-        <span class="">
-        %=l 'prx_SMTP_PROXY_STATUS_LABEL'
-        </span><span class="">
+            <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']], class => "", id => "", default => $prx_datas->{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>
-        </span>
-        </p>
-    %}
-    %= submit_button "$btn", class => ""
-    % end
+            </div>
+        % }
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </div>
+    %# end
+    </form>
+
 </div>
+
 %end

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

@@ -1,32 +1,35 @@
 % layout 'AdminLTE', title => "Sme server 2 - pseudonyms";
 
 % content_for 'module' => begin
-<div class="">
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $pse_datas
-    </p>
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $pse_datas %>
+    </div>
     % }
 
     % 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>
 
     % if ($pse_datas->{trt} eq 'ADD') {
         %= include 'partials/_pse_add'
-    %} elsif ($pse_datas->{trt} eq 'DEL') {
+    % } elsif ($pse_datas->{trt} eq 'DEL') {
         %= include 'partials/_pse_del'
-    %} elsif ($pse_datas->{trt} eq 'UPD') {
+    % } elsif ($pse_datas->{trt} eq 'UPD') {
         %= include 'partials/_pse_upd'
-        %} else {
+    % } else {
         %= include 'partials/_pse_list'
-        %}
+    % }
 
 </div>
+
 %end