Update email templates, mai_data, button sizes, numerous tweaks

2025-07-06 13:37:49 +02:00
parent b5b7645ebc
commit 305e7b75d2
93 changed files with 244 additions and 1435 deletions
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/flag-icon.min.css
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/flag-icon.min.css
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/Koozali-Spinner.js
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/Koozali-Spinner.js
@@ -0,0 +1,12 @@
+function spinner() {
+    const spinnerDisplayer = document.querySelector('.spinner-displayer');
+    const btn = document.getElementById('btn');
+
+    btn.addEventListener('click', () => {
+        spinnerDisplayer.classList.add('loading');
+    })
+}
+
+spinner();
+
+//        <div class='spinner-displayer'></div>
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/datetime.js
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/datetime.js
@@ -1,18 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var select = document.getElementById('time_mode_select');
-  var ntpSection = document.getElementById('ntp_section');
-  var manualSection = document.getElementById('manual_section');
-
-  function toggleSections() {
-    if (select.value === 'dat_manually_set') {
-      ntpSection.style.display = 'none';
-      manualSection.style.display = 'block';
-    } else {
-      ntpSection.style.display = 'block';
-      manualSection.style.display = 'none';
-    }
-  }
-
-  select.addEventListener('change', toggleSections);
-  toggleSections(); // Set initial state
-});
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/flag-by-locale.js
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/flag-by-locale.js
@@ -1,302 +0,0 @@
-document.addEventListener('DOMContentLoaded', () => {
-	const flagContainer = document.getElementById('flag-container');
-	// Mapping of language codes to country codes and their names
-	const languageToCountryMap = {
-		"af": { code: "NA", name: "Namibia" },
-		"agq": { code: "CM", name: "Cameroon" },
-		"ak": { code: "GH", name: "Ghana" },
-		"am": { code: "ET", name: "Ethiopia" },
-		"ar": { code: "SA", name: "Saudi Arabia" },
-		"as": { code: "IN", name: "India" },
-		"asa": { code: "TZ", name: "Tanzania" },
-		"ast": { code: "ES", name: "Spain" },
-		"az": { code: "AZ", name: "Azerbaijan" },
-		"bas": { code: "CM", name: "Cameroon" },
-		"be": { code: "BY", name: "Belarus" },
-		"bem": { code: "ZM", name: "Zambia" },
-		"bez": { code: "TZ", name: "Tanzania" },
-		"bg": { code: "BG", name: "Bulgaria" },
-		"bm": { code: "ML", name: "Mali" },
-		"bn": { code: "BD", name: "Bangladesh" },
-		"bo": { code: "CN", name: "China" },
-		"br": { code: "FR", name: "France" },
-		"brx": { code: "IN", name: "India" },
-		"bs": { code: "BA", name: "Bosnia and Herzegovina" },
-		"ca": { code: "AD", name: "Andorra" },
-		"ccp": { code: "BD", name: "Bangladesh" },
-		"ce": { code: "RU", name: "Russia" },
-		"cgg": { code: "UG", name: "Uganda" },
-		"chr": { code: "US", name: "United States" },
-		"ckb": { code: "IQ", name: "Iraq" },
-		"cs": { code: "CZ", name: "Czech Republic" },
-		"cy": { code: "GB", name: "United Kingdom" },
-		"da": { code: "DK", name: "Denmark" },
-		"dav": { code: "KE", name: "Kenya" },
-		"de": { code: "DE", name: "Germany" },
-		"dje": { code: "NE", name: "Niger" },
-		"dsb": { code: "DE", name: "Germany" },
-		"dua": { code: "CM", name: "Cameroon" },
-		"dyo": { code: "SN", name: "Senegal" },
-		"dz": { code: "BT", name: "Bhutan" },
-		"ebu": { code: "KE", name: "Kenya" },
-		"ee": { code: "GH", name: "Ghana" },
-		"el": { code: "CY", name: "Cyprus" },
-		"en": { code: "US", name: "United States" }, // Assume US for English if unspecified
-		"es": { code: "ES", name: "Spain" },
-		"et": { code: "EE", name: "Estonia" },
-		"eu": { code: "ES", name: "Spain" },
-		"ewo": { code: "CM", name: "Cameroon" },
-		"fa": { code: "AF", name: "Afghanistan" },
-		"ff": { code: "CM", name: "Cameroon" },
-		"fi": { code: "FI", name: "Finland" },
-		"fil": { code: "PH", name: "Philippines" },
-		"fo": { code: "FO", name: "Faroe Islands" },
-		"fr": { code: "FR", name: "France" },
-		"fur": { code: "IT", name: "Italy" },
-		"fy": { code: "NL", name: "Netherlands" },
-		"ga": { code: "IE", name: "Ireland" },
-		"gd": { code: "GB", name: "United Kingdom" },
-		"gl": { code: "ES", name: "Spain" },
-		"gsw": { code: "CH", name: "Switzerland" },
-		"gu": { code: "IN", name: "India" },
-		"guz": { code: "KE", name: "Kenya" },
-		"gv": { code: "IM", name: "Isle of Man" },
-		"ha": { code: "GH", name: "Ghana" },
-		"haw": { code: "US", name: "United States" },
-		"he": { code: "IL", name: "Israel" },
-		"hi": { code: "IN", name: "India" },
-		"hr": { code: "HR", name: "Croatia" },
-		"hsb": { code: "DE", name: "Germany" },
-		"hu": { code: "HU", name: "Hungary" },
-		"hy": { code: "AM", name: "Armenia" },
-		"id": { code: "ID", name: "Indonesia" },
-		"ig": { code: "NG", name: "Nigeria" },
-		"ii": { code: "CN", name: "China" },
-		"is": { code: "IS", name: "Iceland" },
-		"it": { code: "IT", name: "Italy" },
-		"ja": { code: "JP", name: "Japan" },
-		"jgo": { code: "CM", name: "Cameroon" },
-		"jmc": { code: "TZ", name: "Tanzania" },
-		"ka": { code: "GE", name: "Georgia" },
-		"kab": { code: "DZ", name: "Algeria" },
-		"kam": { code: "KE", name: "Kenya" },
-		"kde": { code: "TZ", name: "Tanzania" },
-		"kea": { code: "CV", name: "Cabo Verde" },
-		"khq": { code: "ML", name: "Mali" },
-		"ki": { code: "KE", name: "Kenya" },
-		"kk": { code: "KZ", name: "Kazakhstan" },
-		"kkj": { code: "CM", name: "Cameroon" },
-		"kl": { code: "GL", name: "Greenland" },
-		"kln": { code: "KE", name: "Kenya" },
-		"km": { code: "KH", name: "Cambodia" },
-		"kn": { code: "IN", name: "India" },
-		"ko": { code: "KP", name: "North Korea" },
-		"kok": { code: "IN", name: "India" },
-		"ks": { code: "IN", name: "India" },
-		"ksb": { code: "TZ", name: "Tanzania" },
-		"ksf": { code: "CM", name: "Cameroon" },
-		"ksh": { code: "DE", name: "Germany" },
-		"kw": { code: "GB", name: "United Kingdom" },
-		"ky": { code: "KG", name: "Kyrgyzstan" },
-		"lag": { code: "TZ", name: "Tanzania" },
-		"lb": { code: "LU", name: "Luxembourg" },
-		"lg": { code: "UG", name: "Uganda" },
-		"lkt": { code: "US", name: "United States" },
-		"ln": { code: "AO", name: "Angola" },
-		"lo": { code: "LA", name: "Laos" },
-		"lrc": { code: "IQ", name: "Iraq" },
-		"lt": { code: "LT", name: "Lithuania" },
-		"lu": { code: "CD", name: "Democratic Republic of the Congo" },
-		"luo": { code: "KE", name: "Kenya" },
-		"Luo": { code: "KE", name: "Kenya" },
-		"luy": { code: "KE", name: "Kenya" },
-		"lv": { code: "LV", name: "Latvia" },
-		"mas": { code: "KE", name: "Kenya" },
-		"mer": { code: "KE", name: "Kenya" },
-		"mfe": { code: "MU", name: "Mauritius" },
-		"mg": { code: "MG", name: "Madagascar" },
-		"mgh": { code: "MZ", name: "Mozambique" },
-		"mgo": { code: "CM", name: "Cameroon" },
-		"mk": { code: "MK", name: "North Macedonia" },
-		"ml": { code: "IN", name: "India" },
-		"mn": { code: "MN", name: "Mongolia" },
-		"mr": { code: "IN", name: "India" },
-		"ms": { code: "BN", name: "Brunei" },
-		"mt": { code: "MT", name: "Malta" },
-		"mua": { code: "CM", name: "Cameroon" },
-		"my": { code: "MM", name: "Myanmar" },
-		"mzn": { code: "IR", name: "Iran" },
-		"naq": { code: "NA", name: "Namibia" },
-		"nb": { code: "NO", name: "Norway" },
-		"nd": { code: "ZW", name: "Zimbabwe" },
-		"nds": { code: "DE", name: "Germany" },
-		"ne": { code: "IN", name: "India" },
-		"nl": { code: "NL", name: "Netherlands" },
-		"nmg": { code: "CM", name: "Cameroon" },
-		"nn": { code: "NO", name: "Norway" },
-		"nnh": { code: "CM", name: "Cameroon" },
-		"nus": { code: "SS", name: "South Sudan" },
-		"nyn": { code: "UG", name: "Uganda" },
-		"om": { code: "ET", name: "Ethiopia" },
-		"or": { code: "IN", name: "India" },
-		"os": { code: "GE", name: "Georgia" },
-		"pa": { code: "PK", name: "Pakistan" },
-		"pl": { code: "PL", name: "Poland" },
-		"ps": { code: "AF", name: "Afghanistan" },
-		"pt": { code: "PT", name: "Portugal" },
-		"qu": { code: "BO", name: "Bolivia" },
-		"rm": { code: "CH", name: "Switzerland" },
-		"rn": { code: "BI", name: "Burundi" },
-		"ro": { code: "RO", name: "Romania" },
-		"rof": { code: "TZ", name: "Tanzania" },
-		"ru": { code: "RU", name: "Russia" },
-		"rw": { code: "RW", name: "Rwanda" },
-		"rwk": { code: "TZ", name: "Tanzania" },
-		"sah": { code: "RU", name: "Russia" },
-		"saq": { code: "KE", name: "Kenya" },
-		"sbp": { code: "TZ", name: "Tanzania" },
-		"se": { code: "SE", name: "Sweden" },
-		"seh": { code: "MZ", name: "Mozambique" },
-		"ses": { code: "ML", name: "Mali" },
-		"sg": { code: "CF", name: "Central African Republic" },
-		"shi": { code: "TN", name: "Tunisia" },
-		"si": { code: "LK", name: "Sri Lanka" },
-		"sk": { code: "SK", name: "Slovakia" },
-		"sl": { code: "SI", name: "Slovenia" },
-		"smn": { code: "FI", name: "Finland" },
-		"sn": { code: "ZW", name: "Zimbabwe" },
-		"so": { code: "SO", name: "Somalia" },
-		"sq": { code: "AL", name: "Albania" },
-		"sr": { code: "RS", name: "Serbia" },
-		"sv": { code: "SE", name: "Sweden" },
-		"sw": { code: "CD", name: "Democratic Republic of the Congo" },
-		"ta": { code: "IN", name: "India" },
-		"te": { code: "IN", name: "India" },
-		"teo": { code: "KE", name: "Kenya" },
-		"tg": { code: "TJ", name: "Tajikistan" },
-		"th": { code: "TH", name: "Thailand" },
-		"ti": { code: "ER", name: "Eritrea" },
-		"to": { code: "TO", name: "Tonga" },
-		"tr": { code: "TR", name: "Turkey" },
-		"tt": { code: "RU", name: "Russia" },
-		"twq": { code: "NE", name: "Niger" },
-		"tzm": { code: "MA", name: "Morocco" },
-		"ug": { code: "CN", name: "China" },
-		"uk": { code: "UA", name: "Ukraine" },
-		"ur": { code: "IN", name: "India" },
-		"uz": { code: "UZ", name: "Uzbekistan" },
-		"vai": { code: "TN", name: "Tunisia" },
-		"Vai": { code: "TN", name: "Tunisia" },
-		"vi": { code: "VN", name: "Vietnam" },
-		"vun": { code: "TZ", name: "Tanzania" },
-		"wae": { code: "CH", name: "Switzerland" },
-		"wo": { code: "SN", name: "Senegal" },
-		"xog": { code: "UG", name: "Uganda" },
-		"yav": { code: "CM", name: "Cameroon" },
-		"yi": { code: "01", name: "Unknown" }, // Placeholder for unspecified region
-		"yo": { code: "BJ", name: "Benin" },
-		"yue": { code: "CN", name: "China" },
-		"zgh": { code: "MA", name: "Morocco" },
-		"zh": { code: "CN", name: "China" },
-		"zu": { code: "ZA", name: "South Africa" },
-	};
-
-
-		//async function getCountryName(countryCode) {
-			//try {
-				//const response = await fetch(`https://restcountries.com/v3.1/alpha/${countryCode}`);
-				//if (!response.ok) throw new Error('Country not found');
-				//const data = await response.json();
-				//// Return the name in the native language
-				//return data[0].name.common;
-			//} catch (error) {
-				//console.error(error);
-				//return 'Unknown Country';
-			//}
-		//}
-
-		function getCountryNameFromLanguage(language) {
-			return languageToCountryMap[language] ? languageToCountryMap[language].name : null;
-		}
-
-		function getCountryCodeFromLanguage(language) {
-			return languageToCountryMap[language] ? languageToCountryMap[language].code : null;
-		}
-
-		function getCountryNameFromCountryCode(countryCode) {
-			//alert(`Country code: ${countryCode}`);
-			for (const language in languageToCountryMap) {
-				if (languageToCountryMap.hasOwnProperty(language)) {
-					if (languageToCountryMap[language].code === countryCode) {
-						return languageToCountryMap[language].name;
-					}
-				}
-			}
-			return null; // Return null if country code not found
-		}
-
-		function getFlagEmoji(locale) {
-			// Split the locale to get the language and country code
-			const parts = locale.split('-');
-			let countryCode;
-
-			// Handle single subtag (language only) or double subtag (language-country)
-			if (parts.length === 1) {
-				countryCode = getCountryCodeFromLanguage(parts[0]);
-			} else if (parts.length === 2) {
-				countryCode = parts[1].toLowerCase(); // Use the country code
-			}
-
-			// If country code is not found, set a fallback output
-			if (!countryCode) {
-				const fallback = `? ${locale.toUpperCase()}`; // Just a question mark and the full locale
-				return { flag: fallback, isUnknown: true, countryName: 'Unknown Country' };
-			}
-
-			// Convert the country code to a flag emoji
-			return {
-				flag: String.fromCodePoint(...[...countryCode.toUpperCase()].map(char => 0x1F1E6 + char.charCodeAt(0) - 'A'.charCodeAt(0))),
-				isUnknown: false,
-				countryCode: countryCode
-			};
-		}
-
-function displayLocaleAndFlag() {
-    // Get the browser locale
-	const userLocale = navigator.languages && navigator.languages.length
-    ? navigator.languages[0]
-    : navigator.language;
-
-    //alert(`User Locale: ${userLocale}`); // Alert the detected locale
-	//console.log(navigator.languages); // Log language to console
-
-    const { flag, isUnknown, countryCode } = getFlagEmoji(userLocale);
-
-    //alert(`Country Code: ${countryCode}, Is Unknown: ${isUnknown}`); // Debug country code and unknown flag status
-
-    // Display the locale and the corresponding flag (or fallback)
-    //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();
-	});
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js
@@ -1,32 +0,0 @@
-$(document).ready(function() {
-    function toggleUPSClasses() {
-        var selectedOption = $('#Nutmode_select').val();
-        var upsModelValue = $('#UPS_Model_select').val().toLowerCase(); // Get the current value from UPS_Model
-        $('.masterups').toggle(selectedOption === 'netserver' || selectedOption === 'standalone'); // Show/Hide masterups based on Net Server or Standalone
-        $('.secondaryups').toggle(selectedOption === 'netserver' ); // Show/Hide Secondary logins for net server
-        $('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client
-        $('.generics').toggle(selectedOption !== 'netclient' && upsModelValue === 'genericups' );
-
-        // Enable/Disable inputs based on the selected option
-        $('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone')); 
-        $('.slaveups input').prop('disabled', selectedOption !== 'netclient'); 
-        $('.generics 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();
-});
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/qmailanalog.js
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/qmailanalog.js
@@ -1,25 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-    const analysisType = document.getElementById('analysis_type');
-    const messageIdGroup = document.getElementById('message_id_group');
-    const emailAddressGroup = document.getElementById('email_address_group');
-
-    // Initially hide both controls
-    messageIdGroup.style.display = 'none';
-    emailAddressGroup.style.display = 'none';
-
-    analysisType.addEventListener('change', function() {
-        // Hide both controls first
-        messageIdGroup.style.display = 'none';
-        emailAddressGroup.style.display = 'none';
-
-        // Show the relevant control based on the selected option
-        switch(this.value) {
-            case 'trace_message':
-                messageIdGroup.style.display = 'block';
-                break;
-            case 'user_activity':
-                emailAddressGroup.style.display = 'block';
-                break;
-        }
-    });
-});
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
@@ -96,7 +96,7 @@
        % my $btn = l('bac_UPDATE_CONF');
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
@@ -40,7 +40,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
@@ -65,7 +65,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep
@@ -259,7 +259,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep
@@ -58,7 +58,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep
@@ -44,7 +44,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep
@@ -67,7 +67,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep
@@ -65,7 +65,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep
@@ -38,7 +38,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep
@@ -70,7 +70,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep
@@ -40,7 +40,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep
@@ -93,7 +93,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep
@@ -81,7 +81,7 @@
    <form action="/smanager/bugreport" method="POST">
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
        <%= hidden_field 'trt' => $bugr_datas->{trt} %>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep
@@ -20,7 +20,7 @@
    <form action="/smanager/bugreportD" method="POST">
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
        <%= hidden_field 'trt' => $bugr_datas->{trt} %>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
@@ -59,7 +59,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
@@ -1,9 +1,16 @@
 <!-- common_css.html.ep -->
-%= stylesheet 'koozali/css/adminlte.koozali.css'
-%= stylesheet 'koozali/css/flag-icon.min.css'
-
-%#= stylesheet 'css/sme-jquery-overrides.css'

+<!-- Generic to AdminLTE -->
 %= stylesheet 'dist/css/adminlte.min.css'
 %= stylesheet 'dist/font/bootstrap-icons.min.css'
-%#= stylesheet 'dist/css/overlayscrollbars.min.css'
+
+
+<!-- Specific to Koozali from smanager/default -->
+%= stylesheet 'css/flag-icon.min.css'
+
+<!-- Specific Koozali AdminLTE overrides -->
+%= stylesheet 'koozali/css/adminlte.koozali.css'
+
+
+%#= stylesheet 'dist/css/overlayscrollbars.min.css'
+%#= stylesheet 'css/sme-jquery-overrides.css'
--- a/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep
@@ -1,11 +1,16 @@
 <!-- common_js.html.ep -->
-%= javascript 'dist/js/jquery.min.js'
-%= javascript 'dist/js/bootstrap.min.js'
-%= javascript 'dist/js/popper.min.js'
-%= javascript 'dist/js/adminlte.min.js'

-%= javascript 'koozali/js/datetime.js'
-%= javascript 'koozali/js/nutups.js'
-%= javascript 'koozali/js/flag-by-locale.js'
+<!-- Specific to AdminLTE -->
+%= javascript 'dist/js/adminlte.min.js'
+%= javascript 'dist/js/bootstrap.min.js'
+
+<!-- Generic JS -->
+%= javascript 'dist/js/jquery.min.js'
+%= javascript 'dist/js/popper.min.js'
+
+<!-- Specific to Koozali from smanager/default -->
+%= javascript 'js/flag-by-locale.js'
+
+<!-- Specific to Koozali AdminLTE -->
 %= javascript 'koozali/js/sme-password.js'

--- a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep
@@ -31,6 +31,19 @@
    <br>
    <%= $modul %>

+   <br><br>
+
+   <div div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= $c->l('dat_The_time_is_currently') %>
+        </div>
+        <br>
+        <div>
+            <%= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'col-md-2' , value => $dat_data->{currentdatetime} %>
+        </div>
+    </div>
+
+    <br>

    % if ($dat_data->{ntpstatus} eq 'disabled') {
        <div class='datetime-set-ntp'>
@@ -49,7 +62,7 @@
        %   [ $c->l('dat_manually_set'), 'dat_manually_set' ]
        % ];

-        <br><br>
+        <br>

        <h2><%= $c->l('Time Configuration') %></h2>

@@ -59,7 +72,7 @@
            <br>

            <div class="row g-3 align-items-center">
-                <div class="col-md-1">
+                <div class="col-md-2">
                    <%= label_for time_mode => $c->l('Time Setting Mode:') %>
                </div>
                <div class="col-auto">
@@ -68,9 +81,7 @@
                </div>
            </div>

-            <br>
-
-
+            <br><br>

            <div id='ntp_section'>
                <div>
@@ -80,13 +91,18 @@
                <br>

                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
+                    <div class="col-md-2">
                        <label for="inputNTPServerURL" class="col-form-label"><%=$c->l('dat_NTP_Server_URL') %></label>
                    </div>
                    <div class="col-auto">
                        % my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
                        % param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
                        <input type="text" name="ntpserver" id="inputNTPServerURL" class="form-control" aria-describedby="NTP Server URL" pattern="<%= $server_check %>" value="<%= $dat_data->{ntpserver} %>">
+
+                    </div>
+                    <div class="col-auto">
+                        <button type="button" id="test-ntp-btn" class="btn btn-primary btn-sm ml-2">Test Server</button>
+                        <span id="ntp-test-result" class="ntp-test-result ml-2"></span>
                    </div>
                </div>
            </div>
@@ -142,7 +158,7 @@

                </div>

-<br>
+                <br>

                <div class="row g-3 align-items-center">

@@ -155,7 +171,7 @@
                    </div>
                    <div class="col-auto">
                        % param 'hour' => ($dat_data->{hour}) unless param 'hour';
-                        %= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select"
+                        <%= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select" %>
                    </div>

                    <div class="col-auto">
@@ -163,7 +179,7 @@
                    </div>
                    <div class="col-auto">
                        % param 'minute' => ($dat_data->{minute}) unless param 'minute';
-                        %= select_field minute => ($minute_options, id => 'minute'), required => 'required', class=> "form-select", inputmode => 'numeric'
+                        <%= select_field minute => ($minute_options, id => 'minute'), required => 'required', class=> "form-select", inputmode => 'numeric' %>

                        %#= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
                    </div>
@@ -173,44 +189,41 @@
                    </div>
                    <div class="col-auto">
                        % param 'second' => ($dat_data->{second}) unless param 'second';
-                        %= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric'
+                        <%= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric' %>

                    </div>

                </div>


+                <br>

+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <%= l 'dat_TZ' %>
+                    </div>
+                    <div class="col-auto">
+                        % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
+                        <%= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select" %>
+                    </div>
+                </div>

-
+            </div>

            <br>

+            <%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %>
+            <%= hidden_field 'trt' => $dat_data->{trt}; %>
+
+            <% my $btn = l('SAVE'); %>
+
            <div class="row g-3 align-items-center">
-                <div class="col-md-1">
-                    <%= l 'dat_TZ' %>
-                </div>
-                <div class="col-auto">
-                    % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-                    <%= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select" %>
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
                </div>
            </div>

-        </div>
-
-        <br>
-
-        <%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %>
-        <%= hidden_field 'trt' => $dat_data->{trt}; %>
-
-        <% my $btn = l('SAVE'); %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-    </form>
+        </form>

    % }

--- a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
@@ -123,7 +123,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
@@ -1,95 +0,0 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailaccess";
-
-% content_for 'module' => begin
-
-<div class="card-body">
-
-    % if (config->{debug} == 1) {
-    <pre>
-        %= dumper $c->current_route
-        %= dumper $mai_datas
-    </pre>
-    % }
-
-    % if ( stash 'error' ) {
-        <br>
-        <div class="text-danger">
-            <%= $c->render_to_string(inline => stash 'error') %>
-        </div>
-    % }
-
-    <h1><%= $title%></h1>
-
-    <br>
-
-    <form action="/smanager/emailsettingd" method="POST">
-
-        <div>
-            <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
-            </div>
-            <div class="col-auto">
-                % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
-                <%= select_field 'POPAccess' => $c->get_pop_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div>
-            <%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
-            </div>
-            <div class="col-auto">
-                % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
-                <%= select_field 'IMAPAccess' => $c->get_imap_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_WEBMAIL' %>
-        <div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%=l 'mai_LABEL_WEBMAIL' %>
-            </div>
-            <div class="col-auto">
-                % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
-                <%= select_field 'WebMail' => $c->get_webmail_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % my $btn = l('SAVE');
-        <%= hidden_field 'trt' => 'ACC' %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-    </form>
-
-    <br>
-
-</div>
-%end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
@@ -1,151 +0,0 @@
-% layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
-
-% content_for 'module' => begin
-
-<div class="card-body">
-
-    % if (config->{debug} == 1) {
-        <pre>
-            <%= dumper $c->current_route %>
-            <%= dumper $mai_datas %>
-        </pre>
-    % }
-
-
-    % if ( stash 'error' ) {
-        <br>
-        <div class="text-danger">
-            <%= $c->render_to_string(inline => stash 'error') %>
-        </div>
-    % }
-
-    <h1><%= $title %></h1>
-
-    <br>
-
-    <form action="/smanager/emailsettingd" method="POST">
-
-        <h2><%= l 'mai_TITLE_UNKNOWN' %></h2>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_UNKNOWN' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_UNKNOWN' %>
-            </div>
-            <div class="col-auto">
-                % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
-                <%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <!--<hr class="" />-->
-        <h2><%= l 'mai_TITLE_DELEGATE' %></h2>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_DELEGATE' %>
-        </div>
-
-        <br>
-
-        % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="inputDelegateMailServer" class="col-form-label"><%= l 'mai_LABEL_DELEGATE' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="text" name="DelegateMailServer" id="inputDelegateMailServer" class="form-control" aria-describedby="DelegateMailServer" value="<%= $mai_datas->{delegatemailserver} %>">
-            </div>
-        </div>
-
-        <br>
-
-        <!--<hr class="" />-->
-        <h2><%= l 'mai_TITLE_SMARTHOST' %></h2>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_SMARTHOST' %>
-        </div>
-
-        <br>
-
-        % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="inputSMTPSmartHost" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="text" name="SMTPSmartHost" id="inputSMTPSmartHost" class="form-control" aria-describedby="SMTPSmartHost" value="<%= $mai_datas->{smtpsmarthost} %>">
-            </div>
-        </div>
-
-        <br>
-
-        % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' %>
-            </div>
-            <div class="col-auto">
-                <%= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="inputSMTPAuthproxy" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="text" name="SMTPAUTHPROXY_Userid" id="inputSMTPAuthproxy" class="form-control" aria-describedby="SMTPAuthproxy" value="<%= $mai_datas->{smtpauthproxyuserid} %>">
-            </div>
-        </div>
-
-        <br>
-
-       % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="password" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' %></label>
-            </div>
-           <div class="col-auto">
-                <input type="password" name="SMTPAUTHPROXY_Passwd" id="password" class="form-control" aria-describedby="SMTPAuthProxyPassword" value="<%= $mai_datas->{smtpauthproxypassword} %>">
-            </div>
-            <div class="col-auto">
-                <span id="togglePassword" class="bi bi-eye"></span>
-            </div>
-        </div>
-
-        <br>
-
-        % my $btn = l('SAVE');
-        <%= hidden_field 'trt' => 'DEL' %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-    </form>
-</div>
-%end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
@@ -1,175 +0,0 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailfilter";
-
-% content_for 'module' => begin
-
-<div class="card-body">
-
-    % if (config->{debug} == 1) {
-        <pre>
-            <%= dumper $c->current_route %>
-            <%= dumper $mai_datas %>
-        </pre>
-    % }
-
-    % if ( stash 'error' ) {
-        <br>
-        <div class="text-danger">
-            <%= $c->render_to_string(inline => stash 'error') %>
-        </div>
-    % }
-
-    <h1><%= $title%></h1>
-
-    <br>
-
-    <form action="/smanager/emailsettingd" method="POST">
-
-        <div>
-            <%= l 'mai_DESC_VIRUS_SCAN' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                    <%= l 'mai_LABEL_VIRUS_SCAN' %>
-            </div>
-            <div class="col-auto">
-                % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
-                <%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_SPAM_SCAN' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_SPAM_SCAN' %>
-            </div>
-            <div class="col-auto">
-                % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
-                <%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_SPAM_SENSITIVITY' %>
-            </div>
-            <div class="col-auto">
-                % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
-                <%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_SPAM_TAGLEVEL' %>
-            </div>
-            <div class="col-auto">
-                % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
-                <%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_SPAM_REJECTLEVEL' %>
-            </div>
-            <div class="col-auto">
-                % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
-                <%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_SORTSPAM' %>
-            </div>
-            <div class="col-auto">
-                % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
-                 <%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_SPAM_SUBJECT' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_SPAM_SUBJECTTAG' %>
-            </div>
-            <div class="col-auto">
-                % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
-                <%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <label for="inputSpamSubjectTag" class="col-form-label"><%= l 'mai_LABEL_SPAM_SUBJECT' %></label>
-            </div>
-            <div class="col-auto">
-                <!-- text_field 'Soft' -->
-                <input type="text" name="SpamSubject" id="inputSpamSubjectTag" class="form-control" aria-describedby="SpamSubjectTag" value="<%= $mai_datas->{spamsubject} %>">
-            </div>
-        </div>
-
-
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' %>
-        </div>
-
-        <br>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <%= l 'mai_LABEL_CONTENT_TO_BLOCK' %>
-            </div>
-            <div class="col-auto">
-                % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
-                <%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "form-select", multiple => "1" %>
-            </div>
-        </div>
-
-        <br>
-
-        % my $btn = l('SAVE');
-        <%= hidden_field 'trt' => 'FIL'  %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-    </form>
-
-</div>
-%end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
@@ -1,286 +0,0 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailreceive";
-
-% content_for 'module' => begin
-
-% use constant FALSE => 0;
-% use constant TRUE  => 1;
-
-<div class="card-body">
-
-    % if (config->{debug} == 1) {
-        <pre>
-            <<%=  dumper $c->current_route %>
-            <<%=  dumper $mai_datas %>
-            <<%=  dumper $c->param('SMTPAuth') %>
-        </pre>
-    % }
-
-    % if ( stash 'error' ) {
-        <br>
-        <div class="text-danger">
-            <<%=  $c->render_to_string(inline => stash 'error') %>
-        </div>
-    % }
-
-    <h1><%=  $title %></h1>
-
-    <br>
-
-    <form action="/smanager/emailsettingd" method="POST">
-
-        <div>
-            <%= l 'mai_DESC_MODE' %>
-        </div>
-
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_MODE' %>
-            </div>
-            <div class="col-auto">
-                % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
-                <!--
-                <pre>
-                    <%=  dumper $mai_datas->{fetchmailmethod}  %>
-                    <%=  dumper $c->get_retrieval_opt()  %>
-                    <%=  param 'FetchmailMethod'  %>
-                </pre>
-                -->
-                <%=  select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class =>"form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-
-        <div>
-            <div>
-                <b><i>Note - this first line was disabled?</b></i>
-
-                <br>
-                <%= l 'mai_DESC_SMTP_AUTH_CONTROL'  %>
-                <br>
-                <b><i>/end</b></i>
-            </div>
-
-            <br>
-
-            <div>
-                <%=  l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client." %>
-            </div>
-
-            <br>
-
-            <div>
-
-                <%=  l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %>
-            </div>
-
-            <br>
-
-            <div>
-                <%=  l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." %>
-            </div>
-
-        </div>
-
-        <br>
-
-
-
-        % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-        % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%=  sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
-            </div>
-            <div class="col-auto">
-
-                <!--
-                <pre>
-                    <%=  dumper $c->get_smtp_auth_opt() %>
-                    <%=  dumper $c->get_current_smtp_auth(FALSE) %>
-                    <%=  dumper $c->get_db_prop("qpsmtpd","Authentication") %>
-                    <%=  param 'SMTPAuth'  %>
-                </pre>
-                -->
-                <%=  select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-        % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%=  sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
-            </div>
-            <div class="col-auto">
-                <%=  select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % my $smtp_mesg=l('Submission port %u status:');
-        % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%=  sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
-            </div>
-            <div class="col-auto">
-                <!--
-                <pre>
-                    <%=  dumper $c->get_smtp_ssl_auth_opt() %>
-                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) %>
-                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) %>
-                    <%=  dumper $c->get_db_prop("uqpsmtpd","access") %>
-                    <%=  param 'uSMTPAuth' %>
-                </pre>
-                -->
-                <%=  select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        <h2><%= l 'mai_TITLE_SECONDARY' %></h2>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_SECONDARY' %>
-        </div>
-
-        <br>
-
-        % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="inputSecondaryMailServer" class="col-form-label"><%= l 'mai_LABEL_SECONDARY' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="text" name="SecondaryMailServer" id="inputSecondaryMailServer" class="form-control" aria-describedby="SecondaryMailServer" value="<%= $mai_datas->{secondarymailserver} %>">
-            </div>
-        </div>
-
-        <br>
-
-        <div>
-            <%= l 'mai_DESC_FETCH_PERIOD' %>
-        </div>
-
-        % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_FETCH_PERIOD' %>
-            </div>
-            <div class="col-auto">
-                <%=  select_field 'FreqOffice' => $c->fetchmail_freq(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_FETCH_PERIOD_NIGHTS' %>
-            </div>
-            <div class="col-auto">
-                <%=  select_field 'FreqOutside' => $c->fetchmail_freq(), class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' %>
-            </div>
-            <div class="col-auto">
-                <%=  select_field 'FreqWeekend' => $c->fetchmail_freq(), class => "form-select" %>
-             </div>
-        </div>
-
-        <br>
-
-        % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="inputSecondaryMailAccount" class="col-form-label"><%= l 'mai_LABEL_POP_ACCOUNT' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="text" name="SecondaryMailAccount" id="inputSecondaryMailAccount" class="form-control" aria-describedby="SecondaryMailAccount" value="<%= $mai_datas->{secondarymailaccount} %>">
-            </div>
-        </div>
-
-        <br>
-
-        % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="password" class="col-form-label"><%= l 'mai_LABEL_POP_PASS' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="password" name="SecondaryMailPassword" id="password" class="form-control" aria-describedby="SecondaryMailPassword" value="<%= $mai_datas->{secondarymailpassword} %>">
-            </div>
-            <div class="col-auto">
-                <span id="togglePassword" class="bi bi-eye"></span>
-            </div>
-        </div>
-
-
-        <br>
-
-        % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_SORT_METHOD' %>
-            </div>
-            <div class="col-auto">
-                <%=  select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => "form-select" %>
-            </div>
-        </div>
-
-        <br>
-
-        % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <label for="inputSecondaryMailEnvelope" class="col-form-label"><%= l 'mai_LABEL_SORT_HEADER' %></label>
-            </div>
-            <div class="col-auto">
-                <input type="text" name="SecondaryMailEnvelope" id="inputSecondaryEnvelope" class="form-control" aria-describedby="SecondaryMailEnvelope" value="<%= $mai_datas->{secondarymailenvelope} %>">
-            </div>
-        </div>
-
-        <br>
-
-        % my $btn = l('SAVE');
-        <%=  hidden_field 'trt' => 'REC' %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-    </form>
-
-</div>
-%end
-
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
@@ -1,4 +1,4 @@
-% layout 'AdminLTE', title => "Sme server 2 - emailsettings";
+% layout 'AdminLTE', title => "Sme server 2 - E-Mail";

 % content_for 'module' => begin

@@ -12,7 +12,7 @@
    % if (config->{debug} == 1) {
        <pre>
            <%= dumper $c->current_route %>
-            <= dumper $mai_datas %>
+            <%= dumper $mai_data->{trt} %>
        </pre>
    % }

@@ -27,202 +27,31 @@

    <br>

-    <form action="/smanager/emailsettings" method="POST">
+    %#Routing to partials according to trt parameter.
+    %#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'

-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_POP_ACCESS_CONTROL' %>
-            </div>
-            <div class="col-auto">
-            <%= $c->get_current_pop3_access( TRUE ) %>
-            </div>
-        </div>
+    % if ($mai_data->{trt} eq "FRONT") {
+        <%= include 'partials/_mai_FRONT' %>
+    % }

-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_imap_access( TRUE ) %>
-            </div>
-        </div>
+    % if ($mai_data->{trt} eq "ACC") {
+        <%= include 'partials/_mai_ACC' %>
+    % }

-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <%= l 'mai_LABEL_WEBMAIL' %>
-            </div>
-            <div class="col-auto">
-                <%= $c->get_current_webmail_status( TRUE ) %>
-            </div>
-        </div>
+    % if ($mai_data->{trt} eq "FIL") {
+        <%= include 'partials/_mai_FIL' %>
+    % }

-        <br>
+    % if ($mai_data->{trt} eq "REC") {
+        <%= include 'partials/_mai_REC' %>
+    % }

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


-        % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
-        <%= hidden_field 'trt' => 'DEL' %>

-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-        <br>
-
-    </form>
 </div>

 %end
--- a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
@@ -19,21 +19,36 @@
    %= content_for 'head_contrib'
    %= content_for 'refresh'

+    <!-- Specific for AdminLTE -->
    %= include 'common_js'
    %= include 'common_css'

+    <!-- should move the JS in here to a proper file if required -->
+    %# if (config 'hasJquery') {
+        %#= include 'partials/_js_imports'
+    %# }
+
    <!-- Custom overrides js/css? -->
    <!-- This needs refining - do contribs add in their own stuff?? -->
    <!-- This needs refining -->

-    % if (config 'hasJquery') {
-        %= include 'partials/_js_imports'

+    <!-- the sections below should add the correct JS/CSS per panel -->
+    %# if ($c->current_route eq 'nutups') {
+        %#= include 'partials/_nutups_overrides'
+    %# }
+
+    %# panel specific css file
+    % my $controller = stash('controller');
+    % if ($controller) {
+        % my $css_path = "css/$controller.css";
+        %# Use the url_for helper to generate the correct static file URL
+        % if (app->static->file($css_path)) {
+          <link rel="stylesheet" href="<%= url_for("/$css_path") %>">
+        % }
    % }

-    % if ($c->current_route eq 'nutups') {
-        %= include 'partials/_nutups_overrides'
-    % }
+

 </head>

@@ -208,6 +223,16 @@

 <div id="adminlte-version"></div>

+%# Specific panel js code
+% $controller = stash('controller');
+% if ($controller) {
+    % my $js_path  = "js/$controller.js";
+    %# Use the url_for helper to generate the correct static file URL
+    % if (app->static->file($js_path)) {
+      <script src="<%= url_for("/$js_path") %>"></script>
+    % }
+% }
+
 </body>

 </html>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep
@@ -89,7 +89,7 @@
              <!-- /.col -->
              <div class="col-4">
                <div class="d-grid gap-2">
-                  <button type="submit" class="btn btn-primary">Login</button>
+                  <button type="submit" class="btn btn-primary btn-sm">Login</button>
                </div>
              </div>
              <!-- /.col -->
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep
@@ -26,7 +26,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep
@@ -7,7 +7,7 @@
        <br>
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
            </div>
        </div>
        <%= hidden_field 'trt' => 'ADD' %>
@@ -47,7 +47,7 @@
                    % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
                    % my $actionModify = qq{
                    % <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
-                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                    %       $modify_text
                    %   </button>
                    % </a>
@@ -60,7 +60,7 @@
                            % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
                            % $actionRemove = qq{
                                % <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                %       $remove_text
                                %   </button>
                                % </a>
@@ -112,7 +112,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-auto">
-                <button type="submit" class="btn btn-primary"><%= $btn2 %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn2 %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
@@ -36,7 +36,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
        <%= hidden_field 'trt' => $dom_datas->{trt} %>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
@@ -78,7 +78,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
        <%= hidden_field 'trt' => $dom_datas->{trt} %>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep
@@ -70,7 +70,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
@@ -59,7 +59,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
@@ -6,7 +6,7 @@
        <br>
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
            </div>
        </div>
        <%= hidden_field 'trt' => 'ADD' %>
@@ -39,7 +39,7 @@
                            % my $modify_text = l('MODIFY');  # Localized text
                            % my $actionModify = qq{
                                % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
-                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                                %       $modify_text
                                %   </button>
                                % </a>
@@ -48,7 +48,7 @@
                            % my $remove_text = l('REMOVE');  # Localized text
                            % my $actionRemove = qq{
                                % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                %       $remove_text
                                %   </button>
                                % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep
@@ -79,7 +79,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep
@@ -22,7 +22,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
@@ -5,7 +5,7 @@
    <form action="/smanager/hostentriesd" method="POST">
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
        <%= hidden_field 'trt' => $hos_datas->{trt} %>
@@ -47,7 +47,7 @@
                            %my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
                            %$actionModify = qq{
                                % <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
-                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                                %     $modify_text
                                %   </button>
                                % </a>
@@ -57,7 +57,7 @@
                            %#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
                            %$actionRemove = qq{
                                % <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                %     $remove_text
                                %   </button>
                                % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep
@@ -53,7 +53,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep
@@ -77,7 +77,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep
@@ -21,7 +21,7 @@
    
       <div class="row g-3 align-items-center">
           <div class="col-md-2">
-               <button type="submit" class="btn btn-primary"><%= $btn %></button>
+               <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
           </div>
       </div>
    
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep
@@ -20,7 +20,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
@@ -7,7 +7,7 @@
        <br>
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
            </div>
        </div>
        <%= hidden_field 'trt' => 'ADD'; %>
@@ -60,7 +60,7 @@
                             %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                             %$actionModify = qq{
                             % <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
-                             %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                             %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                             % $modify_text
                             %   </button>
                             % </a>
@@ -74,7 +74,7 @@
                             %if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
                                 %$actionResetPw = qq{
                                 % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                                 %   <button type='button' class="btn btn-danger" title="$password_text - currently unset" >
+                                 %   <button type='button' class="btn btn-danger btn-sm" title="$password_text - currently unset" >
                                 %       $password_text
                                 %   </button>
                                 % </a>
@@ -82,7 +82,7 @@
                             % } else {
                                 %$actionResetPw = qq{
                                 % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
-                                 %   <button type='button' class="btn btn-primary" title='$password_text' >
+                                 %   <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
                                 %       $password_text
                                 %   </button>
                                 % </a>
@@ -97,7 +97,7 @@
                             %my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
                             %$actionRemove = qq{
                             % <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
-                             %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                             %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                             %       $remove_text
                             %   </button>
                             % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_pwd.html.ep
@@ -49,7 +49,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_upd.html.ep
@@ -107,7 +107,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep
@@ -53,7 +53,7 @@
            $('#menuadm').toggle({ duration: 300 });
        });

-        
+
        $('.section-title').click(function() {
            var $section = $(this).parent().next('div');
            if(!$section.length){
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep
@@ -56,7 +56,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+                <a href='letsencryptd' class="btn btn-primary btn-sm btn-sm" role="button"><%= $back_text %></a>

            </div>
        </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep
@@ -67,7 +67,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+                <a href='letsencryptd' class="btn btn-primary btn-sm btn-sm" role="button"><%= $back_text %></a>

            </div>
        </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep
@@ -144,7 +144,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep
@@ -87,7 +87,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep
@@ -76,7 +76,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
@@ -39,7 +39,7 @@

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

@@ -78,7 +78,7 @@
                                    %my $csrf_token = "TOKEN";  # CSRF token for security
                                    %$actionRemove = qq{
                                    % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
-                                    %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                    %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                    %       $remove_text
                                    %   </button>
                                    % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_login.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_login.html.ep
@@ -38,7 +38,7 @@
              <!-- /.col -->
              <div class="col-4">
                <div class="d-grid gap-2">
-                  <button type="submit" class="btn btn-primary">Sign In</button>
+                  <button type="submit" class="btn btn-primary btn-sm">Sign In</button>
                </div>
              </div>
              <!-- /.col -->
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep
@@ -195,7 +195,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
@@ -114,7 +114,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep
@@ -90,7 +90,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
@@ -40,7 +40,7 @@

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

@@ -92,7 +92,7 @@
                                % my $csrf_token = "TOKEN";  # CSRF token for security
                                % my $actionRemove = qq{
                                % <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
-                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                                %       $remove_text
                                %   </button>
                                % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep
@@ -53,7 +53,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep
@@ -30,7 +30,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep
@@ -9,7 +9,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-1">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
@@ -54,7 +54,7 @@
                            % my $printer_name = $printer->key;
                            % my $actionRemove = qq{
                            % <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
-                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                            %   $remove_text
                            %   </button>
                            % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
@@ -37,7 +37,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep
@@ -14,7 +14,7 @@
        <br><br>
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-danger"><%= $btn %></button>
+                <button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
@@ -6,7 +6,7 @@
        <%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
        <%= hidden_field 'trt' => 'ADD' %>
@@ -53,7 +53,7 @@
                            %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                            %$actionModify = qq{
                            % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
-                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                            %   $modify_text
                            %   </button>
                            % </a>
@@ -66,7 +66,7 @@
                            %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
                            %$actionRemove = qq{
                            % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
-                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                            %   $remove_text
                            %   </button>
                            % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_upd.html.ep
@@ -62,7 +62,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
@@ -71,7 +71,7 @@
                    % my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
                    % my $actionModify = qq{
                    % <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
-                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                    %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                    %       $modify_text
                    %   </button>
                    % </a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_upd.html.ep
@@ -85,7 +85,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_swt_theme.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_swt_theme.html.ep
@@ -31,7 +31,7 @@
      </div>

      <div class="col-auto">
-        <button type="submit" class="btn btn-primary">Theme</button>
+        <button type="submit" class="btn btn-primary btn-sm">Theme</button>
      </div>
  </div>
 </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
@@ -40,7 +40,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
@@ -5,7 +5,7 @@
    <form action="/smanager/useraccounts" method="POST">
        <br>
        <div>
-            <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+            <button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
        </div>
    </form>

@@ -63,14 +63,14 @@
                    % if ($useraccounts_user_name eq 'admin')  {
                        %$actionModify = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$modify_text'>
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text'>
                            %       $modify_text
                            %   </button>
                            %</a>
                        %};
                        %$actionResetPw = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$password_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
                            %       $password_text
                            %   </button>
                            %</a>
@@ -78,7 +78,7 @@
                    % } else {
                        %$actionModify = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
                            %       $modify_text
                            %   </button>
                            %</a>
@@ -93,14 +93,14 @@
                       <!-- Sets BOTH columns - possibly leave out Reset Password here?-->
                       %$actionLock = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                                %   <button type='button' class="btn btn-danger" title="$password_text - currently unset">
+                                %   <button type='button' class="btn btn-danger btn-sm" title="$password_text - currently unset">
                                %       Unlock
                                %   </button>
                            %</a>
                            %};
                       %$actionResetPw = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                                %   <button type='button' class="btn btn-primary" title="$password_text - currently unset">
+                                %   <button type='button' class="btn btn-primary btn-sm" title="$password_text - currently unset">
                                %       $password_text
                                %   </button>
                            %</a>
@@ -109,14 +109,14 @@
                    % } elsif ($useraccounts_user_name ne 'admin') {
                        %$actionLock = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
-                                %   <button type='button' class="btn btn-primary" title='$lock_text' >
+                                %   <button type='button' class="btn btn-primary btn-sm" title='$lock_text' >
                                %       $lock_text
                                %   </button>
                            %</a>
                            %};
                        %$actionResetPw = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$password_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
                            %       $password_text
                            %   </button>
                            %</a>
@@ -126,7 +126,7 @@
                    % if ( $removable eq 'yes' )  {
                        %$actionRemove = qq{
                            %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
-                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
                            %       $remove_text
                            %   </button>
                            %</a>
@@ -136,7 +136,7 @@
                    <!-- If webmail disabled??? -->
                    % $actionroundcube = qq{
                        %<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
-                         %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
+                         %   <button type='button' class="btn btn-primary btn-sm" title='$roundcube_text' >
                        %       $roundcube_text
                        %   </button>
                        %</a>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
@@ -42,7 +42,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
@@ -75,7 +75,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
@@ -64,7 +64,7 @@
    
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
@@ -279,7 +279,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep
@@ -105,7 +105,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= l 'SAVE' %></button>
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
@@ -66,7 +66,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep
@@ -2,10 +2,6 @@

 % content_for 'module' => begin

-<!-- should be moved -->
-
-%= javascript '/js/qmailanalog.js'
-
 <div class="card-body">

    % if (config->{debug} == 1) {
@@ -60,7 +56,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
@@ -40,7 +40,7 @@

        <div class="row g-3 align-items-center">
            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                <button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
            </div>
        </div>
    </form>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
@@ -277,7 +277,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
@@ -59,7 +59,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep
@@ -106,7 +106,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep
@@ -101,7 +101,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep
@@ -25,7 +25,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
@@ -92,7 +92,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep
@@ -44,7 +44,7 @@
            <%= hidden_field 'trt' => 'UPDT' %>
            <div class="row g-3 align-items-center">
                <div class="col-md-2">
-                    <button type="submit" class="btn btn-sm btn-primary"><%= $btnInUp %></button>
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btnInUp %></button>
                </div>
            </div>
        </form>
@@ -57,7 +57,7 @@
            <%= hidden_field 'trt' => 'INST' %>
            <div class="row g-3 align-items-center">
                <div class="col-md-2">
-                    <button type="submit" class="btn btn-sm btn-primary"><%= $btnInAv %></button>
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btnInAv %></button>
                </div>
            </div>
        </form>
@@ -70,7 +70,7 @@
            <%= hidden_field 'trt' => 'REMO' %>
            <div class="row g-3 align-items-center">
                <div class="col-md-2">
-                    <button type="submit" class="btn btn-sm btn-primary"><%= $btnInRm %></button>
+                    <button type="submit" class="btn btn-primary btn-sm"><%= $btnInRm %></button>
                </div>
            </div>

@@ -135,7 +135,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep
@@ -149,7 +149,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep
@@ -72,7 +72,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep
@@ -74,7 +74,7 @@

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

--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep
@@ -45,7 +45,7 @@

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

--- a/smeserver-manager-AdminLTE.spec
+++ b/smeserver-manager-AdminLTE.spec
@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 42
+%define release 43

 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
@@ -17,7 +17,7 @@ BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: smeserver-devtools
 Requires: smeserver-release >= 11.0
-Requires: smeserver-manager >= 11.0.0-91
+Requires: smeserver-manager >= 11.0.0-101
 Requires: smeserver-lib >= 11.0.0-13
 Requires: e-smith-manager >= 2.4.0-22

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

 %changelog
+* Sun Jul 06 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-43.sme
+- Make buttons smaller
+- Fix mail_data instances
+- Update email templates
+- Lots of tweaks including reduced button sizes
+- refactor CSS and JS files
+
 * Thu Jun 26 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-42.sme
 - Finish Software updater