Directory done. Odd fixes elsewhere

.gitignore

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
     % if ( stash 'error' ) {
         <br><div class="">
         %= $c->render_to_string(inline => stash 'error') 
-    </div>
+        </div>
     %}
 
     <h1><%= $title%></h1>

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

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

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

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

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

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

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

@@ -1,6 +1,9 @@
-<!-- Include files across the whole site -->
-%= javascript 'js/jquery.min.js'
+<!-- common_js.html.ep -->
+%= javascript 'dist/js/jquery.min.js'
+%= javascript 'dist/js/bootstrap.min.js'
+%= javascript 'dist/js/popper.min.js'
 %= javascript 'dist/js/adminlte.min.js'
 
-%= javascript '/js/flag-by-locale.js'
-%= javascript '/js/sme-password.js'
+%= javascript 'koozali/js/flag-by-locale.js'
+%= javascript 'koozali/js/sme-password.js'
+

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

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

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

@@ -5,29 +5,30 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $dom_datas
-    </p>
+    <div>
+        %= dumper $c->current_route
+        %= dumper $dom_datas
+    </div>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error')  %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
     % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') {
-    %= include 'partials/_dom_upd'
-    %} elsif ($dom_datas->{trt} eq 'DEL') {
+        %= include 'partials/_dom_upd'
+    % } elsif ($dom_datas->{trt} eq 'DEL') {
         %= include 'partials/_dom_del'
-    %} elsif ($dom_datas->{trt} eq 'UP2') {
+    % } elsif ($dom_datas->{trt} eq 'UP2') {
         %= include 'partials/_dom_up2'
-    %} else {
+    % } else {
         %= include 'partials/_dom_list'
-    %}
+    % }
 
 </div>
 %end

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

@@ -5,63 +5,72 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+    <div>
+        %= dumper $c->current_route
+        %= dumper $mai_datas
+    </div>
     % }
     
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <form action="/smanager/emailsettingd" method="POST">
+    %#= form_for '/emailsettingd' => (method => 'POST') => begin
 
-    %=l 'mai_DESC_POP_ACCESS_CONTROL'
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_ACCESS_CONTROL'
-    </span>
-    <span class="">
-    % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
-    %= select_field 'POPAccess' => $c->get_pop_opt(), class => ""
-    </span>
-    </p>
-
-    %=l 'mai_DESC_IMAP_ACCESS_CONTROL'
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-    </span>
-    <span class="">
-    % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
-    %= select_field 'IMAPAccess' => $c->get_imap_opt(), class => ""
-    </span>
-    </p>
-
-    %=l 'mai_DESC_WEBMAIL'
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_WEBMAIL'
-    </span>
-    <span class="">
-    % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
-    %= select_field 'WebMail' => $c->get_webmail_opt(), class => ""
-    </span>
-    </p>
-
-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
-
-    %= hidden_field 'trt' => 'ACC'
-    % end    
+        <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
+    
+        <div>
+            <%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+        </div>
+        
+        <div>
+            % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
+            <%= select_field 'POPAccess' => $c->get_pop_opt() %>
+        </div>
+    
+        <div>
+            <%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
+        </div>
+        
+        <div>
+            <%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+        </div>
+        
+        <div>
+            % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
+            <%= select_field 'IMAPAccess' => $c->get_imap_opt() %>
+        </div>
+    
+        <div>
+            <%= l 'mai_DESC_WEBMAIL' %>
+        <div>
+    
+        <div>
+            <%=l 'mai_LABEL_WEBMAIL' %>
+        </div>
+    
+        <div>
+            % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
+            <%= select_field 'WebMail' => $c->get_webmail_opt() %>
+        </div>
+    
+        % 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>
+        %= hidden_field 'trt' => 'ACC'
 
+    %# end    
+    </form>
+    
 </div>
 %end

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

@@ -5,29 +5,31 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $grp_datas
-    </p>
+    <div>
+        %= dumper $c->current_route
+        %= dumper $grp_datas
+    </div>
     % }
 
+<!-- reetp error here -->
+
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
-    
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
+
     <h1><%= $title%></h1>
 
     % if ($grp_datas->{trt} eq 'ADD') {
-    %= include 'partials/_grp_add'
-    %} elsif ($grp_datas->{trt} eq 'DEL') {
+        %= include 'partials/_grp_add'
+    % } elsif ($grp_datas->{trt} eq 'DEL') {
         %= include 'partials/_grp_del'
-    %} elsif ($grp_datas->{trt} eq 'UPD') {
+    % } elsif ($grp_datas->{trt} eq 'UPD') {
         %= include 'partials/_grp_upd'
-        %} else {
+    % } else {
         %= include 'partials/_grp_list'
-        %}
+    % }
 
 </div>
 %end

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

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

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

@@ -5,22 +5,23 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $iba_datas
-    </p>
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $iba_datas %>
+    </div>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+            <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
     % if ( stash 'modul' ) {
-    %= $c->render_to_string(inline => stash 'modul' );
+        %= $c->render_to_string(inline => stash 'modul' );
     % }
 
     % if ($iba_datas->{trt} eq 'ADD') {

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

@@ -1,39 +1,43 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!-- default +jquery -->
 <!-- https://icons.getbootstrap.com/ -->
 
+<!-- Nice mojo links -->
+<!-- https://en.mojolicious.perlzemi.com/blog/20140414139745.html -->
+<!-- https://en.mojolicious.perlzemi.com/blog/20110616130993.html -->
+
 <head>
     <title>
         <%= $title %>
     </title>
     <link rel="made" href="mailto:bugs%40koozali.org">
+    <link rel="icon" type="image/x-icon" href="koozali/assets/img/favicon.ico">
     <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     %= content_for 'head_contrib'
-    % if (config 'hasJquery') {
-        %= include 'partials/_js_imports'
-        %= include 'common_js'
-    % }
-
     %= content_for 'refresh'
 
+    %= include 'common_js'
     %= include 'common_css'
+  
+    <!-- Custom overrides js/css? -->
+    <!-- This needs refining - do contribs add in their own stuff?? -->
+    <!-- This needs refining -->
 
+    % if (config 'hasJquery') {
+        %= include 'partials/_js_imports'
 
-<!-- Custom overrides? -->
-
-% if ($c->current_route eq 'nutups') {
-    %= include 'partials/_nutups_overrides'
-% }
-
-
+    % }
 
+    % if ($c->current_route eq 'nutups') {
+        %= include 'partials/_nutups_overrides'
+    % }
 
 </head>
 
-<body class="sidebar-expand-lg bg-body-tertiary">
+<body class="sidebar-expand-lg bg-body-tertiary app-loaded">
 
 
 <!-- This is set from the data at the top of the _partials -->
@@ -110,7 +114,7 @@
                 <!--end::Sidebar Brand-->
     
                 <!--begin::Sidebar Wrapper-->
-                <div class="sidebar-wrapper">
+                <div class="sidebar-wrapper navbar-nav-scroll">
                     <nav class="mt-2">
                         <!--begin::Sidebar Menu-->
                         <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
@@ -157,7 +161,7 @@
     
                         <!--end::Rows-->
     
-                        <br>
+                        <!-- <br> -->
     
                         <!-- This is the main page content depening on the calling module -->
                         <!-- nameofpanel.html.ep -->
@@ -167,6 +171,7 @@
                             %= include 'partials/_panel_card_top'
                             %= include 'partials/_panel_card_header'
                         % }
+                        
                         %= content 'module'
 
                         % if ($c->current_route ne 'login') {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,13 +15,13 @@
     const password = document.querySelector('#id_password');
 
     if (( togglePassword ) && ( password )) {
-	togglePassword.addEventListener('click', function (e) {
-	    // toggle the type attribute
-	    const type = password.getAttribute('type') === 'password' ? 'text' : 'password';
-	    password.setAttribute('type', type);
-	    // toggle the eye slash icon
-	    // this.classList.toggle('eye-slash');
-	})
+    togglePassword.addEventListener('click', function (e) {
+        // toggle the type attribute
+        const type = password.getAttribute('type') === 'password' ? 'text' : 'password';
+        password.setAttribute('type', type);
+        // toggle the eye slash icon
+        // this.classList.toggle('eye-slash');
+    })
     }
   });
 
@@ -36,34 +36,34 @@
   %= javascript begin
 
     $(document).ready(function() {
-		$('#tognav').click(function() {
-			//alert('click1:'+window.localStorage.getItem('menunav'));
-			window.localStorage.setItem('menunav',!$('#menunav').is(':visible'));
-			//alert('click2:'+window.localStorage.getItem('menunav'));
-			$('#menunav').toggle({ duration: 300 });
-		});
+        $('#tognav').click(function() {
+            //alert('click1:'+window.localStorage.getItem('menunav'));
+            window.localStorage.setItem('menunav',!$('#menunav').is(':visible'));
+            //alert('click2:'+window.localStorage.getItem('menunav'));
+            $('#menunav').toggle({ duration: 300 });
+        });
 
-		$('#toguser').click(function() {
-			window.localStorage.setItem('menuuser',!$('#menuuser').is(':visible'));
-			$('#menuuser').toggle({ duration: 300 });
-		});
+        $('#toguser').click(function() {
+            window.localStorage.setItem('menuuser',!$('#menuuser').is(':visible'));
+            $('#menuuser').toggle({ duration: 300 });
+        });
 
-		$('#togadm').click(function() {
-			window.localStorage.setItem('menuadm',!$('#menuadm').is(':visible'));
-			$('#menuadm').toggle({ duration: 300 });
-		});
+        $('#togadm').click(function() {
+            window.localStorage.setItem('menuadm',!$('#menuadm').is(':visible'));
+            $('#menuadm').toggle({ duration: 300 });
+        });
 
-		
-		$('.section-title').click(function() {
-			var $section = $(this).parent().next('div');
-			if(!$section.length){
-				return false;
-			}
-			let localStorageTag = "admSection-"+this.innerHTML;
-			var jqObj = $($section);
-			window.localStorage.setItem(localStorageTag,!jqObj.is(':visible'));
-			$section.toggle({ duration: 600 });
-		})
+        
+        $('.section-title').click(function() {
+            var $section = $(this).parent().next('div');
+            if(!$section.length){
+                return false;
+            }
+            let localStorageTag = "admSection-"+this.innerHTML;
+            var jqObj = $($section);
+            window.localStorage.setItem(localStorageTag,!jqObj.is(':visible'));
+            $section.toggle({ duration: 600 });
+        })
     });
 
   % end
@@ -73,36 +73,36 @@
 
 % content_for 'js_swapClass' => begin
   %= javascript begin
-	(function($) {
-	    $.fn.swapClass = function(class1, class2) {
-		this.each(function() {
-		    var $elem = $(this);
-		    if ($elem.hasClass(class1)) {
-			$elem.removeClass(class1).addClass(class2);
-		    }
-		    else if ($elem.hasClass(class2)) {
-			$elem.removeClass(class2).addClass(class1);
-		    }
-		});
-	    };
-	})(jQuery);
+    (function($) {
+        $.fn.swapClass = function(class1, class2) {
+        this.each(function() {
+            var $elem = $(this);
+            if ($elem.hasClass(class1)) {
+            $elem.removeClass(class1).addClass(class2);
+            }
+            else if ($elem.hasClass(class2)) {
+            $elem.removeClass(class2).addClass(class1);
+            }
+        });
+        };
+    })(jQuery);
 
     $(document).ready(function() {
-	$('a.item-current').swapClass('item-current','item');
+    $('a.item-current').swapClass('item-current','item');
 
-	var pathname = $(location).attr('pathname');
+    var pathname = $(location).attr('pathname');
 
-	//alert('jQuery loaded. Path searched: ' + pathname);
+    //alert('jQuery loaded. Path searched: ' + pathname);
 
-	var menus = $('a.item');
-	$.each(menus, function() {
-	    if ( $(this).attr('href') == pathname ) {
-		$(this).swapClass('item', 'item-current');
-	//	alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class'));
-	    }
-	})
+    var menus = $('a.item');
+    $.each(menus, function() {
+        if ( $(this).attr('href') == pathname ) {
+        $(this).swapClass('item', 'item-current');
+    //  alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class'));
+        }
+    })
 
-	});
+    });
   % end
 % end
 

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

@@ -2,37 +2,37 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
 
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
+    % if (config->{debug} == 1) {
+        <pre>
+            %= dumper $lets_data
+        </pre>
+    % }
 
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
+    % my $btn = l('lets_APPLY');
+    %= form_for "letsencryptu" => (method => 'POST') => begin
+        % param 'trt' => $lets_data->{trt} unless param 'trt';
+        %= hidden_field 'trt' => $lets_data->{trt}
+        %# Inputs etc in here.
 
-		<h1 class=""><%=l('lets_Check_all_domains')%></h1>
-	
-		<h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-	
-		<span class="">
-			%=l('lets_All_domains_check_result')
-		</span>
-		<span class="">
-			% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
-			%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span><br>
-	
-		<span class="">
+        <h1 class=""><%=l('lets_Check_all_domains')%></h1>
+    
+        <h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
+    
+        <span class="">
+            %=l('lets_All_domains_check_result')
+        </span>
+        <span class="">
+            % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
+            %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+        </span><br>
+    
+        <span class="">
                         %my $back_text = l('lets_Back');  # Localized text
                         %my $actionBack = qq{
                         %       <a href="letsencryptd">
@@ -40,8 +40,8 @@
                         %       </a>
                         %};
                       <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
+        </span>
 
-		%# Probably finally by a submit.
-	%end    
+        %# Probably finally by a submit.
+    %end    
 </div>

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

@@ -2,38 +2,38 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
+    
+    % if (config->{debug} == 1) {
+        <pre>
+            %= dumper $lets_data
+        </pre>
+    % }
+    
+    % my $btn = l('lets_APPLY');
+    %= form_for "letsencryptu" => (method => 'POST') => begin
+        % param 'trt' => $lets_data->{trt} unless param 'trt';
+        %= hidden_field 'trt' => $lets_data->{trt}
+        %# Inputs etc in here.
 
-		<h1 class=""><%=l('lets_Check_all_enabled_domains')%></h1>
-	
-		<h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-	
-		<span class="">
-			%=l('lets_Enabled_domains_check_result')
-		</span>
-		<span class="">
-			% param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
-			%= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span>
-		<br>
+        <h1 class=""><%=l('lets_Check_all_enabled_domains')%></h1>
+    
+        <h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
+    
+        <span class="">
+            %=l('lets_Enabled_domains_check_result')
+        </span>
+        <span class="">
+            % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
+            %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+        </span>
+        <br>
 
-		<span class="">
+        <span class="">
                         %my $back_text = l('lets_Back');  # Localized text
                         %my $actionBack = qq{
                         %       <a href="letsencryptd">
@@ -41,9 +41,9 @@
                         %       </a>
                         %};
                       <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
-		
-	
-		%# Probably finally by a submit.
-	%end    
+        </span>
+        
+    
+        %# Probably finally by a submit.
+    %end    
 </div>

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

@@ -2,48 +2,48 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
+    
+    % if (config->{debug} == 1) {
+        <pre>
+            %= dumper $lets_data
+        </pre>
+    % }
+    
+    % my $btn = l('lets_APPLY');
+    %= form_for "letsencryptu" => (method => 'POST') => begin
+        % param 'trt' => $lets_data->{trt} unless param 'trt';
+        %= hidden_field 'trt' => $lets_data->{trt}
+        %# Inputs etc in here.
 
-		<h1 class=""><%=l('lets_Check_just_one_domain')%></h1>
-	
-		<h2 class=""><%=l('lets_Loop_through_and_check_the')%></h2>
-	
-		<p><span class="">
-			%=l('lets_Domains_name')
-		</span>
-		<span class="">
-			% param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
-			%= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<span class="">
-			%=l('lets_One_domain_check_result')
-		</span>
-		<span class="">
-			% param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
-			%= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span>
-		<br>
-	
-		<span class="">
+        <h1 class=""><%=l('lets_Check_just_one_domain')%></h1>
+    
+        <h2 class=""><%=l('lets_Loop_through_and_check_the')%></h2>
+    
+        <p><span class="">
+            %=l('lets_Domains_name')
+        </span>
+        <span class="">
+            % param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
+            %= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <span class="">
+            %=l('lets_One_domain_check_result')
+        </span>
+        <span class="">
+            % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
+            %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+        </span>
+        <br>
+    
+        <span class="">
                         %my $back_text = l('lets_Back');  # Localized text
                         %my $actionBack = qq{
                         %       <a href="letsencryptd">
@@ -51,9 +51,9 @@
                         %       </a>
                         %};
                       <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
-		
-	
-		%# Probably finally by a submit.
-	%end    
+        </span>
+        
+    
+        %# Probably finally by a submit.
+    %end    
 </div>

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

@@ -2,151 +2,151 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
+    
+    % if (config->{debug} == 1) {
+        <pre>
+            %= dumper $lets_data
+        </pre>
+    % }
+    
+    % my $btn = l('lets_APPLY');
+    %= form_for "letsencryptu" => (method => 'POST') => begin
+        % param 'trt' => $lets_data->{trt} unless param 'trt';
+        %= hidden_field 'trt' => $lets_data->{trt}
+        %# Inputs etc in here.
 
-		<div>
+        <div>
 
-		<a href='letsencryptd?trt=PARAMS' class="">
-			%= l('lets_CONFIG')
-		</a>
-		%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
-	
-	
-		<a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
-			%= l('lets_CHECK_ALL_DOMAINS')
-		</a>
-		%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
-	
-	
-		<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
-			%= l('lets_CHECK_ALL_ENABLED_DOMAINS')
-		</a>
-		%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
-	
-	
-		</div>
-		
-	
-		<h2 class=""><%=l('lets_For_this_Server')%></h2>
-	
-		<p>
-		<span class="">
-			%=l('lets_Internal_IP')
-		</span>
-		<span class="">
-			% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
-			%= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_External_Interface_IP')
-		</span>
-		<span class="">
-			% param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
-			%= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_Internet_IP')
-		</span>
-		<span class="">
-			% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
-			%= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<h2 class=""><%=l('lets_Current_certificate_details')%></h2>
-	
-		<p>
-		<span class="">
-			%=l('lets_Issuer')
-		</span>
-		<span class="">
-			% param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
-			%= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_Expiry')
-		</span>
-		<span class="">
-			% param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
-			%= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_Not_Before')
-		</span>
+        <a href='letsencryptd?trt=PARAMS' class="">
+            %= l('lets_CONFIG')
+        </a>
+        %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
+    
+    
+        <a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
+            %= l('lets_CHECK_ALL_DOMAINS')
+        </a>
+        %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
+    
+    
+        <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
+            %= l('lets_CHECK_ALL_ENABLED_DOMAINS')
+        </a>
+        %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
+    
+    
+        </div>
+        
+    
+        <h2 class=""><%=l('lets_For_this_Server')%></h2>
+    
+        <p>
+        <span class="">
+            %=l('lets_Internal_IP')
+        </span>
+        <span class="">
+            % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
+            %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_External_Interface_IP')
+        </span>
+        <span class="">
+            % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
+            %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_Internet_IP')
+        </span>
+        <span class="">
+            % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
+            %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <h2 class=""><%=l('lets_Current_certificate_details')%></h2>
+    
+        <p>
+        <span class="">
+            %=l('lets_Issuer')
+        </span>
+        <span class="">
+            % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
+            %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_Expiry')
+        </span>
+        <span class="">
+            % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
+            %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_Not_Before')
+        </span>
                 <span class="">
-			% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
-			%= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
-		<br>
-		</span>
-		</p>
-	
-		<h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
-	
-		<br />
-		<table class="table table-bordered">
-			<thead class="">
-				<tr table-head-row>
-					<th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>
-					<th class=""><%=l('lets_Brief_description')%></th>
-					<th class=""><%=l('lets_Content')%></th>
-					<th class=""><%=l('lets_LABEL_NAMESERVERS')%></th>
-					<th class=""><%=l('lets_LABEL_POINT')%></th>
-					<th class=""><%=l('lets_LABEL_LECERT')%></th>
-					<th class=""><%=l('lets_IS_IN_CERT')%></th>
-					<th class=""><%=l('lets_CHECK')%></th>
-				</tr>
-			</thead>
-			<tbody class="">
-				% my $control_data = $c->stash('DomainList');
-				% foreach my $row (@$control_data) {
-				<tr class="">
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
-					<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>		
-				</tr>
-				%}
-			</tbody>
-		</table>
-		
-	
-		%# Probably finally by a submit.
-	%end    
+            % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
+            %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
+        <br>
+        </span>
+        </p>
+    
+        <h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
+    
+        <br />
+        <table class="table table-bordered">
+            <thead class="">
+                <tr table-head-row>
+                    <th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>
+                    <th class=""><%=l('lets_Brief_description')%></th>
+                    <th class=""><%=l('lets_Content')%></th>
+                    <th class=""><%=l('lets_LABEL_NAMESERVERS')%></th>
+                    <th class=""><%=l('lets_LABEL_POINT')%></th>
+                    <th class=""><%=l('lets_LABEL_LECERT')%></th>
+                    <th class=""><%=l('lets_IS_IN_CERT')%></th>
+                    <th class=""><%=l('lets_CHECK')%></th>
+                </tr>
+            </thead>
+            <tbody class="">
+                % my $control_data = $c->stash('DomainList');
+                % foreach my $row (@$control_data) {
+                <tr class="">
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
+                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>     
+                </tr>
+                %}
+            </tbody>
+        </table>
+        
+    
+        %# Probably finally by a submit.
+    %end    
 </div>

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

@@ -2,129 +2,129 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
+    
+    % if (config->{debug} == 1) {
+        <pre>
+            %= dumper $lets_data
+        </pre>
+    % }
+    
+    % my $btn = l('lets_APPLY');
+    %= form_for "letsencryptu" => (method => 'POST') => begin
+        % param 'trt' => $lets_data->{trt} unless param 'trt';
+        %= hidden_field 'trt' => $lets_data->{trt}
+        %# Inputs etc in here.
 
-		<h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:')%></h2>
-	
-		<p class="">
-			%=l('lets_CONFIG_LETSENCRYPT')
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_SERVICE_STATUS')
-		</span>
+        <h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:')%></h2>
+    
+        <p class="">
+            %=l('lets_CONFIG_LETSENCRYPT')
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_SERVICE_STATUS')
+        </span>
                 <span class="">
-			%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
-			% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
-			%# param 'status' => $lets_data->{status} unless param 'status';
-			%= select_field 'status' => @status_options, class => ""
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_HOOKSCRIPT_STATUS')
-		</span>
-		<span class="">
-			% my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
-			% param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
-			%= select_field 'hookScript' => @hookScript_options, class => ""
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_HOSTOVERRIDE_STATUS')
-		</span>
-		<span class="">
-			% my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-			% param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
-			%= select_field 'hostOverride' => @hostOverride_options, class => ""
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('lets_ACCEPT_TERMS_STATUS')
-		</span>
-		<span class="">
-			% my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-			% param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
-			%= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
-		<br>
-		</span>
-		</p>
+            %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
+            % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
+            %# param 'status' => $lets_data->{status} unless param 'status';
+            %= select_field 'status' => @status_options, class => ""
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_HOOKSCRIPT_STATUS')
+        </span>
+        <span class="">
+            % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
+            % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
+            %= select_field 'hookScript' => @hookScript_options, class => ""
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_HOSTOVERRIDE_STATUS')
+        </span>
+        <span class="">
+            % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
+            % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
+            %= select_field 'hostOverride' => @hostOverride_options, class => ""
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('lets_ACCEPT_TERMS_STATUS')
+        </span>
+        <span class="">
+            % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
+            % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
+            %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
+        <br>
+        </span>
+        </p>
 
-		<p>
-		<span class="">
-			%=l('lets_API_STATUS')
-		</span>
+        <p>
+        <span class="">
+            %=l('lets_API_STATUS')
+        </span>
                 <span class="">
-			% my @API_options = [['2' => '2']];
-			% param 'API' => $lets_data->{API} unless param 'API';
-			%= select_field 'API' => @API_options, class => ""
-		<br>
-		</span>
-		</p>
+            % my @API_options = [['2' => '2']];
+            % param 'API' => $lets_data->{API} unless param 'API';
+            %= select_field 'API' => @API_options, class => ""
+        <br>
+        </span>
+        </p>
 
-		<p>
-		<span class="">
-			%=l('lets_KEYSIZE_STATUS')
-		</span>
-		<span class="">
-			% my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
-			% param 'keysize' => $lets_data->{keysize} unless param 'keysize';
-			%= select_field 'keysize' => @keysize_options, class => ""
-		<br>
-		</span>
-		</p>
+        <p>
+        <span class="">
+            %=l('lets_KEYSIZE_STATUS')
+        </span>
+        <span class="">
+            % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
+            % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
+            %= select_field 'keysize' => @keysize_options, class => ""
+        <br>
+        </span>
+        </p>
 
-		<p>
-		<span class="">
-			%=l('lets_CONFIGUREMODE_STATUS')
-		</span>
-		<span class="">
-			% my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
-			% param 'configure' => $lets_data->{configure} unless param 'configure';
-			%= select_field 'configure' => @configure_options, class => ""
-		<br>
-		</span>
-		</p>
+        <p>
+        <span class="">
+            %=l('lets_CONFIGUREMODE_STATUS')
+        </span>
+        <span class="">
+            % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
+            % param 'configure' => $lets_data->{configure} unless param 'configure';
+            %= select_field 'configure' => @configure_options, class => ""
+        <br>
+        </span>
+        </p>
 
-		<p>
-		<span class="">
-			%=l('lets_EMAIL')
-		</span>
-		<span class="">
-			% param 'email' => $lets_data->{email} unless param 'email';
-			%=email_field 'email', class => ""
-		</span>
-		</p>
+        <p>
+        <span class="">
+            %=l('lets_EMAIL')
+        </span>
+        <span class="">
+            % param 'email' => $lets_data->{email} unless param 'email';
+            %=email_field 'email', class => ""
+        </span>
+        </p>
 
-		<span class="">
-			%= submit_button l('lets_Save'), class => ""
-		</span>
+        <span class="">
+            %= submit_button l('lets_Save'), class => ""
+        </span>
 
-		%# Probably finally by a submit.
-	%end    
+        %# Probably finally by a submit.
+    %end    
 </div>

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

@@ -1,76 +1,76 @@
 <div>
 
-	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
-	
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+    % my $retref= $c->stash("ret");
+    % my %ret;
+    % unless (length($retref)) {%ret = (ret=>"");}
+    % else {%ret = %$retref;}
+    
+    % my @vars = split(",",$ret{vars});
+    % my $var1 = @vars[0];
+    % my $var2 = @vars[1];
+    % my $var3 = @vars[2];
+    % my $var4 = @vars[3];
+    % my $var5 = @vars[4];
+    % my $var6 = @vars[5];
 
-	%if ($ret{'ret'} eq "") {
-   	
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class="">
-	       <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-		</div>
-	   %} else { 
-	   <div class="">
-	       <h2> Operation Status Report - Error</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-    	</div>
-	%}
-	<br />
+    %if ($ret{'ret'} eq "") {
+    
+    %} elsif (index($ret{ret},"SUCCESS") != -1) {
+       <div class="">
+           <h2> Operation Status Report</h2>
+            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+        </div>
+       %} else { 
+       <div class="">
+           <h2> Operation Status Report - Error</h2>
+            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+        </div>
+    %}
+    <br />
     % my $btn = l('ADD');
     % my $network_db = esmith::NetworksDB->open();
     
    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
-	</p>
+    <p>
+    %= dumper $c->current_route
+    %= dumper $c->stash("ret")
+    </p>
     % }
      
     %= form_for '/localnetworksb' => (method => 'POST') => begin
-		<h2>
-		%=l "ln_ADD_TITLE"
-		</h2>
-			<p>
-			%= $c->render_to_string(inline => l('ln_ADD_DESC'));
-			</p>
-			<br>
-			<span class="">
-				%=l "NETWORK"
-			</span>
-			<span class="">
-				%=text_field  'networkAddress'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "ln_SUBNET_MASK"
-			</span>
-			<span class="">
-				%=text_field 'networkMask'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "ROUTER"
-			</span>
-			<span class="">
-				%=text_field 'networkRouter'
-			</span>
-			<br><br>
-			<p>
-			<br>
-			%= submit_button "$btn", class => ""
-			</p>
-	%end
+        <h2>
+        %=l "ln_ADD_TITLE"
+        </h2>
+            <p>
+            %= $c->render_to_string(inline => l('ln_ADD_DESC'));
+            </p>
+            <br>
+            <span class="">
+                %=l "NETWORK"
+            </span>
+            <span class="">
+                %=text_field  'networkAddress'
+            </span>
+            <br><br>
+            <span class="">
+                %=l "ln_SUBNET_MASK"
+            </span>
+            <span class="">
+                %=text_field 'networkMask'
+            </span>
+            <br><br>
+            <span class="">
+                %=l "ROUTER"
+            </span>
+            <span class="">
+                %=text_field 'networkRouter'
+            </span>
+            <br><br>
+            <p>
+            <br>
+            %= submit_button "$btn", class => ""
+            </p>
+    %end
 
 </div>
 

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

@@ -6,60 +6,60 @@
     % my $router = $ln_datas->{router};
     
    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
+    <p>
+    %= dumper $c->current_route
+    %= dumper $c->stash("ret")
     %= dumper %$ln_datas
     %= dumper $deletehosts
-	</p>
+    </p>
     % }
 
     %= form_for '/localnetworkse' => (method => 'POST') => begin
-		<h2>
-		%=l "ln_REMOVE_TITLE"
-		</h2>
-			<p>
-			%=l "ln_REMOVE_DESC"
-			</p>
-			<br>
-			<span class="">
-				%=l "NETWORK"
-			</span>
-			<span class="">
-				%=$localnetwork
-			</span>
-			<br><br>
-			<span class="">
-				%=l "ln_SUBNET_MASK"
-			</span>
-			<span class="">
-				%= $subnet
-			</span>
-			<br><br>
-			<span class="">
-				%=l "ROUTER"
-			</span>
-			<span class="">
-				%= $router
-			</span>
-			<br><br>
-			% if($deletehosts) {
-			<br>
-			%=$c->l("ln_REMOVE_HOSTS_DESC")
-			<br>
-			<span class="">
-				%= $c->l("ln_REMOVE_HOSTS_LABEL")
-			</span>
-			<span class="">
-				%=check_box deletehost=>1, checked=>1
-			</span>
-			<br><br>
-			%}
-			%= hidden_field localnetwork=>$localnetwork
-			<p>
-			<br>
-			%= submit_button "$btn", class => ""
-			</p>
-	%end
+        <h2>
+        %=l "ln_REMOVE_TITLE"
+        </h2>
+            <p>
+            %=l "ln_REMOVE_DESC"
+            </p>
+            <br>
+            <span class="">
+                %=l "NETWORK"
+            </span>
+            <span class="">
+                %=$localnetwork
+            </span>
+            <br><br>
+            <span class="">
+                %=l "ln_SUBNET_MASK"
+            </span>
+            <span class="">
+                %= $subnet
+            </span>
+            <br><br>
+            <span class="">
+                %=l "ROUTER"
+            </span>
+            <span class="">
+                %= $router
+            </span>
+            <br><br>
+            % if($deletehosts) {
+            <br>
+            %=$c->l("ln_REMOVE_HOSTS_DESC")
+            <br>
+            <span class="">
+                %= $c->l("ln_REMOVE_HOSTS_LABEL")
+            </span>
+            <span class="">
+                %=check_box deletehost=>1, checked=>1
+            </span>
+            <br><br>
+            %}
+            %= hidden_field localnetwork=>$localnetwork
+            <p>
+            <br>
+            %= submit_button "$btn", class => ""
+            </p>
+    %end
 
 </div>

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

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

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

@@ -2,162 +2,162 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput(); 
-	};
+    <script>
+        window.onload = function() {
+        SelectInput(); 
+    };
 
-	</script>
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $nut_data
-		</pre>
-	% }
+    </script>
+    % if (config->{debug} == 1) {
+        <pre>
+            %= dumper $nut_data
+        </pre>
+    % }
 
-	% my $btn = l('nut_APPLY');
-	%= form_for "nutupsu" => (method => 'POST') => begin
-		% param 'trt' => $nut_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $nut_data->{trt}
-		%# Inputs etc in here.
+    % my $btn = l('nut_APPLY');
+    %= form_for "nutupsu" => (method => 'POST') => begin
+        % param 'trt' => $nut_data->{trt} unless param 'trt';
+        %= hidden_field 'trt' => $nut_data->{trt}
+        %# Inputs etc in here.
 
-		<h2 class=""><%=l('nut_Manage_Nutups-config_settings:')%></h2>
-	
-		<p>
-		<span class="">
-			%=l('nut_Nut_status')
-		</span>
-		<span class="">
-			%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
-			%# param 'status' => $nut_data->{status} unless param 'status';
+        <h2 class=""><%=l('nut_Manage_Nutups-config_settings:')%></h2>
+    
+        <p>
+        <span class="">
+            %=l('nut_Nut_status')
+        </span>
+        <span class="">
+            %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
+            %# param 'status' => $nut_data->{status} unless param 'status';
 
-			% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
-			%= select_field 'status' => @status_options, class => "", id => ""
-		<br>
-		</span>
-		</p>
-	
-		<p>
-		<span class="">
-			%=l('nut_Nut_mode')
-		</span>
-		<span class="">
-			% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
-			% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
-			%= select_field 'Nutmode' => @Nutmode_options, class => "", id => ""
-		<br>
-		</span>
-		</p>
-	
-		<div class="">
-			<h2 class=""><%=l('nut_if_Net_Server')%></h2>
-		
-			<p>
-			<span class="">
-				%=l('nut_MasterUPS_UPSNAME@IP')
-			</span>
-			<span class="">
-				% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
-				%= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
-			<br>
-			</span>
-			</p>
+            % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
+            %= select_field 'status' => @status_options, class => "", id => ""
+        <br>
+        </span>
+        </p>
+    
+        <p>
+        <span class="">
+            %=l('nut_Nut_mode')
+        </span>
+        <span class="">
+            % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
+            % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
+            %= select_field 'Nutmode' => @Nutmode_options, class => "", id => ""
+        <br>
+        </span>
+        </p>
+    
+        <div class="">
+            <h2 class=""><%=l('nut_if_Net_Server')%></h2>
+        
+            <p>
+            <span class="">
+                %=l('nut_MasterUPS_UPSNAME@IP')
+            </span>
+            <span class="">
+                % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
+                %= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
+            <br>
+            </span>
+            </p>
 
-			<p>
-			<span class="">
-				%=l('nut_MasterUPS_Password')
-			</span>
-			<span class="">
-				% param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
-				%=password_field 'MasterUPS_Password', class => ""
-			</span>
-			</p>
+            <p>
+            <span class="">
+                %=l('nut_MasterUPS_Password')
+            </span>
+            <span class="">
+                % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
+                %=password_field 'MasterUPS_Password', class => ""
+            </span>
+            </p>
 
-			<p>
-			<span class="">
-				%=l('nut_UPS_Model')
-			</span>
-			<span class="">
-				% my @UPS_Model_options = $c->get_model_options();
-				% param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
-				%= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => ""
-			<br>
-			</span></p>
+            <p>
+            <span class="">
+                %=l('nut_UPS_Model')
+            </span>
+            <span class="">
+                % my @UPS_Model_options = $c->get_model_options();
+                % param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
+                %= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => ""
+            <br>
+            </span></p>
 
-			<p><span class="">
-				%=l('nut_UPS_Device')
-			</span><span class="">
-				% param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
-				%= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)'
-			<br></span></p>
-		</div>
-		
-		<div class="">
-			<h2 class=""><%=l('nut_if_Net_Client')%></h2>
-			<p>
-			<span class="">
-				%=l('nut_SlaveUPS_UPSNAME@IP')
-			</span>
-			<span class="">
-				% param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
-				%= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP'
-			<br>
-			</span>
-			</p>
-		
-			<p>
-			<span class="">
-				%=l('nut_SlaveUPS_Password')
-			</span>
-			<span class="">
-				% param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
-				%=password_field 'SlaveUPS_Password', class => ""
-			</span>
-			</p>
-		</div>
-	
-		<div class="">
-`			<h2 class=""><%=l('nut_if_genericups')%></h2>
-			<p>
-			<span class="">
-				%=l('nut_UPS_Generic_Type')
-			</span>
-			<span class="">
-				% param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
-				%= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type'
-			<br>
-			</span>
-			</p>
-		
-			<p>
-			<span class="">
-				%=l('nut_UPS_Generic_Manufacturer')
-			</span>
-			<span class="">
-				% param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
-				%= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
-			<br>
-			</span>
-			</p>
-		
-			<p>
-			<span class="">
-				%=l('nut_UPS_Generic_Model')
-			</span>
-			<span class="">
-				% param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
-				%= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model'
-			<br>
-			</span>
-			</p>
-`		</div>
-			
-		<span class="">
-			%= submit_button l('nut_Save'), class => ""
-		</span>
-	
+            <p><span class="">
+                %=l('nut_UPS_Device')
+            </span><span class="">
+                % param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
+                %= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)'
+            <br></span></p>
+        </div>
+        
+        <div class="">
+            <h2 class=""><%=l('nut_if_Net_Client')%></h2>
+            <p>
+            <span class="">
+                %=l('nut_SlaveUPS_UPSNAME@IP')
+            </span>
+            <span class="">
+                % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
+                %= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP'
+            <br>
+            </span>
+            </p>
+        
+            <p>
+            <span class="">
+                %=l('nut_SlaveUPS_Password')
+            </span>
+            <span class="">
+                % param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
+                %=password_field 'SlaveUPS_Password', class => ""
+            </span>
+            </p>
+        </div>
+    
+        <div class="">
+`           <h2 class=""><%=l('nut_if_genericups')%></h2>
+            <p>
+            <span class="">
+                %=l('nut_UPS_Generic_Type')
+            </span>
+            <span class="">
+                % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
+                %= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type'
+            <br>
+            </span>
+            </p>
+        
+            <p>
+            <span class="">
+                %=l('nut_UPS_Generic_Manufacturer')
+            </span>
+            <span class="">
+                % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
+                %= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
+            <br>
+            </span>
+            </p>
+        
+            <p>
+            <span class="">
+                %=l('nut_UPS_Generic_Model')
+            </span>
+            <span class="">
+                % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
+                %= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model'
+            <br>
+            </span>
+            </p>
+`       </div>
+            
+        <span class="">
+            %= submit_button l('nut_Save'), class => ""
+        </span>
+    
 
-		
-	
-		%# Probably finally by a submit.
-	%end    
+        
+    
+        %# Probably finally by a submit.
+    %end    
 </div>

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

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

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

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

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

@@ -1,95 +1,95 @@
 <div>
 
-	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
-	
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+    % my $retref= $c->stash("ret");
+    % my %ret;
+    % unless (length($retref)) {%ret = (ret=>"");}
+    % else {%ret = %$retref;}
+    
+    % my @vars = split(",",$ret{vars});
+    % my $var1 = @vars[0];
+    % my $var2 = @vars[1];
+    % my $var3 = @vars[2];
+    % my $var4 = @vars[3];
+    % my $var5 = @vars[4];
+    % my $var6 = @vars[5];
 
-	<br>
-	%if ($ret{'ret'} eq "") {
-   	
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class="">
-	       <!--<h2> Operation Status Report</h2>-->
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-		</div>
-	   %} else { 
-	   <div class="">
-	       <!--<h2> Operation Status Report - Error</h2>-->
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-    	</div>
-	%}
-	<br />
+    <br>
+    %if ($ret{'ret'} eq "") {
+    
+    %} elsif (index($ret{ret},"SUCCESS") != -1) {
+       <div class="">
+           <!--<h2> Operation Status Report</h2>-->
+            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+        </div>
+       %} else { 
+       <div class="">
+           <!--<h2> Operation Status Report - Error</h2>-->
+            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+        </div>
+    %}
+    <br />
     % my $btn = l('ADD');
     
    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
-	</p>
+    <p>
+    %= dumper $c->current_route
+    %= dumper $c->stash("ret")
+    </p>
     % }
      
     %= form_for '/portforwardingb' => (method => 'POST') => begin
-		<h2>
-		%=l "pf_CREATE_RULE"
-		</h2>
-			<p>
-			    %=l "pf_SUMMARY_ADD_DESC"
-			</p><br>
-			<span class="">
-			    %=l "pf_LABEL_PROTOCOL"
-			</span>
-			<span class="">
-				%=select_field  'proto'=>["TCP","UDP"]
-			</span><br><br>
-			<span class="">
-				%=l "pf_LABEL_SOURCE_PORT"
-			</span>
-			<span class="">
-				%=text_field 'sport'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_LABEL_DESTINATION_PORT"
-			</span>
-			<span class="">
-				%=text_field 'dport'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_LABEL_DESTINATION_HOST"
-			</span>
-			<span class="">
-				%=text_field 'dhost'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_ALLOW_HOSTS"
-			</span>
-			<span class="">
-				%=text_field 'allow'
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_RULE_COMMENT"
-			</span>
-			<span class="">
-				%=text_field 'cmmnt'
-			</span>
-			<br><br>
-			<p>
-			<br>
-			%= submit_button "$btn", class => ""
-			</p>
+        <h2>
+        %=l "pf_CREATE_RULE"
+        </h2>
+            <p>
+                %=l "pf_SUMMARY_ADD_DESC"
+            </p><br>
+            <span class="">
+                %=l "pf_LABEL_PROTOCOL"
+            </span>
+            <span class="">
+                %=select_field  'proto'=>["TCP","UDP"]
+            </span><br><br>
+            <span class="">
+                %=l "pf_LABEL_SOURCE_PORT"
+            </span>
+            <span class="">
+                %=text_field 'sport'
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_LABEL_DESTINATION_PORT"
+            </span>
+            <span class="">
+                %=text_field 'dport'
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_LABEL_DESTINATION_HOST"
+            </span>
+            <span class="">
+                %=text_field 'dhost'
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_ALLOW_HOSTS"
+            </span>
+            <span class="">
+                %=text_field 'allow'
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_RULE_COMMENT"
+            </span>
+            <span class="">
+                %=text_field 'cmmnt'
+            </span>
+            <br><br>
+            <p>
+            <br>
+            %= submit_button "$btn", class => ""
+            </p>
 
-	%end
+    %end
 
 </div>

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

@@ -9,65 +9,65 @@
     % my $allow = $pf_datas->{allow};
     
    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
+    <p>
+    %= dumper $c->current_route
+    %= dumper $c->stash("ret")
     %= dumper %$pf_datas
-	</p>
+    </p>
     % }
      
     %= form_for '/portforwardinge' => (method => 'POST') => begin
         <br>
-		%= l "pf_SUMMARY_REMOVE_DESC"
-			</p><br>
-			<span class="">
-				%=l "pf_LABEL_PROTOCOL"
-			</span>
-			<span class="">
-				%=$proto
-			</span><br><br>
-			<span class="">
-				%=l "pf_LABEL_SOURCE_PORT"
-			</span>
-			<span class="">
-				%=$sport
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_LABEL_DESTINATION_HOST"
-			</span>
-			<span class="">
-				%=$dport
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_LABEL_DESTINATION_PORT"
-			</span>
-			<span class="">
-				%=$dhost
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_RULE_COMMENT"
-			</span>
-			<span class="">
-				%=$cmmnt
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_ALLOW_HOSTS"
-			</span>
-			<span class="">
-				%=$allow
-			</span>
-			<br><br>
-		%#}
-			%= hidden_field sport=>$sport
-			%= hidden_field proto=>$proto
-			<br>
-			%= submit_button "$btn", class => ""
-			</p>
+        %= l "pf_SUMMARY_REMOVE_DESC"
+            </p><br>
+            <span class="">
+                %=l "pf_LABEL_PROTOCOL"
+            </span>
+            <span class="">
+                %=$proto
+            </span><br><br>
+            <span class="">
+                %=l "pf_LABEL_SOURCE_PORT"
+            </span>
+            <span class="">
+                %=$sport
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_LABEL_DESTINATION_HOST"
+            </span>
+            <span class="">
+                %=$dport
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_LABEL_DESTINATION_PORT"
+            </span>
+            <span class="">
+                %=$dhost
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_RULE_COMMENT"
+            </span>
+            <span class="">
+                %=$cmmnt
+            </span>
+            <br><br>
+            <span class="">
+                %=l "pf_ALLOW_HOSTS"
+            </span>
+            <span class="">
+                %=$allow
+            </span>
+            <br><br>
+        %#}
+            %= hidden_field sport=>$sport
+            %= hidden_field proto=>$proto
+            <br>
+            %= submit_button "$btn", class => ""
+            </p>
 
-	%end
+    %end
 
 </div>

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

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

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

@@ -1,51 +1,51 @@
 <div>
 
-    % 	my $btn = l('ADD');
+    %   my $btn = l('ADD');
 
     %= form_for '/printers2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'prt_CREATE_NEW_PRINTER'
-	</h2>
-	<br>
-	%=l 'prt_CREATE_NEW_DESC'
-	</p>
-	<br>
+    <p>
+    <h2>
+    %=l 'prt_CREATE_NEW_PRINTER'
+    </h2>
+    <br>
+    %=l 'prt_CREATE_NEW_DESC'
+    </p>
+    <br>
 
-	<p>
-	<span class="">
-	%=l 'prt_PRINTER_NAME', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Name', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'prt_PRINTER_NAME', class => ""
+    </span>
+    <span class="">
+    %= text_field 'Name', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'DESCRIPTION_BRIEF', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Description', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'DESCRIPTION_BRIEF', class => ""
+    </span>
+    <span class="">
+    %= text_field 'Description', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'LOCATION', class => ""
-	</span>
-	<span class="">
-	%= select_field 'Location' => $c->printerLocation_list(), class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'LOCATION', class => ""
+    </span>
+    <span class="">
+    %= select_field 'Location' => $c->printerLocation_list(), class => ""
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $prt_datas->{trt}
-	
+    %= hidden_field 'trt' => $prt_datas->{trt}
+    
     % end    
 
 </div>

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

@@ -1,26 +1,26 @@
 <div>
-    % 	my $btn = l('REMOVE');
+    %   my $btn = l('REMOVE');
     %= form_for '/printers2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'prt_REMOVE_PRINTER'
-	</h2>
-	<br><br>
+    <p>
+    <h2>
+    %=l 'prt_REMOVE_PRINTER'
+    </h2>
+    <br><br>
 
-	<%=l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%>
-	(<%=$prt_datas->{description}%>)
-	<br>
+    <%=l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%>
+    (<%=$prt_datas->{description}%>)
+    <br>
 
-	%=l 'prt_SPOOL_FILE_WARNING'
-	<br>
+    %=l 'prt_SPOOL_FILE_WARNING'
+    <br>
 
-	%=l 'prt_ARE_YOU_SURE'
-	</p>
+    %=l 'prt_ARE_YOU_SURE'
+    </p>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
 
         %= hidden_field 'trt' => $prt_datas->{trt}
         %= hidden_field 'printer' => $prt_datas->{printer}

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

@@ -6,45 +6,45 @@
 
         %= hidden_field 'trt' => 'ADD'
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br>
+    %= submit_button "$btn", class => ""
+    </p>
    % end
 
-	<p>
-	<h2>
-	%=l 'prt_CURRENT_LIST'
-	</h2>
-	<br><br>
-    % 	my $numPrinters = @$printerDrivers;
-    %	if ($numPrinters == 0){
+    <p>
+    <h2>
+    %=l 'prt_CURRENT_LIST'
+    </h2>
+    <br><br>
+    %   my $numPrinters = @$printerDrivers;
+    %   if ($numPrinters == 0){
         %=l 'prt_NO_PRINTERS'
-    %	} else {
-	<table class="table table-bordered">
-	<thead>
-	<tr>
-    	    <th class="">
-    	    %=l 'NAME'
-    	    </th>
-    	    <th class="">
-    	    %=l 'DESCRIPTION'
-    	    </th>
-    	    <th class="">
-    	    %=l 'LOCATION'
-    	    </th>
-    	    <th class="">
-    	    %=l 'prt_REMOTE_ADDRESS'
-    	    </th>
-    	    <th class="">
-    	    %=l 'prt_REMOTE_NAME'
-    	    </th>
-    	    <th class="">
-    	    %=l 'ACTION'
-    	    </th>
-    	</tr>
-    	</thead>
-    	<tbody>
+    %   } else {
+    <table class="table table-bordered">
+    <thead>
+    <tr>
+            <th class="">
+            %=l 'NAME'
+            </th>
+            <th class="">
+            %=l 'DESCRIPTION'
+            </th>
+            <th class="">
+            %=l 'LOCATION'
+            </th>
+            <th class="">
+            %=l 'prt_REMOTE_ADDRESS'
+            </th>
+            <th class="">
+            %=l 'prt_REMOTE_NAME'
+            </th>
+            <th class="">
+            %=l 'ACTION'
+            </th>
+        </tr>
+        </thead>
+        <tbody>
     %    foreach my $printer (@$printerDrivers)
     %    {
     %        my $address = ($printer->prop('Location') eq 'remote')
@@ -58,25 +58,25 @@
             %= t td => (class => "") => $printer->prop('Location')
             %= t td => (class => "") => $address
             %= t td => (class => "") => $remoteName
-			<td class="">
-				%my $remove_text = l('REMOVE');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
-				%my $printer_name = $printer->key;
-				%my $actionRemove = qq{
+            <td class="">
+                %my $remove_text = l('REMOVE');  # Localized text
+                %my $csrf_token = "TOKEN";  # CSRF token for security
+                %my $printer_name = $printer->key;
+                %my $actionRemove = qq{
                                 %       <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
-				%	<button type='button' class="" title='$remove_text' >
-				%		$remove_text
-				%	</button>
+                %   <button type='button' class="" title='$remove_text' >
+                %       $remove_text
+                %   </button>
                                 %       </a>
-				%};
-			<%= $c->render_to_string(inline => $actionRemove) %>
-			</td>
-    	</tr>
+                %};
+            <%= $c->render_to_string(inline => $actionRemove) %>
+            </td>
+        </tr>
     %    }
-    	</tbody>
-    	</table>
-	<%} %>
-	</p>
+        </tbody>
+        </table>
+    <%} %>
+    </p>
 
 
 </div>

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

@@ -1,45 +1,45 @@
 <div>
 
-    % 	my $btn = l('ADD');
+    %   my $btn = l('ADD');
 
     %= form_for '/printers2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'prt_CREATE_NETWORK_PRINTER'
-	</h2>
-	
-	<br><br>
-	%=l 'prt_CREATE_NETWORK_DESC'
-	</p>
-	
-	<p>
-	<span class="">
-	%=l 'prt_HOSTNAME_OR_IP', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Address', class => ""
-	</span>
-	</p>
+    <p>
+    <h2>
+    %=l 'prt_CREATE_NETWORK_PRINTER'
+    </h2>
+    
+    <br><br>
+    %=l 'prt_CREATE_NETWORK_DESC'
+    </p>
+    
+    <p>
+    <span class="">
+    %=l 'prt_HOSTNAME_OR_IP', class => ""
+    </span>
+    <span class="">
+    %= text_field 'Address', class => ""
+    </span>
+    </p>
 
-	<p>
-	<span class="">
-	%=l 'prt_REMOTE_NAME_DESC', class => ""
-	</span>
-	<span class="">
-	%= text_field 'RemoteName' => 'raw', class => ""
-	</span>
-	</p>
+    <p>
+    <span class="">
+    %=l 'prt_REMOTE_NAME_DESC', class => ""
+    </span>
+    <span class="">
+    %= text_field 'RemoteName' => 'raw', class => ""
+    </span>
+    </p>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <p>
+    <br><br>
+    %= submit_button "$btn", class => ""
+    </p>
 
-	%= hidden_field 'trt' => $prt_datas->{trt}
-	%= hidden_field 'Name' => $prt_datas->{name}
-	%= hidden_field 'Description' => $prt_datas->{description}
-	%= hidden_field 'Location' => $prt_datas->{location}
-	
+    %= hidden_field 'trt' => $prt_datas->{trt}
+    %= hidden_field 'Name' => $prt_datas->{name}
+    %= hidden_field 'Description' => $prt_datas->{description}
+    %= hidden_field 'Location' => $prt_datas->{location}
+    
     % end
 
 </div>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,15 @@
-	<p><h2>
-	%=l 'rma_TITLE_PPTP'
-	</h2><br>
-	%=l 'rma_DESC_PPTP'
-	<br>
-	<span class="">
-	%=l 'rma_LABEL_PPTP'
-	</span>
-	<span class="">
-	% param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions';
-	%= text_field 'PptpSessions' =>  $c->get_pptp_sessions(), class => ""
-	</span>
-	</p>
+    <p><h2>
+    %=l 'rma_TITLE_PPTP'
+    </h2><br>
+    %=l 'rma_DESC_PPTP'
+    <br>
+    <span class="">
+    %=l 'rma_LABEL_PPTP'
+    </span>
+    <span class="">
+    % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions';
+    %= text_field 'PptpSessions' =>  $c->get_pptp_sessions(), class => ""
+    </span>
+    </p>
 
-	<!--<hr class="" />-->
+    <!--<hr class="" />-->

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

@@ -25,11 +25,11 @@
     %       foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
     %       next if ($_->{'MENUCAT'} ne 'U' );  # menu User 
     %       if ( $_->{'FILENAME'} =~ m/^2\// ) {
-    %       $target = '_self';
+    %           $target = '_self';
     %           (my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
     %           $href = '/smanager/' . $file2;
     %       } else {
-    %       $target = 'main';
+    %           $target = 'main';
     %           $href = '/server-manager' . $_->{'FILENAME'};
     %       }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,29 +5,30 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $prt_datas
-    </p>
-    %}
+    <div>
+        %= dumper $c->current_route
+        %= dumper $prt_datas
+    </div>
+    % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-            %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div>
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
     % if ($prt_datas->{trt} eq 'ADD') {
-    %= include 'partials/_prt_add'
-    %} elsif ($prt_datas->{trt} eq 'DEL') {
+        %= include 'partials/_prt_add'
+    % } elsif ($prt_datas->{trt} eq 'DEL') {
         %= include 'partials/_prt_del'
-    %} elsif ($prt_datas->{trt} eq 'NET') {
+    % } elsif ($prt_datas->{trt} eq 'NET') {
         %= include 'partials/_prt_net'
-        %} else {
+    % } else {
         %= include 'partials/_prt_list'
-        %}
+    % }
 
 </div>
 %end

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

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

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

@@ -5,29 +5,31 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $pse_datas
-    </p>
-    % }
-    
-    % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+    <div>
+        <%= dumper $c->current_route %>
+        <%= dumper $pse_datas %>
     </div>
-    %}
+    % }
+
+    % if ( stash 'error' ) {
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
     % if ($pse_datas->{trt} eq 'ADD') {
-    %= include 'partials/_pse_add'
-    %} elsif ($pse_datas->{trt} eq 'DEL') {
+        %= include 'partials/_pse_add'
+    % } elsif ($pse_datas->{trt} eq 'DEL') {
         %= include 'partials/_pse_del'
-    %} elsif ($pse_datas->{trt} eq 'UPD') {
+    % } elsif ($pse_datas->{trt} eq 'UPD') {
         %= include 'partials/_pse_upd'
-        %} else {
+    % } else {
         %= include 'partials/_pse_list'
-        %}
+    % }
 
 </div>
+
 %end

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

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

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

@@ -3,9 +3,6 @@
 % content_for 'module' => begin
 
 
-%#= include 'partials/_panel_card_top'
-%#= include 'partials/_panel_card_header'
-
 <div class="card-body">
 
     <h1> <%= $title %> </h1> 
@@ -25,7 +22,5 @@
 
 </div>
 
-%#= include 'partials/_panel_card_footer'
-%#= include 'partials/_panel_card_bottom'
 
 % end

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

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

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

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

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

@@ -11,80 +11,111 @@
     </p>
     % }
 
-    <h1>
-    %= l 'pwd_ACCOUNT_PASSWORD_CHANGE'
-    </h1>
+    <h2><%= l 'pwd_ACCOUNT_PASSWORD_CHANGE' %></h2>
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div>
+            %= $c->render_to_string(inline => stash 'error') 
         </div>
     %}
 
-    <p>
+
     %  my $btn = l('pwd_PASSWORD_CHANGE');
     %  my $url = '/userpassword';
-    %= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
+
+    <div>
+        %= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
+    </div>
+    
     % if ( $pwd_datas->{trt} eq 'RESET' ) {
-    %     $btn = l('pwd_PASSWORD_RESET');
-    %     $url = '/userpasswordr';
+    %    my $btn = l('pwd_PASSWORD_RESET');
+    %    my $url = '/userpasswordr';
     %= $c->render_to_string( inline => l('pwd_DESCRIPTION_RESET'));
     % }
-    </p>
 
+   <br>
+
+    <!-- Start of Form -->
     %= form_for $url => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %= l 'pwd_YOUR_ACCOUNT'
-    </span>
-    <span class="">
-    %= $pwd_datas->{Account}
-    </span>
+
+    <table class="table table-bordered user-table-max-wdith">
+        <thead>
+            <tr>
+                <th class="col-sm">
+                    %= l 'pwd_YOUR_ACCOUNT'
+                </th>
+                <th class="col-sm">
+                    %=l 'USER_NAME'
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td><%= $pwd_datas->{Account} %></td>
+                <td><%= $pwd_datas->{name} %>Not in pwd_datas-> name ? :-( </td>
+           </tr>
+       </tbody>
+    </table>
+    
+    <br>
+
+    % if ( $pwd_datas->{trt} ne 'RESET' ) {
+        <div>
+        <%= l 'pwd_PASSWORD_OLD' %>
+        </div>
+        
+        <br>
+        
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <input name="OldPass" id="OldPass" type="password" class="form-control sme-password" placeholder="Password">
+            </div>
+        </div>
+    % }
+
+    <br> 
+
+    <div>
+    <%= l 'pwd_PASSWORD_NEW' %>
+    </div>
+    
+    <br>
+    
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+        <input name="Pass" id="Pass" type="password" class="form-control sme-password" placeholder="Password">
+        </div>
+    </div>
+
+    <br>
+
+    <div>
+    %=l 'pwd_PASSWORD_VERIFY_NEW'
+    </div>
+    
+    <br>
+    
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+        <input name="Passverify" id="PassVerify" type="password" class="form-control sme-password" placeholder="Password">
+        </div>
+    </div>   
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
+
     %= hidden_field 'User' => $pwd_datas->{Account}
     %= hidden_field 'Trt' => $pwd_datas->{trt}
     %= hidden_field 'jwt' => $pwd_datas->{jwt}
-    <br><br>
-    </p>
-
-    % if ( $pwd_datas->{trt} ne 'RESET' ) {
-    <p>
-    <span class="">
-    %= l 'pwd_PASSWORD_OLD'
-    </span>
-    <span class="">
-    %= password_field 'Oldpass', class => "", class=> 'sme-password'
-    </span>
-    <br><br>
-    </p>
-    % }
-
-    <p>
-    <span class="">
-    %=l 'pwd_PASSWORD_NEW'
-    </span>
-    <span class="">
-    %= password_field 'Pass', class => "", class=> 'sme-password'
-    </span>
-    <br><br>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'pwd_PASSWORD_VERIFY_NEW'
-    </span>
-    <span class="">
-    %= password_field 'Passverify', class => "", class=> 'sme-password'
-    </span>
-    <br><br>
-    </p>
-
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
 
     % end
+    <!-- End of Form -->
 
 </div>
 

smeserver-manager-AdminLTE.code-workspace

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

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 8
+%define release 21
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,50 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-21.sme
+- Directory updated. More odd fixes.
+
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-20.sme
+- Ibays done. Updating some consistency elsewhere.
+
+* Fri May 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-19.sme
+- Fix more stuff with usr templates
+
+* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-18.sme
+- Trying to make _user_list more logical. Needs 'UNLOCK' translation
+- Big cleanup of dupplicate % my= but needs more work
+
+* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-17.sme
+- Convert tabs to spaces for consistency
+- Fix group update container
+
+* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-16.sme
+- Fix user add error
+- Update group templates
+
+* Fri Apr 25 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-15.sme
+- Forgot the updated CSS
+
+* Fri Apr 25 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-14.sme
+- Finish user templates. Saving fixed. Start on groups
+
+* Fri Apr 25 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-13.sme
+- Tidy some useraccounts formatting but admin page will not save
+
+* Thu Apr 24 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0.12.sme
+- Tidy user list
+
+* Wed Apr 23 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-11.sme
+- Working sidebar scrolling
+
+* Sat Apr 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-10.sme
+- Tweak the form values more but stil not right
+
+* Sat Apr 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-9.sme
+- Starting to update forms
+- Moving as much formatting to simple html as possible
+- Use Mojo helpers for some parts eg theme chooser - may come back to that
+
 * Fri Apr 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-8.sme
 - More cleanup
 - Add Card support across all panels except login