11.0.0-40.sme

.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

@@ -1,3 +1,6 @@
+html {
+    font-size: 14px;
+}
 
 #busy-indicator {
     display: none;
@@ -50,7 +53,8 @@
 }
 
 .login-page {
-    min-height: 10vh;
+    min-height: 60vh !important ;
+    vertical-align: top !important ;
 }
 
 .nav-icon {
@@ -88,3 +92,25 @@
    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;
+    -- Use align-middle --
+} */
+
+
+
+.user-table-max-width {
+    max-width: 50%;
+}

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

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

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,22 @@
+$(document).ready(function () {
+  const togglePassword = document.querySelector("#togglePassword");
+  const password = document.querySelector("#password");
+
+  let pass = togglePassword;
+
+  if (pass) {
+  togglePassword.addEventListener("click", function () {
+    // toggle the type attribute
+    const type = password.getAttribute("type") === "password" ? "text" : "password";
+    password.setAttribute("type", type);
+    // toggle the eye icon
+    if (type === "text") {
+      $(this).removeClass("bi-eye");
+      $(this).addClass("bi-eye-slash");
+    } else {
+      $(this).removeClass("bi-eye-slash");
+      $(this).addClass("bi-eye");
+    }
+  });
+}
+});

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

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

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

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

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

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

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

@@ -5,169 +5,268 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+             <%= dumper $c->current_route %>
+             <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div>
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_CONFIGURE_WORKSTN_BACKUP'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC'))
-
-    %= form_for '/backupd' => (method => 'POST') => begin
-
-    <p>
-    <span class="">
-    %=l 'bac_ENABLE_WORKSTN_BACKUP'
-    </span>
-    <span class="">
-    % if ( $bac_datas->{status} eq 'checked' ) {
-    <input type='checkbox' name='Workstnbackup' checked >
-    %} else {
-    %= check_box 'Workstnbackup'
-    %}
-    </span>
-
-    </p>
-    <p>
-    <h3>
-    %= l 'bac_WORKSTATION_BACKUP_DEST'
-    </h3>
     <br>
 
-    % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
-        <span class="">
-        %=l 'bac_WORKSTN_NAME'
-        </span>
-        <span class="">
-        % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
-        %= text_field 'BackupwkStation', size => 20, class => ""
-        </span>
-    <br>
-    %}
-    % if (  $bac_datas->{vfstype} eq 'usb' ) {
-        <span class="">
-        %=l 'bac_local removable disk'
-        </span>
-        <span class="">
-        % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder';
-        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
-        </span>
-        <br>
-    % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
-    <span class="">
-        %=l 'bac_Mounted disk'
-        </span>
-        <span class="">
-        % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
-        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => ""
-        </span>
-        <br>
-    % } else {
-        <span class="">
-        %=l 'bac_SHARED_FOLDER_NAME'
-        </span><span class="">
-        % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
-        %= text_field 'BackupwkFolder', size => 20, class => ""
-        </span>
-        <br>
-    %}
-    % if (  $bac_datas->{vfstype} eq 'cifs' ) {
-        <span class="">
-        %=l 'bac_WORKSTN_LOGIN'
-        </span><span class="">
-        % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin';
-        %= text_field 'BackupwkLogin', size => 12, class => ""
-        </span>
-        <br>
-        <span class="">
-        %=l 'bac_PASSWORD'
-        </span><span class="">
-        % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword';
-        %= password_field 'BackupwkPassword', size => 12, class => ""
-        </span>
-    %}
-    </p><br><h3>
-    %= l 'bac_WORKSTN_BACKUP_SETTINGS'
-    </h3><br>
+    <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
 
-    <p>
-    <span class="">
-    %=l 'bac_NUMBER_OF_SETS'
-    </span>
-    <span class="">
-    % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber';
-    %= text_field 'SetsNumber', size => '3'
-    </span>
-    %=l 'bac_NUMBER_OF_FILES_IN_SET'
-    <span class="">
-    % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset';
-    %= text_field 'Filesinset', size => '3'
-    </span></p>
-
-    <p>
-    <span class="">
-    %=l 'bac_WORKSTN_BACKUP_TIME'
-    </span>
-    <span class="">
-    % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour';
-    %= text_field 'BackupwkHour', size => '2'
-    % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin';
-    %= text_field 'BackupwkMin', size => '2'
-    </span>
-    %=l 'AM/PM:'
-    <span class="">
-    % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM';
-    %= select_field 'BackupwkAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p>
-
-    <p><span class="">
-    %=l 'bac_WORKSTN_TIMEOUT'
-    </span>
-    <span class="">
-    % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout';
-    %= text_field 'BackupwkTimeout', size => '2'
-    </span>
-    %=l 'bac_INC_ONLY_TIMEOUT'
-    <span class="">
-    % if ( $bac_datas->{incOnlyTimeout} eq 'checked' ) {
-        <input type='checkbox' name='IncOnlyTimeout' checked  >
-    %} else {
-       %= check_box 'IncOnlyTimeout'
-    %}
-    </span></p>
-
-    <p>
-    <span class="">
-    %=l 'bac_COMPRESSION_LEVEL'
-    </span>
-    <span class="">
-    % param 'Compression' => $bac_datas->{compression} unless param 'Compression';
-    %= text_field 'Compression', size => '1'
-    </span>
-    %=l 'bac_FULL_ONLY_ON'
-    <span class="">
-    % param 'Dof' => $bac_datas->{dof} unless param 'Dof';
-    %= select_field 'Dof' => $c->get_dow_list(), class => ""
-    </p>
     <br>
 
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC')) %>
+    <div>
+
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_ENABLE_WORKSTN_BACKUP' %>
+            </div>
+            <div class="col-auto">
+            % if ( $bac_datas->{status} eq 'checked' ) {
+                <input type='checkbox' name='Workstnbackup' aria-describedby="enabled" checked >
+            % } else {
+                <input type='checkbox' name='Workstnbackup' aria-describedby="disabled">
+            % }
+            </div>
+        </div>
+
+        </p>
+        <p>
+        <h3>
+        %= l 'bac_WORKSTATION_BACKUP_DEST'
+        </h3>
+        <br>
+
+        % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputBackupWorkStationName" class="col-form-label"><%= l 'bac_WORKSTN_NAME' %></label>
+            </div>
+            <div class="col-auto">
+            % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
+                <input type="text" name="BackupwkStation" id="inputBackupWorkStationName" class="form-control"
+                size="20" aria-describedby="Workstation Name" value="<%= $bac_datas->{station} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % }
+
+        % if (  $bac_datas->{vfstype} eq 'usb' ) {
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <%= l 'bac_local removable disk' %>
+                </div>
+                <div class="col-auto">
+                    % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder';
+                    <%= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "form-select" %>
+                </div>
+            </div>
+
+            <br>
+
+        % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <%= l 'bac_Mounted disk' %>
+                </div>
+                <div class="col-auto">
+                    % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
+                    <%= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "form-select" %>
+                </div>
+            </div>
+
+            <br>
+
+        % } else {
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <label for="inputBackupSharedFolderName" class="col-form-label"><%= l 'bac_SHARED_FOLDER_NAME' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="BackupwkFolder" id="inputBackupSharedFolderName" class="form-control"
+                    size="20" aria-describedby="Backup Shared Folder Name" value="<%= $bac_datas->{folder} %>">
+                </div>
+            </div>
+
+            <br>
+
+        % }
+
+        % if (  $bac_datas->{vfstype} eq 'cifs' ) {
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <label for="inputBackupWorkLogin" class="col-form-label"><%= l 'bac_WORKSTN_LOGIN' %></label>
+                </div>
+                <div class="col-auto">
+                    % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin';
+                    <input type="text" name="BackupwkLogin" id="inputBackupWorkLogin" class="form-control"
+                    size="12" aria-describedby="Backup Workstation Login" value="<%= $bac_datas->{login} %>">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                    <label for="password" class="col-form-label"><%= l 'bac_PASSWORD' %></label>
+                </div>
+                <div class="col-auto">
+                    % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword';
+                    <input type="password" name="BackupwkPassword" id="password" class="form-control" size="12" aria-describedby="Backup Workstation Password" value="<%= $bac_datas->{password} %>">
+                </div>
+                <div class="col-auto">
+                    <span id="togglePassword" class="bi bi-eye"></span>
+                </div>
+            </div>
+        % }
+
+        <br>
+
+        <h3><%= l 'bac_WORKSTN_BACKUP_SETTINGS' %></h3>
+
+        <br>
+
+       <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputNumberofSets" class="col-form-label"><%= l 'bac_NUMBER_OF_SETS' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber';
+                <input type="text" name="SetsNumber" id="inputNumberofSets" class="form-control" maxlength="3" size="3" aria-describedby="Number of sets" value="<%= $bac_datas->{setsNumber} %>">
+            </div>
+        </div>
+
+
+
+
+         <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputFilesinSet" class="col-form-label"><%= l 'bac_NUMBER_OF_FILES_IN_SET' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset';
+                <input type="text" name="Filesinset" id="inputFilesinSet" class="form-control" maxlength="3" size="3" aria-describedby="Files in set" value="<%= $bac_datas->{filesinset} %>">
+            </div>
+        </div>
+
+
+
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputWorkstationBackupHour" class="col-form-label"><%= l 'bac_WORKSTN_BACKUP_TIME' %></label>
+                <label for="inputWorkstationBackupMin" class="col-form-label"></label>
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour';
+                <input type="text" name="BackupwkHour" id="inputWorkstationBackupHour" class="form-control" maxlength="2" size="4" aria-describedby="Backup Hour" value="<%= $bac_datas->{hour} %>">
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin';
+                <input type="text" name="BackupwkMin" id="inputWorkstationBackupMin" class="form-control" maxlength="2" size="4" aria-describedby="Backup Minute" value="<%= $bac_datas->{min} %>">
+            </div>
+            <div class="col-auto">
+                <%= l 'AM/PM:' %>
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM';
+                <%= select_field 'BackupwkAMPM' => ['AM', 'PM'], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputWorkstationTimeout" class="col-form-label"><%= l 'bac_WORKSTN_TIMEOUT' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout';
+                <input type="text" name="BackupwkTimeout" id="inputWorkstationTimeout" class="form-control" maxlength="2" size="2" aria-describedby="Workstation Timeout" value="<%= $bac_datas->{timeout} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_INC_ONLY_TIMEOUT' %>
+            </div>
+            <div class="col-auto">
+            % if ( $bac_datas->{incOnlyTimeout} eq 'checked' ) {
+                <input type='checkbox' name='IncOnlyTimeout' aria-describedby="enabled" checked >
+            % } else {
+                <input type='checkbox' name='IncOnlyTimeout' aria-describedby="disabled">
+            % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputBackupCompression" class="col-form-label"><%= l 'bac_COMPRESSION_LEVEL' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Compression' => $bac_datas->{compression} unless param 'Compression';
+                <input type="text" name="Compression" id="inputBackupCompression" class="form-control" maxlength="1" size="1" aria-describedby="Compression level" value="<%= $bac_datas->{compression} %>">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_FULL_ONLY_ON' %>
+            </div>
+            <div class="col-auto">
+                % param 'Dof' => $bac_datas->{dof} unless param 'Dof';
+                %= select_field 'Dof' => $c->get_dow_list(), class => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+        %= hidden_field 'Function' => $bac_datas->{function}
+        %= hidden_field 'VFSType' => $bac_datas->{vfstype}
+        % my $btn = l('bac_UPDATE_CONF');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+        <br>
+
+    </form>
 
-    %= hidden_field 'Function' => $bac_datas->{function}
-    %= hidden_field 'VFSType' => $bac_datas->{vfstype}
-    %= submit_button $c->l('bac_UPDATE_CONF'), class => ""
-    % end
 </div>
+
 % end

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

@@ -5,42 +5,64 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
-    %=l 'bac_WORKSTN_RESTORE'
-    </h2>
+    <h2><%= l 'bac_WORKSTN_RESTORE' %></h2>
 
-    <br><br>
-    % if ($bac_datas->{status} ne 'enabled') {
-    %= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
-    % } else {
-    %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify())
-    %}
+    <br>
 
-    <br><br><span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
-    </span><br><br>
+    <form action="/smanager/backupd" method="POST">
+
+        % if ($bac_datas->{status} ne 'enabled') {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE')) %>
+            </div>
+        % } else {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+            </div>
+        % }
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_SELECT_BACKUP_FILE' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Backupset' => $c->get_Backupset_options(), class => "form-select" %>
+            </div>
+        </div>
+
+
+        <br><br>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_RESTORE_FROM_WORKSTN');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_RESTORE_FROM_WORKSTN'), class => ""
-    % end
 </div>
 % end

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

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

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

@@ -5,49 +5,73 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br><div class="text-danger">
+        <%= $c->render_to_string(inline => stash 'error') %>
     </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
     <h2><%=l 'bac_WORKSTN_SEL_RESTORE' %></h2>
 
-    %= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify())
+    <br>
 
-    <h3><%=l 'bac_BACKUP_CHOICE' %></h3>
+    <form action="/smanager/backupd" method="POST">
 
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Restoreset_options(), class => ""
-    </span>
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_FILTER_EXPRESSION'
-    </span>
-    <span class="">
-    %= text_field 'Filterexp', size => 32, class => ""
-    </span>
-    <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('PERFORM'), class => ""
+        <div>
+            <%= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+        </div>
 
-    % end
+        <br>
+
+        <h3><%= l 'bac_BACKUP_CHOICE' %></h3>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_SELECT_BACKUP_FILE' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Backupset' => $c->get_Restoreset_options(), class => "form-select" %>
+            </div>
+        </div>
+
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+            <label for="inputFilterExpression" class="col-form-label"><%=l 'bac_FILTER_EXPRESSION' %></label>
+           </div>
+            <div class="col-auto">
+                <input type="text" name="Filterexp" id="inputFilterExpression" class="form-control" aria-describedby="Input Filter Expression">
+            </div>
+        </div>
+
+        <br><br>
+
+        %= hidden_field 'Function' => $bac_datas->{'function'}
+
+        % my $btn = l('PERFORM');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 

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

@@ -5,51 +5,71 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
+    <br>
 
     <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
+
     <br>
 
-    %= $c->render_to_string(inline => (l 'bac_READ_COMPLETE'))
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_READ_COMPLETE')) %>
+    </div>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <br><span class="">
-    %=l 'bac_SELECT_FILES_TO_RESTORE'
-    </span>
-    <span class="">
-    %= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => "", multiple => 1, size => 15
-    </span>
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_DATE_BEFORE'
-    </span>
-    <span class="">
-    %= text_field 'Seldatebefore', size => 32, class => ""
-    </span>
-    <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= hidden_field 'Backupset' => $bac_datas->{'backupset'}
-    %= hidden_field 'Filterexp' => $bac_datas->{'filterexp'}
+    <form action="/smanager/backupd" method="POST">
 
-    %= submit_button $c->l('PERFORM'), class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+            <%=l 'bac_SELECT_FILES_TO_RESTORE' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => "form-select", multiple => 1, size => 15 %>
+            </div>
+        </div>
 
-    % end
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSelectDate" class="col-form-label"><%=l 'bac_SELECT_DATE_BEFORE' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="Seldatebefore" id="inputSelectDate" class="form-control" aria-describedby="Restore most recent">
+            </div>
+        </div>
+
+        <br><br>
+
+        %= hidden_field 'Function' => $bac_datas->{'function'}
+        %= hidden_field 'Backupset' => $bac_datas->{'backupset'}
+        %= hidden_field 'Filterexp' => $bac_datas->{'filterexp'}
+
+
+        % my $btn = l('PERFORM');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    <form>
 
 </div>
 % end

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

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

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

@@ -4,59 +4,75 @@
 <div  class="card-body">
 
     % if (config->{debug} == 1) {
-        <p>
-        %= dumper $c->current_route
-        %= dumper $bac_datas
-        </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-        </div>
-    %}
+        <br><div class="text-danger">
+        <%= $c->render_to_string(inline => stash 'error') %>
+    </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_VERIFY_WORKSTN_BACKUP_FILE'
-    </h2>
-
-    %= form_for '/backup' => (method => 'POST') => begin
-
-    % if ($bac_datas->{status} ne 'enabled') {
-        %= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
-    % } else {
-        %= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify())
-    %}
-    <br>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_BACKUP_FILE'
-    </span>
-    <span class="">
-    %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""
-    </span>
     <br>
 
-    <p>
-    <span class="">
-    %=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
-    </span>
-    <span class="">
-    %= check_box 'Verifyall'
-    </span>
-    </p>
-    <br>
+    <h2><%=l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2>
 
-    %=l 'bac_CHECK_INTEGRITY_WARNING'
+    <form action="/smanager/backup" method="POST">
 
-    <br>
-    <br>
-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('bac_VERIFY'), class => ""
+        <br>
 
-    % end
+        % if ($bac_datas->{status} ne 'enabled') {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE')) %>
+            </div>
+        % } else {
+            <div>
+                <%= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify()) %>
+            </div>
+        % }
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'bac_SELECT_BACKUP_FILE' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'Backupset' => $c->get_Backupset_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-4">
+                <%=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE' %>
+            </div>
+            <div class="col-auto">
+                <input type='checkbox' name='Verifyall'>
+            </div>
+        </div>
+
+        <br>
+
+        %=l 'bac_CHECK_INTEGRITY_WARNING'
+
+        <br>
+        <br>
+        %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
+
+        % my $btn = l('bac_VERIFY');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 </div>
 % end

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

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

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

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

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

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

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

@@ -5,94 +5,127 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    (DBG)route: <%= $c->current_route %><br>
-    (DBG)trt: <%= $bugr_datas->{trt} %><br>
-    </p>
+        <div>
+            (DBG)route: <%= $c->current_route %><br>
+            (DBG)trt: <%= $bugr_datas->{trt} %><br>
+        </div>
     % }
-    
+
     <h1><%= $title %></h1>
     <!--br><%= $modul %><br-->
-
-    <b>
-        %=l ('bugr_DO_NOT_PANIC')
-    </b>
-    <p>
-        %=l ('bugr_SME_EXPERIENCE')
-    </p>
-    <p>
-    %=l ('bugr_USE_TEMPLATE')
-: <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
- target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>.
-    </p>
-    <p>
-    %=l ('bugr_PLEASE_REPORT_HERE')
-: <a href="https://bugs.koozali.org" target="_blank">https://bugs.koozali.org</a>.
-    </p>
-    <p> 
-        %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP')
-    </p>
-    <p>
-        %=l ('bugr_REPORT_CONTENT')
-        <br>
+    <br>
+    <h2><%= l ('bugr_DO_NOT_PANIC') %></h2>
+    <br>
+    <div>
+        <%= l ('bugr_SME_EXPERIENCE') %>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_USE_TEMPLATE') %>
+        : <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
+        target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_PLEASE_REPORT_HERE') %>
+        : <a href="https://bugs.koozali.org"
+        target="_blank">https://bugs.koozali.org</a>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') %>
+    </div>
+    <br>
+    <div>
+        <%= l ('bugr_REPORT_CONTENT') %>
+        <br><br>
         <ul>
-        <li>
-        %=l ('bugr_SME_VERSION')
-        </li>
-        <li>
-        %=l ('bugr_SERVER_MODE')
-        </li>
-        <li>
-        %=l ('bugr_PREVIOUS_SERVER_MODE')
-        </li>
-        <li>
-        %=l ('bugr_KERNEL_AND_ARCH')
-        </li>
-        <li>
-        %=l ('bugr_INSTALLED_RPMS')
-        </li>
-        <li>
-        %=l ('bugr_ALTERED_TEMPLATES')
-        </li>
-        <li>
-        %=l ('bugr_ALTERED_EVENTS')
-        </li> <li>
-        %=l ('bugr_YUM_REPOS')
-        </li>
-        <br>
+            <li>
+            <%= l ('bugr_SME_VERSION') %>
+            </li>
+            <li>
+            <%= l ('bugr_SERVER_MODE') %>
+            </li>
+            <li>
+            <%= l ('bugr_PREVIOUS_SERVER_MODE') %>
+            </li>
+            <li>
+            <%= l ('bugr_KERNEL_AND_ARCH') %>
+            </li>
+            <li>
+            <%= l ('bugr_INSTALLED_RPMS') %>
+            </li>
+            <li>
+            <%= l ('bugr_ALTERED_TEMPLATES') %>
+            </li>
+            <li>
+            <%= l ('bugr_ALTERED_EVENTS') %>
+            </li> <li>
+            <%= l ('bugr_YUM_REPOS') %>
+            </li>
+
         </ul>
-        %=l ('bugr_PRIVACY')
-    </p>
-
-    <% my $btn = l('bugr_CREATE_REPORT'); %>
-
-    %= form_for 'bugreport' => (method => 'POST') => begin
-        %= submit_button "$btn", class => ""
-    % end    
-
-    <p><b>
-        %=l ('bugr_DONATING')
-        </b>
-        <br><br>
-        %=l ('bugr_AWARE_SME')
-        <br><br>
-        <b>
-        %=l ('bugr_YOUR_HELP')
-        </b>
-        <br><br>
-        %=l ('bugr_CONSIDER_DONATING')
-        <br><br>
-    </p>
-
-    %= link_to 'https://wiki.koozali.org/Donate' => begin
-    %= image '/images/btn_donateCC_LG.gif'
-
-    %= hidden_field 'trt' => $bugr_datas->{trt}
-
-    % end
+    </div>
 
     <br>
-    %=l ('bugr_THANK_YOU')
+
+    <div>
+        <%= l ('bugr_PRIVACY') %>
+    </div>
+
+    <br>
+
+    % my $btn = l('bugr_CREATE_REPORT');
+
+
+    <form action="/smanager/bugreport" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => $bugr_datas->{trt} %>
+    </form>
+
+    <br>
+
+    <div>
+    <b>
+        <%= l ('bugr_DONATING') %>
+        </b>
+        <br><br>
+        <%= l ('bugr_AWARE_SME') %>
+        <br><br>
+        <b>
+        <%= l ('bugr_YOUR_HELP') %>
+        </b>
+        <br><br>
+        <%= l ('bugr_CONSIDER_DONATING') %>
+        <br><br>
+    </div>
+
+    <br>
+
+    <div>
+        <a href="https://wiki.koozali.org/Donate"
+        target="_blank">
+        <img src="/smanager/images/btn_donateCC_LG.gif" />
+        </a>
+    </div>
+
+<br>
+
+    <div>
+        <a href="https://wiki.koozali.org/Donate"
+        target="_blank">Donate
+        </a>
+    </div>
+
+
+    <br>
+    <div>
+        <%= l ('bugr_THANK_YOU') %>
+    </div>
 
 </div>
 

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

@@ -5,10 +5,10 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    (DBG)route: <%= $c->current_route %><br>
-    (DBG)trt: <%= $bugr_datas->{trt} %><br>
-    </p>
+        <div>
+            (DBG)route: <%= $c->current_route %><br>
+            (DBG)trt: <%= $bugr_datas->{trt} %><br>
+        </div>
     % }
 
     <h1><%= $title %></h1>
@@ -17,17 +17,25 @@
 
     <% my $btn = l('bugr_Download this report'); %>
 
-    %= form_for 'bugreportD' => (method => 'POST') => begin
-        %= submit_button "$btn", class => ""
-        %= hidden_field 'trt' => $bugr_datas->{trt}
-    % end   
-    
+    <form action="/smanager/bugreportD" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => $bugr_datas->{trt} %>
+    </form>
+
+
+
     % my $out = "================== <br />";
     % $out .= "Boot anaysis image (right click and save image to download)<br />";
     % $out .= "================== <br />";
     % $out .= "<img src='images/boot.svg' alt='boot timing image' width=95% >";
-    
-   <br><%= $c->render_to_string(inline=>$out) %><br>
+
+    <br>
+    <%= $c->render_to_string(inline=>$out) %>
+    <br><br>
 
 </div>
 

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

@@ -4,47 +4,65 @@
 
 <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>
-    %}
-    <h1><%= $title %></h1>
-    <br>
-    <%= $modul %>
-    <%  my $btn = l('SAVE'); %>
+    % if (config->{debug} == 1) {
+    <pre>
+        Route: <%= dumper $c->current_route %><br>
+        FsS stat: <%= dumper $clm_datas->{FilesystemScan}%> <br>
+        Quar stat: <%= dumper $clm_datas->{Quarantine} %>
+    </pre>
+    % }
 
-    %= 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 => ""
+    <h1><%= $title %></h1>
+    <!-- reetp This $module should be split ijto two lines -->
+    <%= $modul %> 
+    
+    <br><br>
+    
+    <form action="/smanager/clamav" method="POST">
+        
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>:
+            </div>
+            <div class="col-md-2">
+                % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
+                <%= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => "form-select" %>
+            </div>
+        </div>
+        
         <br>
-        </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">
+            <div class="col-md-2">
+                <%= l 'clm_LABEL_QUARANTINE' %>:
+            </div>
+            <div class="col-md-2">
+                % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine';
+                <%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
+            </div>
+        </div>
+        
         <br>
-        </span>
-    </p>
-    %= submit_button "$btn", class => ""
-    % end
+        
+        <div>
+            <div>
+                <h6><%= l 'clm_LABEL_CLAM_VERSIONS' %>:</h6>
+            </div>
+            <div>
+                <%= $clm_datas->{clam_versions} %>
+            </div>
+        </div>
+        
+        <br>
+
+        <%  my $btn = l('SAVE'); %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </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 'dist/icons/font/bootstrap-icons.min.css'
+
+%#= stylesheet 'css/sme-jquery-overrides.css'
+
+%= stylesheet 'dist/css/adminlte.min.css'
+%= stylesheet 'dist/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/datetime.html.ep

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

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

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

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

@@ -2,90 +2,132 @@
 
 % 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>
 
-    %= 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    
+        <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>
+        </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>
+        </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>
+        </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>
+        </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>
+
+    </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,91 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+    <pre>
+        %= dumper $c->current_route
+        %= dumper $mai_datas
+    </pre>
     % }
-    
+
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <br>
 
-    %=l 'mai_DESC_POP_ACCESS_CONTROL'
+    <form action="/smanager/emailsettingd" method="POST">
 
-    <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>
+        <div>
+            <%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
+        </div>
 
-    %=l 'mai_DESC_IMAP_ACCESS_CONTROL'
+        <br>
 
-    <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>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
+                <%= select_field 'POPAccess' => $c->get_pop_opt(), class => "form-select" %>
+            </div>
+        </div>
 
-    %=l 'mai_DESC_WEBMAIL'
+        <br>
 
-    <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>
+        <div>
+            <%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
+        </div>
 
-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <br>
 
-    %= hidden_field 'trt' => 'ACC'
-    % end    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
+                <%= select_field 'IMAPAccess' => $c->get_imap_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_WEBMAIL' %>
+        <div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%=l 'mai_LABEL_WEBMAIL' %>
+            </div>
+            <div class="col-auto">
+                % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
+                <%= select_field 'WebMail' => $c->get_webmail_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%= hidden_field 'trt' => 'ACC' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+
+    <br>
 
 </div>
 %end

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

@@ -5,108 +5,147 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $mai_datas %>
+        </pre>
     % }
-    
+
+
     % if ( stash 'error' ) {
         <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
-    <h1><%= $title%></h1>
+    <h1><%= $title %></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <br>
 
-    <h2>
-    %=l 'mai_TITLE_UNKNOWN'
-    </h2>
+    <form action="/smanager/emailsettingd" method="POST">
 
-    %=l 'mai_DESC_UNKNOWN'
+        <h2><%= l 'mai_TITLE_UNKNOWN' %></h2>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_UNKNOWN'
-    </span>
-    <span class="">
-    % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
-    %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => ""
-    </span>
-    </p>
+        <br>
 
-    <!--<hr class="" />-->
-    <h2>
-    %=l 'mai_TITLE_DELEGATE'
-    </h2>
+        <div>
+            <%= l 'mai_DESC_UNKNOWN' %>
+        </div>
 
-    %=l 'mai_DESC_DELEGATE'
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_DELEGATE'
-    </span>
-    <span class="">
-    % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
-    %= text_field 'DelegateMailServer', class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_UNKNOWN' %>
+            </div>
+            <div class="col-auto">
+                % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
+                <%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "form-select" %>
+            </div>
+        </div>
 
-    <!--<hr class="" />-->
-    <h2>
-    %=l 'mai_TITLE_SMARTHOST'
-    </h2>
+        <br>
 
-    %=l 'mai_DESC_SMARTHOST'
+        <!--<hr class="" />-->
+        <h2><%= l 'mai_TITLE_DELEGATE' %></h2>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST'
-    </span>
-    <span class="">
-    % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
-    %= text_field 'SMTPSmartHost', class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
-    </span>
-    <span class="">
-    % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
-    %= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_DELEGATE' %>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
-    </span>
-    <span class="">
-    % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
-    %= text_field 'SMTPAUTHPROXY_Userid', class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
-    </span>
-    <span class="">
-    % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
-    %= password_field 'SMTPAUTHPROXY_Passwd', class => ""
-    </span>
-    </p>
+        % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
 
-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDelegateMailServer" class="col-form-label"><%= l 'mai_LABEL_DELEGATE' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="DelegateMailServer" id="inputDelegateMailServer" class="form-control" aria-describedby="DelegateMailServer" value="<%= $mai_datas->{delegatemailserver} %>">
+            </div>
+        </div>
 
-    %= hidden_field 'trt' => 'DEL'
-    % end    
+        <br>
 
+        <!--<hr class="" />-->
+        <h2><%= l 'mai_TITLE_SMARTHOST' %></h2>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SMARTHOST' %>
+        </div>
+
+        <br>
+
+        % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSMTPSmartHost" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SMTPSmartHost" id="inputSMTPSmartHost" class="form-control" aria-describedby="SMTPSmartHost" value="<%= $mai_datas->{smtpsmarthost} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSMTPAuthproxy" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SMTPAUTHPROXY_Userid" id="inputSMTPAuthproxy" class="form-control" aria-describedby="SMTPAuthproxy" value="<%= $mai_datas->{smtpauthproxyuserid} %>">
+            </div>
+        </div>
+
+        <br>
+
+       % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="password" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' %></label>
+            </div>
+           <div class="col-auto">
+                <input type="password" name="SMTPAUTHPROXY_Passwd" id="password" class="form-control" aria-describedby="SMTPAuthProxyPassword" value="<%= $mai_datas->{smtpauthproxypassword} %>">
+            </div>
+            <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%= hidden_field 'trt' => 'DEL' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 </div>
 %end

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

@@ -2,130 +2,174 @@
 
 % content_for 'module' => begin
 
-<div class="card-body"
+<div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $mai_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
-
-    %=l 'mai_DESC_VIRUS_SCAN'
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_VIRUS_SCAN'
-    </span>
-    <span class="">
-    % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
-    %= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
     <br>
-    </p>
 
-    %=l 'mai_DESC_SPAM_SCAN'
+    <form action="/smanager/emailsettingd" method="POST">
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SCAN'
-    </span>
-    <span class="">
-    % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
-    %= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_VIRUS_SCAN' %>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SENSITIVITY'
-    </span>
-    <span class="">
-    % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
-    %= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_TAGLEVEL'
-    </span>
-    <span class="">
-    % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
-    %= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                    <%= l 'mai_LABEL_VIRUS_SCAN' %>
+            </div>
+            <div class="col-auto">
+                % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
+                <%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_REJECTLEVEL'
-    </span>
-    <span class="">
-    % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
-    %= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SORTSPAM'
-    </span>
-    <span class="">
-    % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
-    %= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_SPAM_SCAN' %>
+        </div>
 
-    %=l 'mai_DESC_SPAM_SUBJECT'
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SUBJECTTAG'
-    </span>
-    <span class="">
-    % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
-    %= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_SCAN' %>
+            </div>
+            <div class="col-auto">
+                % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
+                <%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SUBJECT'
-    </span>
-    <span class="">
-    % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
-    %= text_field 'SpamSubject' => class => ""
-    </span>
-    </p>
+        <br>
 
-    %=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_SENSITIVITY' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
+                <%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_CONTENT_TO_BLOCK'
-    </span>
-    <span class="">
-    % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
-    %= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "", multiple => "1"
-    </span>
-    </p>
+        <br>
 
-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_TAGLEVEL' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
+                <%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "form-select" %>
+            </div>
+        </div>
 
-    %= hidden_field 'trt' => 'FIL'
-    % end
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_REJECTLEVEL' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
+                <%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SORTSPAM' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
+                 <%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_SPAM_SUBJECT' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_SPAM_SUBJECTTAG' %>
+            </div>
+            <div class="col-auto">
+                % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
+                <%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSpamSubjectTag" class="col-form-label"><%= l 'mai_LABEL_SPAM_SUBJECT' %></label>
+            </div>
+            <div class="col-auto">
+                <!-- text_field 'Soft' -->
+                <input type="text" name="SpamSubject" id="inputSpamSubjectTag" class="form-control" aria-describedby="SpamSubjectTag" value="<%= $mai_datas->{spamsubject} %>">
+            </div>
+        </div>
+
+
+
+        <br>
+
+        <div>
+            <%= l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'mai_LABEL_CONTENT_TO_BLOCK' %>
+            </div>
+            <div class="col-auto">
+                % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
+                <%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "form-select", multiple => "1" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%= hidden_field 'trt' => 'FIL'  %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 %end

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

@@ -8,196 +8,279 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    %= dumper $c->param('SMTPAuth')
-    </p>
+        <pre>
+            <<%=  dumper $c->current_route %>
+            <<%=  dumper $mai_datas %>
+            <<%=  dumper $c->param('SMTPAuth') %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
         <br>
-        <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <<%=  $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
-    
-    <h1><%= $title%></h1>
+    % }
 
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
+    <h1><%=  $title %></h1>
 
-    %=l 'mai_DESC_MODE'
+    <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_MODE'
-    </span>
-    <span class="">
-    % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
-<!--
-    <pre>
-        %= dumper $mai_datas->{fetchmailmethod}
-        %= dumper $c->get_retrieval_opt()
-        %= param 'FetchmailMethod'
-    </pre>
--->
-    %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => ""
-    </span>
-    </p>
+    <form action="/smanager/emailsettingd" method="POST">
 
-    %#=l 'mai_DESC_SMTP_AUTH_CONTROL'
-    <br />
-    %= l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client."
-    <br />
-    %= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send."
-    <br />
-    %= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send."
-    <br />
+        <div>
+            <%= l 'mai_DESC_MODE' %>
+        </div>
 
-    % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-    </span>
-    <span class="">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_MODE' %>
+            </div>
+            <div class="col-auto">
+                % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
+                <!--
+                <pre>
+                    <%=  dumper $mai_datas->{fetchmailmethod}  %>
+                    <%=  dumper $c->get_retrieval_opt()  %>
+                    <%=  param 'FetchmailMethod'  %>
+                </pre>
+                -->
+                <%=  select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class =>"form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+
+        <div>
+            <div>
+                <b><i>Note - this first line was disabled?</b></i>
+
+                <br>
+                <%= l 'mai_DESC_SMTP_AUTH_CONTROL'  %>
+                <br>
+                <b><i>/end</b></i>
+            </div>
+
+            <br>
+
+            <div>
+                <%=  l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client." %>
+            </div>
+
+            <br>
+
+            <div>
+
+                <%=  l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %>
+            </div>
+
+            <br>
+
+            <div>
+                <%=  l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." %>
+            </div>
+
+        </div>
+
+        <br>
+
+
+
+        % my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
         % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
-<!--
-    <pre>
-        %= dumper $c->get_smtp_auth_opt()
-        %= dumper $c->get_current_smtp_auth(FALSE)
-        %= dumper $c->get_db_prop("qpsmtpd","Authentication")
-        %= param 'SMTPAuth'
-    </pre>
--->
-        %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => ""
-    </span>
-    </p>
 
-    % my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-    </span>
-    <span class="">
-        % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';    
-        %= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=  sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
+            </div>
+            <div class="col-auto">
 
-    %my $smtp_mesg=l('Submission port %u status:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-    </span>
-    <span class="">
+                <!--
+                <pre>
+                    <%=  dumper $c->get_smtp_auth_opt() %>
+                    <%=  dumper $c->get_current_smtp_auth(FALSE) %>
+                    <%=  dumper $c->get_db_prop("qpsmtpd","Authentication") %>
+                    <%=  param 'SMTPAuth'  %>
+                </pre>
+                -->
+                <%=  select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
+        % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=  sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $smtp_mesg=l('Submission port %u status:');
         % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
-    <!--
-    <pre>
-        %= dumper $c->get_smtp_ssl_auth_opt()
-        %= dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE)
-        %= dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE)
-        %= dumper $c->get_db_prop("uqpsmtpd","access")
-        %= param 'uSMTPAuth'
-    </pre>
-    -->
-    %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => ""
-    </span>
-    </p>
 
-    <!--<hr class="" />-->
-    <h2>
-    %=l 'mai_TITLE_SECONDARY'
-    </h2>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=  sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
+            </div>
+            <div class="col-auto">
+                <!--
+                <pre>
+                    <%=  dumper $c->get_smtp_ssl_auth_opt() %>
+                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) %>
+                    <%=  dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) %>
+                    <%=  dumper $c->get_db_prop("uqpsmtpd","access") %>
+                    <%=  param 'uSMTPAuth' %>
+                </pre>
+                -->
+                <%=  select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
+            </div>
+        </div>
 
-    %=l 'mai_DESC_SECONDARY'
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SECONDARY'
-    </span>
-    <span class="">
-    % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
-    %= text_field 'SecondaryMailServer', class => ""
-    </span>
-    </p>
+        <h2><%= l 'mai_TITLE_SECONDARY' %></h2>
 
-    %=l 'mai_DESC_FETCH_PERIOD'
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_FETCH_PERIOD'
-    </span>
-    <span class="">
-    % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
-    %= select_field 'FreqOffice' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_SECONDARY' %>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
-    </span>
-    <span class="">
-    % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
-    %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
-    </span>
-    <span class="">
-    % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
-    %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => ""
-    </span>
-    </p>
+        % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_ACCOUNT'
-    </span>
-    <span class="">
-    % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
-    %= text_field 'SecondaryMailAccount', class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSecondaryMailServer" class="col-form-label"><%= l 'mai_LABEL_SECONDARY' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SecondaryMailServer" id="inputSecondaryMailServer" class="form-control" aria-describedby="SecondaryMailServer" value="<%= $mai_datas->{secondarymailserver} %>">
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_PASS'
-    </span>
-    <span class="">
-    % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
-    %= password_field 'SecondaryMailPassword', class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SORT_METHOD'
-    </span>
-    <span class="">
-    % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
-    %= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => ""
-    </span>
-    </p>
+        <div>
+            <%= l 'mai_DESC_FETCH_PERIOD' %>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SORT_HEADER'
-    </span>
-    <span class="">
-    % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
-    %= text_field 'SecondaryMailEnvelope', class => ""
-    </span>
-    </p>
+        % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
 
-    %   my $btn = l('SAVE');
-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_FETCH_PERIOD' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'FreqOffice' => $c->fetchmail_freq(), class => "form-select" %>
+            </div>
+        </div>
 
-    %= hidden_field 'trt' => 'REC'
-    % end    
+        <br>
+
+        % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_FETCH_PERIOD_NIGHTS' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'FreqOutside' => $c->fetchmail_freq(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'FreqWeekend' => $c->fetchmail_freq(), class => "form-select" %>
+             </div>
+        </div>
+
+        <br>
+
+        % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSecondaryMailAccount" class="col-form-label"><%= l 'mai_LABEL_POP_ACCOUNT' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SecondaryMailAccount" id="inputSecondaryMailAccount" class="form-control" aria-describedby="SecondaryMailAccount" value="<%= $mai_datas->{secondarymailaccount} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="password" class="col-form-label"><%= l 'mai_LABEL_POP_PASS' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="password" name="SecondaryMailPassword" id="password" class="form-control" aria-describedby="SecondaryMailPassword" value="<%= $mai_datas->{secondarymailpassword} %>">
+            </div>
+            <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+        </div>
+
+
+        <br>
+
+        % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SORT_METHOD' %>
+            </div>
+            <div class="col-auto">
+                <%=  select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputSecondaryMailEnvelope" class="col-form-label"><%= l 'mai_LABEL_SORT_HEADER' %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="SecondaryMailEnvelope" id="inputSecondaryEnvelope" class="form-control" aria-describedby="SecondaryMailEnvelope" value="<%= $mai_datas->{secondarymailenvelope} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('SAVE');
+        <%=  hidden_field 'trt' => 'REC' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
-%end
+%end
+

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

@@ -5,190 +5,224 @@
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
+<!-- see ibays as an example with partials -->
+
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $mai_datas
-    </p>
+        <pre>
+            <%= dumper $c->current_route %>
+            <= dumper $mai_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     %}
 
     <h1><%= $title%></h1>
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_POP_ACCESS_CONTROL'
-    </span>
-    <span class="">
-    %= $c->get_current_pop3_access( TRUE )
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-    </span>
-    <span class="">
-    %= $c->get_current_imap_access( TRUE )
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_WEBMAIL'
-    </span>
-    <span class="">
-    %= $c->get_current_webmail_status( TRUE )
-    </span>
-    </p>
-
-    %  my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
-    <div class="">
-    %= submit_button "$btn", class => ""
-    </div>
-
-    %= hidden_field 'trt' => 'ACC'
-    % end   
-    <br> 
-
-    <!--<hr class="" />-->
-    
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_VIRUS_SCAN'
-    </span>
-    <span class="">
-    %= $c->get_virus_status(TRUE)
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SPAM_SCAN'
-    </span>
-    <span class="">
-    %= $c->get_spam_status(TRUE)
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT'
-    </span>
-    <span class="">
-    %= $c->get_patterns_status(TRUE)
-    </span>
-    </p>
-
-    %   my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
-    <div class="">
-    %= submit_button "$btn", class => ""
-    </div>
-
-    %= hidden_field 'trt' => 'FIL'
-    % end  
-    <br>  
-
-    <!--<hr class="" />-->
-
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_MODE'
-    </span>
-    <span class="">
-    %= $mai_datas->{fetchmailmethod}
-    </span>
-    </p>
-    
-    % my $smtp_mesg;
-
-    % $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-    </span>
-    <span class="">
-        %= $c->get_current_smtp_auth( TRUE )
-    </span>
-    </p>
-
-    % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-    </span>
-    <span class="">
-        %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )
-    </span>
-    </p>
-
-    % $smtp_mesg=l 'Submission port %u status:';
-    <p>
-    <span class="">
-        %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-    </span>
-    <span class="">
-    %= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE )
-    </span>
-    </p>
-    <br />
-
-    % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
-    <div class="">
-    %= submit_button "$btn", class => ""
-    </div>
-
-    %= hidden_field 'trt' => 'REC'
-    % end    
     <br>
 
+    <form action="/smanager/emailsettings" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_POP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+            <%= $c->get_current_pop3_access( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_imap_access( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_WEBMAIL' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_webmail_status( TRUE ) %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
+        <%= hidden_field 'trt' => 'ACC' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+
+    <br><br>
+
     <!--<hr class="" />-->
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_UNKNOWN'
-    </span>
-    <span class="">
-    %= $c->get_emailunknownuser_status( TRUE )
-    </span>
-    </p>
+    <form action="/smanager/emailsettings" method="POST">
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_DELEGATE'
-    </span>
-    <span class="">
-    %= $c->get_value('DelegateMailServer')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_VIRUS_SCAN' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_virus_status(TRUE) %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'mai_LABEL_SMARTHOST'
-    </span>
-    <span class="">
-    %= $c->get_value('SMTPSmartHost')
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <%= l 'mai_LABEL_SPAM_SCAN' %>
+            </div>
+           <div class="col-auto">
+           <%= $c->get_spam_status(TRUE) %>
+           </div>
+        </div>
 
-    % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
-    <div class="">
-        %= submit_button "$btn", class => ""
-    </div>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_patterns_status(TRUE) %>
+            </div>
+        </div>
 
-    %= hidden_field 'trt' => 'DEL'
-    % end    
+        <br>
 
+        % my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
+        <%= hidden_field 'trt' => 'FIL' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
+
+    <br><br>
+
+    <!--<hr class="" />-->
+
+    <form action="/smanager/emailsettings" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_MODE' %>
+            </div>
+            <div class="col-auto">
+                <%= $mai_datas->{fetchmailmethod} %>
+            </div>
+        </div>
+
+        % my $smtp_mesg;
+
+        % $smtp_mesg=l('SMTP port %u allow client to authenticate:');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_auth( TRUE ) %>
+            </div>
+        </div>
+
+        % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %>
+            </div>
+        </div>
+
+        % $smtp_mesg=l 'Submission port %u status:';
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
+        <%= hidden_field 'trt' => 'REC' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
+
+    <br><br>
+
+    <!--<hr class="" />-->
+
+    <form action="/smanager/emailsettings" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_UNKNOWN' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_emailunknownuser_status( TRUE ) %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_DELEGATE' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_value('DelegateMailServer') %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'mai_LABEL_SMARTHOST' %>
+            </div>
+            <div class="col-auto">
+                <%= $c->get_value('SMTPSmartHost') %>
+            </div>
+        </div>
+
+        <br>
+
+
+        % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
+        <%= hidden_field 'trt' => 'DEL' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+        <br>
+
+    </form>
 </div>
+
 %end

root/usr/share/smanager/themes/AdminLTE/templates/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>
+       <pre>
+           <%= dumper $c->current_route %>
+           <%= dumper $iba_datas %>
+       </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
     % 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/initial.html.ep

@@ -13,14 +13,14 @@
     % if ( stash 'error' ) {
         <br>
         <div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        %= $c->render_to_string(inline => stash 'error')
         </div>
     % }
 
-    <h3><%= $title %> </h3> 
+    <h3><%= $title %> </h3>
     <!--     <h3>template: initial.html.ep</h3> -->
     <!--     <H1>Initial AdminLTE</H1> -->
-    
+
     %= $modul
 
 </div>

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

@@ -1,33 +1,39 @@
-<!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'
+    %= 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'
-        %= include 'common_js'
+
     % }
 
-    %= content_for 'refresh'
-
-    %= include 'common_css'
-
-
-<!-- Custom overrides? -->
-
-% if ($c->current_route eq 'nutups') {
-    %= include 'partials/_nutups_overrides'
-% }
+    % if ($c->current_route eq 'nutups') {
+        %= include 'partials/_nutups_overrides'
+    % }
 
 </head>
 
@@ -51,7 +57,7 @@
         <!--begin::Header-->
 
             <nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
-    
+
                 <!--begin::Container-->
                 <div class="container-fluid">
                   <!--begin::Start Navbar Links-->
@@ -62,10 +68,10 @@
                         <i class="bi bi-list"></i>
                       </a>
                     </li>
-    
+
                     <li class="nav-item d-none d-md-block"><a href="/smanager" class="nav-link">Home</a></li>
                     % if ( not defined $c->session->{username} ) {
-                    <li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>    
+                    <li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>
                     % } else {
                     <li class="nav-item d-none d-md-block"><a href="logout" class="nav-link">Logout</a></li>
                     % }
@@ -74,12 +80,12 @@
                     </li>
                   </ul>
                   <!--end::Start Navbar Links-->
-    
+
                     <!-- this can do direct to header so always available-->
                     % if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
                     %= include 'partials/_swt_theme'
                     % }
-    
+
                 </div>
                 <!--end::Container-->
             </nav>
@@ -106,23 +112,23 @@
                     <!--end::Brand Link-->
                 </div>
                 <!--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">
-    
+
                             %= include 'partials/_sidebar_support_menu'
-    
+
                             % if ( $c->is_logged_in ) {
                             %= include 'partials/_sidebar_user_menu'
                             % }
-    
+
                             % if ( $c->is_admin ) {
                             %= include 'partials/_sidebar_main_menu'
                             % }
-    
+
                         </ul>
                         <!--end::Sidebar Menu-->
                     </nav>
@@ -136,10 +142,10 @@
         <!--begin::App Main-->
 
             <main class="app-main">
-    
+
             <!-- Can add a header row here? -->
             <!-- %= include 'partials/_app_content_header' -->
-    
+
                 <!--begin::App Content-->
                 <div class="app-content">
                     <!--begin::Container-->
@@ -147,16 +153,16 @@
                         <!--begin::Rows-->
                         <!-- Add breadcrumb here -->
                         %= include 'partials/_app_content_breadcrumb'
-    
+
                         <!-- We can add extra rows in the main panel here -->
-    
+
                         <!-- %#= include 'partials/_app_content_first_row' -->
                         <!-- %#= include 'partials/_app_content_demo_row' -->
-    
+
                         <!--end::Rows-->
-    
-                        <br>
-    
+
+                        <!-- <br> -->
+
                         <!-- This is the main page content depening on the calling module -->
                         <!-- nameofpanel.html.ep -->
                         <!-- That will also include it's own _partials -->
@@ -165,16 +171,17 @@
                             %= include 'partials/_panel_card_top'
                             %= include 'partials/_panel_card_header'
                         % }
+
                         %= content 'module'
 
                         % if ($c->current_route ne 'login') {
                             %= include 'partials/_panel_card_footer'
                             %= include 'partials/_panel_card_bottom'
-                        % }    
+                        % }
                     </div>
                 </div>
                 <!--end::App Content-->
-    
+
             </main>
         <!--end::App Main-->
 

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

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

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

@@ -5,16 +5,17 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    %= dumper $c->param("localnetwork");
-    %= dumper $c->stash("ln_datas");
-    %= dumper $c->param("deletehost");
-    </p>
+        <div>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+            <%= dumper $c->param("localnetwork") %>
+            <%= dumper $c->stash("ln_datas") %>
+            <%= dumper $c->param("deletehost") %>
+        </div>
     % }
-    
+
     <h1><%= $title%></h1>
+
      %= $modul
 
     % if ($ln_datas->{trt} eq 'ADD') {
@@ -30,4 +31,5 @@
     %}
 
 </div>
+
 %end

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

@@ -2,28 +2,35 @@
 
 % content_for 'module' => begin
 
-  %if ( config 'debug' ) {
-  <p>
-  <!-- %= dumper $c->current_route -->
-  %if ( stash 'trt' ) {
-      %= dumper stash 'trt'
-  %}
-  </p>
-    %}
+  % if (config->{debug} == 1) {
+  <div>
+      <%= dumper $c->current_route %>
+      % if ( stash 'trt' ) {
+          <%= dumper stash 'trt' %>
+      % }
+  </div>
+  % }
 
 % if ( stash 'error' ) {
-      <br><div class="">
-      %= $c->render_to_string(inline => stash 'error') 
-  </div>
-%}
+    <br>
+    <div class="container text-center">
+        <div class="row">
+            <div class="col-sm">
+                <div class="text-danger">
+                <%= $c->render_to_string(inline => stash 'error') %>
+                </div>
+        </div>
+    </div>
+% }
 
 % my $btn = l('use_SIGNIN');
 % if ( $trt eq 'RESET' ) {
-      <br><div class=""><h2>
-      %= $c->render_to_string(inline => l 'use_DESC_RESET') 
-  </h2></div>
+      <br>
+      <div>
+          <h2><%= $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 -->
@@ -36,9 +43,11 @@
             </div>
             <br>
             <a href="/smanager" class="link-dark text-center link-offset-2 link-opacity-100 link-opacity-50-hover">
-              <h1 class="mb-0"><b>Koozali</b></h1><br><h3>Server Manager</h3>
+              <h1 class="mb-0"><b>Koozali</b></h1>
+              <br>
+              <h3>Server Manager</h3>
             </a>
-            <br> 
+            <br>
             <h1 class="text-center">
                 %=l 'use_TITLE'
             </h1>
@@ -55,16 +64,19 @@
               </div>
               <div class="input-group-text"><span class="bi bi-person-fill"></span></div>
             </div>
+
             <div class="input-group mb-1">
               <div class="form-floating">
-                <input name='Password' id="Password" type="password" class="form-control" placeholder="<%=l 'PASSWORD'%>">
-                <label for="Password">Password</label>
+                <input type="password" name="Password" id="password" class="form-control" placeholder="<%=l 'PASSWORD'%>" autocomplete="on">
+                <label for="password">Password</label>
+              </div>
+              <div class="input-group-text">
+                <span id="togglePassword" class="bi bi-eye"></span>
               </div>
-              <div class="input-group-text"><span class="bi bi-lock-fill"></span></div>
             </div>
 
-            %= hidden_field 'From' => $c->tx->req->url
-            %= hidden_field 'Trt' => stash 'trt'
+            <%= hidden_field 'From' => $c->tx->req->url %>
+            <%= hidden_field 'Trt' => stash 'trt' %>
 
             <!--begin::Row-->
             <div class="row">
@@ -77,14 +89,19 @@
               <!-- /.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 -->
             </div>
             <!--end::Row-->
           </form>
-          <p class="mb-1"><a href="login2">I forgot my password</a></p>
+          <br>
+          <!--
+          <div class="mb-1 text-center">
+              <a href="login2">I forgot my password</a>
+          </div>
+          -->
         </div>
         <!-- /.login-card-body -->
       </div>

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

@@ -8,14 +8,14 @@
 
 <div class="card-body">
     % if (config->{debug} == 1) {
-        <p>
+        <div>
             <strong>Debug Info:</strong>
             <pre><%= dumper $c->current_route %></pre>
-        </p>
+        </div>
     % }
-    
+
     % if (stash 'error') {
-        <div class="">
+        <div>
             <strong>Error:</strong><br>
             <%= $c->render_to_string(inline => stash 'error') %>
         </div>
@@ -23,7 +23,7 @@
 
     <h1><%= $title %></h1>
 
-    <div class="">
+    <div>
         <%= $c->render_to_string(inline => stash 'modul') %>
     </div>
 </div>

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

@@ -1,29 +1,38 @@
 <div>
 
-    %   my $btn = l('REMOVE');
-    %= form_for '/domains2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'dom_REMOVE_TITLE'
-    </h2>
-    </p>
+    % my $btn = l('REMOVE');
 
-    <p>
-    %= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
-    </p>
-    
-    <p><b>
-    %= l('dom_ABOUT_TO_REMOVE')
-    <b></p>
+    <form action="/smanager/domain2" method="POST">
 
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+         <br>
 
-        %= hidden_field 'trt' => $dom_datas->{trt}
-        %= hidden_field 'Domain' => $dom_datas->{domain}
+         <div>
+             <h2><%=l 'dom_REMOVE_TITLE' %></h2>
+         </div>
 
-    % end    
+         <br>
+
+         <div>
+              <%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); %>
+         </div>
+
+         <br>
+
+         <div class="text-danger">
+             <%= l('dom_ABOUT_TO_REMOVE') %>
+         </div>
+
+         <br>
+
+         <div class="row g-3 align-items-center">
+             <div class="col-md-2">
+                 <button type="submit" class="btn btn-danger"><%= $btn %></button>
+             </div>
+         </div>
+
+         <%= hidden_field 'trt' => $dom_datas->{trt} %>
+         <%= hidden_field 'Domain' => $dom_datas->{domain} %>
+
+    </form>
 
 </div>

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

@@ -1,127 +1,123 @@
 <div>
 
     % my $btn = l('dom_ADD_DOMAIN');
+    <%= l('dom_FORM_DESCRIPTION'); %>
 
-
-    %= form_for '/domains' => (method => 'POST') => begin
-
-        %= l('dom_FORM_DESCRIPTION');
-        
-        <p>
+    <form action="/smanager/domains" method="POST">
         <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' => 'ADD' %>
+    </form>
 
-        %= hidden_field 'trt' => 'ADD'
-    
-    % end
+    <br>
+
+    <div>
+        <h2><%=l 'dom_CURRENT_DOMAINS' %></h2>
+    </div>
+
+    <br>
 
-    <h2>
-        %=l 'dom_CURRENT_DOMAINS'
-    </h2>
     <table class="table table-bordered">
-    <thead>
-    <tr>
-        <th class="">
-            %=l 'DOMAIN_NAME'
-        </th>
-        <th class="">
-            %=l 'DESCRIPTION_BRIEF'
-        </th>
-        <th class="">
-            %=l 'dom_CONTENT'
-        </th>
-        <th class="">
-            %=l 'dom_LABEL_NAMESERVERS'
-        </th>
-        <th class="">
-            %=l 'ACTION'
-        </th>
-    </tr>
-    </thead>
-    <tbody>
+        <thead>
+            <tr>
+                <th class="col-sm"><%=l 'DOMAIN_NAME' %></th>
+                <th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
+                <th class="col-sm"><%=l 'dom_CONTENT' %></th>
+                <th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
+                <th class="col-sm text-center" colspan="2"><%=l 'ACTION' %></th>
+            </tr>
+        </thead>
 
-    % foreach my $domain ( @$domains ) {
-        <tr>
-            %= t td => (class => "") => $domain->{Domain}
-            %= t td => (class => "") => $domain->{'Description'}
-            %= t td => (class => "") => $domain->{'Content'}
-            %= t td => (class => "") => l('dom_' . $domain->{'Nameservers'})
+        <tbody>
 
-        %#  my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>"; 
-            %my $modify_text = l('MODIFY');  # Localized text
-            %my $csrf_token = "TOKEN";  # CSRF token for security
-            %my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
-            %my $actionModify = qq{
-                        %       <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
-            %   <button type='button' class="" title='$modify_text' >
-            %       $modify_text
-            %   </button>
-                        %       </a>
-            %};
-            %my $removable = ($domain->{Removable} || 'yes');
-            %my $actionRemove = '&nbsp;';
-            %if ($removable eq 'yes')  { 
-                    %my $remove_text = l('REMOVE');  # Localized text
-                    %my $csrf_token = "TOKEN";  # CSRF token for security
-                    %my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
-                    %$actionRemove = qq{
-                                                %       <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
-                        %   <button type='button' class="" title='$remove_text' >
-                        %       $remove_text
-                        %   </button>
-                                                %       </a>
+            % foreach my $domain ( @$domains ) {
+                <tr>
+                    <td><%= $domain->{Domain} %></td>
+                    <td><%= $domain->{'Description'} %></td>
+                    <td><%= $domain->{'Content'} %></td>
+                    <td><%= l('dom_' . $domain->{'Nameservers'}) %></td>
+
+                    %#  my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
+                    % my $modify_text = l('MODIFY');  # Localized text
+                    % my $csrf_token = "TOKEN";  # CSRF token for security
+                    % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+                    % my $actionModify = qq{
+                    % <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
+                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                    %       $modify_text
+                    %   </button>
+                    % </a>
                     %};
-                %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>"; 
-            %};
-            <td class="" style="min-width:15em">
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-            </td>
-        </tr>
-    %   }
+                    % my $removable = ($domain->{Removable} || 'yes');
+                    % my $actionRemove = '&nbsp;';
+                    % if ($removable eq 'yes')  {
+                            % my $remove_text = l('REMOVE');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+                            % $actionRemove = qq{
+                                % <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                            %};
+                        %# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
+                    %};
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                </tr>
+            % }
 
-    </tbody>
+        </tbody>
     </table>
 
-    %= hidden_field 'trt' => 'ADD'
+    <%= hidden_field 'trt' => 'ADD' %>
 
-    %= form_for '/domains' => (method => 'POST') => begin
+    <form action="/smanager/domains" method="POST">
 
         <!-- <HR class="">-->
         <br>
 
         % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
 
-        <h3>
-            %= l 'dom_DESC_CORPORATE_DNS_CURRENT'
-            </h3>
+        <h3><%= l 'dom_DESC_CORPORATE_DNS_CURRENT' %></h3>
 
-        <p>
-        <span class="">
-        %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
-        </span>
-        <span class="">
-        %= $dom_datas->{forwarder}
-        </span>
-        </p>
-
-        % if ($dom_datas->{forwarder2}) {
-        <p>
-        <span class="">
-        %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
-        </span>
-        <span class="">
-        %= $dom_datas->{forwarder2}
-        </span>
-        </p>
+        % if ($dom_datas->{forwarder}) {
+        <div class="row g-3 align-items-center">
+            <div class="col-md-3">
+                <%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %>
+            </div>
+            <div class="col-auto">
+                <%= $dom_datas->{forwarder} %>
+            </div>
+        </div>
         % }
 
-        <p>
-        %= submit_button "$btn2", class => ""
-        </p>
-        %= hidden_field 'trt' => 'UP2'
-    % end
+        % if ($dom_datas->{forwarder2}) {
+            <div class="row g-3 align-items-center">
+                <div class="col-md-3">
+                     <%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %>
+                </div>
+                <div class="col-auto">
+                     <%= $dom_datas->{forwarder2} %>
+                </div>
+            </div>
+        % }
 
+        <br>
 
+        <div class="row g-3 align-items-center">
+            <div class="col-md-auto">
+                <button type="submit" class="btn btn-primary"><%= $btn2 %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => 'UP2' %>
+
+    </form>
 
 </div>

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

@@ -1,39 +1,46 @@
 <div>
 
-    %   my $btn = l('SAVE');
+    % my $btn = l('SAVE');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
+    <form action="/smanager/domains2" method="POST">
 
-    <p><br>
-    %=l 'dom_DESC_CORPORATE_DNS'
-    </p>
+        <div>
+            <%=l 'dom_DESC_CORPORATE_DNS' %>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
-    </span>
-    <span class="">
-    % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
-    %= text_field 'Forwarder', class => ""
-    </span>
-    </p>
+        <br>
 
-    <p>
-    <span class="">
-    %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => ""
-    </span>
-    <span class="">
-    % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
-    %= text_field 'Forwarder2',  class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-3">
+                <label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
+                <input type="text" name="Forwarder" id="inputCorpDNSPrimary" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{forwarder} %>">
+            </div>
+       </div>
 
-    <p>
-    %= submit_button "$btn", class => ""
-    </p>
+        <br>
 
-    %= hidden_field 'trt' => $dom_datas->{trt}
-    
-    %end
+        <div class="row g-3 align-items-center">
+            <div class="col-md-3">
+               <label for="inputCorpDNSSecondary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %></label>
+            </div>
+            <div class="col-auto">
+               % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
+               <input type="text" name="Forwarder2" id="inputCorpDNSSecondary" class="form-control" aria-describedby="inputCorpDNSSecondary" value="<%= $dom_datas->{forwarder2} %>">
+            </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' => $dom_datas->{trt} %>
+
+    </form>
 
 </div>

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

@@ -1,74 +1,88 @@
 <div>
 
-    %   my $btn = l('ADD');
+    % my $btn = l('ADD');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    % if ( $dom_datas->{trt} eq "ADD" ) {
-    %=l 'dom_CREATE_TITLE'
-    % } else {
-    %=l 'dom_MODIFY_TITLE'
-    %   $btn = l('MODIFY');
-    % }
-    </h2>
-    </p>
+    <form action="/smanager/domains2" method="POST">
 
-    <p><br>
-    <span class="">
-    %=l 'DOMAIN_NAME', class => ""
-    </span>
-    <span class="">
-    % if ( $dom_datas->{trt} eq "ADD" ) {
-    % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
-    %= text_field 'Domain', class => ""
-    % } else {
-        %= hidden_field 'Domain' => $dom_datas->{domain}
-    %= $dom_datas->{domain}, class => ""
-    % }
-    </span>
-    </p>
+        <br>
 
-    <p><br>
-    <span class="">
-    %=l 'DESCRIPTION_BRIEF', class => ""
-    </span>
-    <span class="">
-    % param 'Description' => $dom_datas->{description} unless param 'Description';
-    %= text_field 'Description', class => ""
-    </span>
-    </p>
+        <div>
+            <h2>
+            % if ( $dom_datas->{trt} eq "ADD" ) {
+                <%=l 'dom_CREATE_TITLE' %>
+            % } else {
+                <%=l 'dom_MODIFY_TITLE' %>
+                % $btn = l('MODIFY');
+            % }
+            </h2>
+        </div>
 
-    <p><br>
-    %=l 'dom_CONTENT_FIELD_DESCRIPTION'
-    <br>
-    <span class="">
-    %= $c->l('dom_CONTENT', '');
-    </span>
-    <span class="">
-    % param 'Content' => $dom_datas->{content} unless param 'Content';
-    %= select_field 'Content', $c->content_options_list(), class => ""
-    </span>
-    </p>
+        <br>
 
-    <p><br>
-    %=l 'dom_DESC_NAMESERVERS'
-    <br>
-    <span class="">
-    %=l 'dom_LABEL_NAMESERVERS', class => ""
-    </span>
-    <span class="">
-    % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
-    %= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
-    </span>
-    </p>
+        <div class="row g-3 algn-items-center">
+            <div class="col-md-2">
+                        <label for="Domain" class="col-form-label"><%=l 'DOMAIN_NAME' %></label>
+            </div>
+            <div class="col-auto">
+            % if ( $dom_datas->{trt} eq "ADD" ) {
+                % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
+                <input type="text" name="Domain" id="Domain" class="form-control" aria-describedby="inputDomain" value="<%= $dom_datas->{domain} %>">
+            % } else {
+                <%= hidden_field 'Domain' => $dom_datas->{domain} %>
+                <%= $dom_datas->{domain} %>
+            % }
+            </div>
+        </div>
 
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <br>
 
-    %= hidden_field 'trt' => $dom_datas->{trt}
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Description' => $dom_datas->{description} unless param 'Description';
+                <input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
+            </div>
+        </div>
 
-    %end
+        <br>
+        <%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Content' => $dom_datas->{content} unless param 'Content';
+                <%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
+            </div>
+        </div>
+
+        <br>
+        <%=l 'dom_DESC_NAMESERVERS' %>
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+            <label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
+                <%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
+            </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' => $dom_datas->{trt} %>
+
+    </form>
 
 </div>

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

@@ -9,4 +9,4 @@
     % }
     <br>Copyright 1999-2006 Mitel Corporation<br>
     %= session 'copyRight'
-    <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
+    <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>
 
-        %= hidden_field 'trt' => $grp_datas->{trt}
-        %= hidden_field 'groupName' => $grp_datas->{group}
+        <%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %>
 
-    % end    
+        <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-danger"><%= $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/_grp_list.html.ep

@@ -2,73 +2,64 @@
 
     % my $btn = l('GROUP_ADD');
 
-    %= form_for '/groups' => (method => 'POST') => begin
+    <form action="/smanager/groups2" method="POST">
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+            </div>
+        </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 align-middle" 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    
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $group_name = $group->key;  # group name extracted from the data structure
 
+                            % my $modify_text = l('MODIFY');  # Localized text
+                            % my $actionModify = qq{
+                                % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
+                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                                %       $modify_text
+                                %   </button>
+                                % </a>
+                            %};
 
-	<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 $remove_text = l('REMOVE');  # Localized text
+                            % my $actionRemove = qq{
+                                % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                            %};
 
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="align-middle"><%= $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,34 @@
 <div>
 
     %   my $btn = l('REMOVE');
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'hos_REMOVE_TITLE'
-    </h2>
-    </p>
 
-    <p>
-    %= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname});
-    </p>
-    
-    <p><b>
-    %=l 'hos_ABOUT_TO_REMOVE'
-    </b></p>
+    <form action="/smanager/hostentriesd" method="POST">
 
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div>
+            <h2><%= l 'hos_REMOVE_TITLE'%> </h2>
+        </div>
 
-        %= hidden_field 'trt' => $hos_datas->{trt}
-        %= hidden_field 'Hostname' => $hos_datas->{hostname}
+        <br>
 
-    % end    
+        <div>
+            <%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %>
+        </div>
+
+        <br>
+
+        <b><%= l 'hos_ABOUT_TO_REMOVE' %></b>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-danger"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $hos_datas->{trt} %>
+        <%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
+
+    </form>
 
 </div>

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

@@ -2,85 +2,73 @@
 
     % my $btn = l('hos_ADD_HOSTNAME');
 
-    %= form_for '/hostentries' => (method => 'POST') => begin
+    <form action="/smanager/hostentriesd" method="POST">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => $hos_datas->{trt} %>
+    </form>
 
-    <p>
-    %= submit_button "$btn", class => ""
-    <br></p>
+    % my %dom_hos = %{$dom_hosts};
+    % foreach my $domain ( sort ( keys %dom_hos ) ) {
 
-        %= hidden_field 'trt' => $hos_datas->{trt}
+        <br>
+            <%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
+        <br>
 
-    % end
+        <table class="table table-bordered">
+            <thead>
+                <tr class="">
+                    <th class="col-sm"><%= l 'hos_HOSTNAME' %></th>
+                    <th class="col-auto"><%= l 'hos_HOSTTYPE' %></th>
+                    <th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
+                    <th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
+                    <th class="col-auto"><%= l 'COMMENT' %></th>
+                    <th class="align-middle" colspan="2"><%= l 'ACTION' %></th>
+                </tr>
+            </thead>
 
-    %   my %dom_hos = %{$dom_hosts};
-    %  foreach my $domain ( sort ( keys %dom_hos ) ) {
+            <tbody>
+            % foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
+                <tr>
+                    <td><%= $_->{'HostName'}; %></td>
+                    <td><%= $_->{'HostType'}; %></td>
+                    <td><%= $_->{'IP'}; %></td>
+                    <td><%= $_->{'MACAddress'}; %></td>
+                    <td><%= $_->{'Comment'}; %></td>
 
-    <p><br><b>
-    %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
-    </b><br></p>
-    
-    <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>
+                        % 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>
+                            %};
+                        % }
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
-    %   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>
-    </table>
+                </tr>
+               % }
+            </tbody>
+        </table>
      %  }
 </div>

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

@@ -1,62 +1,71 @@
 <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">
 
-    <p>
-    %=l 'hos_LOCAL_PAGE_DESCRIPTION'
-    </p>
+        % if ( $hos_datas->{trt} eq "ALC" ) {
+            <h2><%= l 'hos_CREATE_TYPE'  %></h2>
+        % } else {
+            <h2><%= l 'hos_MODIFY_TYPE' %></h2>
+            % $btn = l('MODIFY');
+        % }
 
-    <p>
-    %=l 'hos_LOCAL_IP_DESCRIPTION'
-    </p>
+        <div>
+            <%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
+        </div>
+        <div>
+            <%= l 'hos_LOCAL_IP_DESCRIPTION' %>
+        </div>
 
-    <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>
+        <br>
 
-    <p>
-    %=l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'hos_LOCAL_IP' %>
+            </div>
+            <div class="col-auto">
+                % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
+                <%= text_field 'Internalip' %>
+            </div>
+        </div>
 
-    <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>
+        <br>
 
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div>
+            <%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
+        </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}
-    
-    %end
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'hos_ETHERNET_ADDRESS' %>
+            </div>
+            <div class="col-auto">
+                % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
+                <%= text_field 'Macaddress' %>
+            </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' => $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} %>
+
+
+    </form>
 
 </div>

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

@@ -1,81 +1,92 @@
 <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">
 
-    <p>
-    %=l 'hos_HOSTNAME_DESCRIPTION'
-    </p>
+        % if ( $hos_datas->{trt} eq "ADD" ) {
+            <h2><%=l 'hos_CREATE_TITLE' %></h2>
+        % } else {
+              <h2><%=l 'hos_MODIFY_TITLE' %></h2>
+              % $btn = l('MODIFY');
+         % }
 
-    <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>
+            <%= l 'hos_HOSTNAME_DESCRIPTION' %>
+        </div>
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=l 'hos_HOSTNAME' %>
+            </div>
+            <div class="col-auto">
+            % if ( $hos_datas->{trt} eq "ADD" ) {
+                % param 'Name' => $hos_datas->{name} unless param 'Name';
+                <%= text_field 'Name' %>
+           % } else {
+               <%= hidden_field 'Name' => $hos_datas->{name} %>
+               <%= $hos_datas->{name} %>
+           % }
+            </div>
+        </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>
+        <br>
 
-    <p>
-    <span class="">
-    %= $c->l('COMMENT', '');
-    </span>
-    <span class="">
-    % param 'Comment' => $hos_datas->{comment} unless param 'Comment';
-    %= text_field 'Comment', class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'DOMAIN' %>
+            </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 class="col-auto">
+             % 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>
 
-    <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">
+                <label for="inputHostComment" class="col-form-label"><%= $c->l('COMMENT', ''); %></label>
+            </div>
+            <div class="col-auto">
+                % param 'Comment' => $hos_datas->{comment} unless param 'Comment';
+                <input type="text" name="Comment" id="inputHostComment" class="form-control" aria-describedby="inputHostComment" value="<%= $hos_datas->{comment} %>">
 
-    %end
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+             <%=l 'LOCATION' %>
+            </div>
+            <div class="col-auto">
+               % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
+               <%= select_field 'Hosttype', $c->hosttype_list(), class => "form-select"; %>
+            </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' => $hos_datas->{trt} %>
+         <%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
+         <%= hidden_field 'Internalip' => $hos_datas->{internalip} %>
+         <%= hidden_field 'Externalip' => $hos_datas->{externalip} %>
+         <%= hidden_field 'Macaddress' => $hos_datas->{macaddress} %>
+
+    </form>
 
 </div>

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

@@ -3,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,31 @@
 <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>
 
-        %= hidden_field 'trt' => $iba_datas->{trt}
-        %= hidden_field 'ibay' => $iba_datas->{ibay}
+    <form action="/smanager/ibaysd" method="POST">
 
-    % end
+        <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-danger"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $iba_datas->{trt} %>
+        <%= hidden_field 'ibay' => $iba_datas->{ibay} %>
+    </form>
 
 </div>

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

@@ -3,111 +3,114 @@
 
     % my $btn = l('iba_ADD_IBAY');
 
-    %= form_for '/ibays' => (method => 'POST') => begin
+    <form action="/smanager/ibays" method="POST">
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+            </div>
+        </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 align-middle" 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="">
+                         % 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="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionResetPw)%></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                     </td>
+                 </tr>
+             % }
+             </tbody>
+         </table>
+    % }
 
 </div>

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

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

@@ -1,47 +1,64 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
 
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
+<!-- reetp this isn't required? -->
+<!--
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
+-->
 
-	% 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.
+    % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $lets_data %>
+        </pre>
+    % }
 
-		<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">
-                        %       <input class="" type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
+
+        %# Inputs etc in here.
+
+        <h1><%=l('lets_Check_all_domains')%></h1>
+
+        <br>
+
+        <h2><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
+
+        <br>
+
+        <!-- results box-->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                %=l('lets_All_domains_check_result')
+            </div>
+            <div class="col-auto">
+                % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
+                %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+            </div>
+        </div>
+
+        <br>
+
+        %# my $btn = l('lets_APPLY');
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+
+        % my $back_text = l('lets_Back');  # Localized text
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+            </div>
+        </div>
+
+    <!-- </form> -->
 
-		%# Probably finally by a submit.
-	%end    
 </div>

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

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

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

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

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

@@ -1,152 +1,236 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
 
-		<div>
+<!-- reetp Move to JS file -->
+    <!--
+    <script>
+        window.onload = function() {
+        SelectInput();
+    };
+    </script>
+    -->
+
+    % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $lets_data %>
+        </pre>
+    % }
+
+
+    <br>
+
+    <!-- reetp  could change this to a form -->
+
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
+    %# my $btn = l('lets_APPLY');
+    %# param 'trt' => $lets_data->{trt} unless param 'trt';
+    %#= hidden_field 'trt' => $lets_data->{trt}
+
+    % my $modifybtn = l ('MODIFY');
+    % my $checkbtn = l ('lets_CHECK');
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l('lets_CONFIG') %>
+        </div>
+        <div class="col-md-1 text-center">
+            <a href='letsencryptd?trt=PARAMS' class="btn btn-primary btn-sm" role="button"><%= $modifybtn %></a>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l ('lets_CHECK_ALL_DOMAINS') %>
+        </div>
+        <div class="col-md-1 text-center">
+            <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+        </div>
+        <div class="col-md-1 text-center">
+            <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
+        </div>
+
+    <div>
+
+<br>
+
+<!--
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1 border text-center">
+            <%= l('lets_CONFIG') %>
+        </div>
+        <div class="col-md-2 border text-center">
+            <%= l ('lets_CHECK_ALL_DOMAINS') %>
+        </div>
+        <div class="col-md-2 border text-center">
+            <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+        </div>
+    <div>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1 border text-center">
+            <a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+        <div class="col-md-2 border text-center">
+            <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+        <div class="col-md-2 border text-center">
+            <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+    </div>
+
+-->
+
+
+    <!-- </form>  -->
+
+
+    <br><br>
+
+    <h2><%=l('lets_For_this_Server') %></h2>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputInternalIP" class="col-form-label"><%= l ('lets_Internal_IP') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
+            <input type="text" name="InternalIP" id="inputInternalIP" class="form-control" aria-describedby="Disabled Internal IP" value="<%=$lets_data->{InternalIP}%>" disabled readonly>
+            %#= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputExternalIP" class="col-form-label"><%= l ('lets_External_Interface_IP') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
+            <input type="text" name="ExternalIP" id="inputExternalIP" class="form-control" aria-describedby="Disabled External Interface IP" value="<%=$lets_data->{ExternalIP}%>" disabled readonly>
+            %#= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputInternetIP" class="col-form-label"><%= l ('lets_Internet_IP') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
+            <input type="text" name="InternetIP" id="inputInternetIP" class="form-control" aria-describedby="Disabled Internet IP" value="<%=$lets_data->{InternetIP}%>" disabled readonly>
+            %#= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+        </div>
+    </div>
+
+    <br><br>
+
+    <h2><%=l('lets_Current_certificate_details') %></h2>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+           <label for="inputIssuer" class="col-form-label"><%= l ('lets_Issuer') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
+            <input type="text" name="Issuer" id="inputIssuer" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Issuer}%>" disabled readonly>
+            %#= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputExpiry" class="col-form-label"><%= l ('lets_Expiry') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
+            <input type="text" name="Expiry" id="inputExpiry" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Expiry}%>" disabled readonly>
+            %#= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputNotBefore" class="col-form-label"><%= l ('lets_Not_Before') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
+            <input type="text" name="NotBefore" id="inputNotBefore" class="form-control" aria-describedby="Disabled Not before" value="<%=$lets_data->{NotBefore}%>" disabled readonly>
+            %#= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
+        </div>
+    </div>
+
+    <br><br>
+
+    <h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
+
+    <br>
+
+    <table class="table table-bordered">
+        <thead>
+            <tr table-head-row>
+                <th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
+                <th><%= l ('lets_Brief_description') %></th>
+                <th class="text-center"><%= l ('lets_Content') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_NAMESERVERS') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_POINT') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_LECERT') %></th>
+                <th class="text-center"><%= l ('lets_IS_IN_CERT') %></th>
+                <th class="text-center"><%= l ('lets_CHECK') %></th>
+            </tr>
+        </thead>
+        <tbody>
+            % my $control_data = $c->stash('DomainList');
+            % foreach my $row (@$control_data) {
+                % my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
+                % my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
+                <tr>
+                    % if  ($type eq "Domain\n"){
+                        <td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
+                    % }
+                    % if ($type eq "Host\n") {
+                        <td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
+                    % }
+
+                    <td ><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
+
+                    % if ($link ne "") {
+                    <td class="text-center"><a href= "<%= $link %>" class="btn btn-primary btn-sm" role="button" > <%= $checkbtn %></a></td>
+                    % } else {
+                        <td>&nbsp</td>
+                    % }
+                </tr>
+            % }
+        </tbody>
+    </table>
 
-		<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    
 </div>

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

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

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

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

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

@@ -4,62 +4,82 @@
     % my $deletehosts = $ln_datas->{deletehosts};
     % my $subnet = $ln_datas->{subnet};
     % my $router = $ln_datas->{router};
-    
+
    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
-    %= dumper %$ln_datas
-    %= dumper $deletehosts
-	</p>
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $c->stash("ret") %>
+        <%= dumper %$ln_datas %>
+        <%= dumper $deletehosts %>
+    </pre>
     % }
 
-    %= 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
+    <form action="/smanager/localnetworkse" method="POST">
+
+        <div>
+            <h2><%= l "ln_REMOVE_TITLE" %></h2>
+        </div>
+
+        <div>
+            <%= l "ln_REMOVE_DESC" %>
+        </div>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" value="<%= $localnetwork %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" value="<%= $subnet %>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+              <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" value="<%= $router %>">
+            </div>
+        </div>
+
+        <br>
+
+        % if ($deletehosts) {
+            <br>
+
+            <div>
+                <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
+            <br>
+            <div class="text-danger align-bottom">
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
+            </div>
+            <br><br>
+        % }
+
+        <%= hidden_field localnetwork=>$localnetwork %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>

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

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

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

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

@@ -1,73 +1,98 @@
 <div>
 
-    % my $btn = l('REMOVE');
     % my $proto = $pf_datas->{proto};
     % my $sport = $pf_datas->{sport};
     % my $dport = $pf_datas->{dport};
     % my $dhost = $pf_datas->{dhost};
     % my $cmmnt = $pf_datas->{cmmnt};
     % my $allow = $pf_datas->{allow};
-    
-   % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
-    %= dumper %$pf_datas
-	</p>
-    % }
-     
-    %= form_for '/portforwardinge' => (method => 'POST') => begin
-        <br>
-		%= l "pf_SUMMARY_REMOVE_DESC"
-			</p><br>
-			<span class="">
-				%=l "pf_LABEL_PROTOCOL"
-			</span>
-			<span class="">
-				%=$proto
-			</span><br><br>
-			<span class="">
-				%=l "pf_LABEL_SOURCE_PORT"
-			</span>
-			<span class="">
-				%=$sport
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_LABEL_DESTINATION_HOST"
-			</span>
-			<span class="">
-				%=$dport
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_LABEL_DESTINATION_PORT"
-			</span>
-			<span class="">
-				%=$dhost
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_RULE_COMMENT"
-			</span>
-			<span class="">
-				%=$cmmnt
-			</span>
-			<br><br>
-			<span class="">
-				%=l "pf_ALLOW_HOSTS"
-			</span>
-			<span class="">
-				%=$allow
-			</span>
-			<br><br>
-		%#}
-			%= hidden_field sport=>$sport
-			%= hidden_field proto=>$proto
-			<br>
-			%= submit_button "$btn", class => ""
-			</p>
 
-	%end
+   % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+            <%= dumper %$pf_datas %>
+        </pre>
+    % }
+
+    <form action="/smanager/portforwardinge" method="POST">
+
+        <br>
+        <div>
+            <%= l 'pf_SUMMARY_REMOVE_DESC' %>
+        </div>
+
+        <br>
+
+        <table>
+        <thead>
+            <th class="col-md-4">&nbsp</th>
+            <th class="col-md-4">&nbsp</th>
+        </thead>
+            <tbody>
+                <tr >
+                    <td>
+                        <%= l 'pf_LABEL_PROTOCOL' %>
+                    </td>
+                    <td>
+                       <%= $proto %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_SOURCE_PORT' %>
+                    </td>
+                    <td>
+                       <%= $sport %>
+                    </td>
+                <tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_DESTINATION_HOST' %>
+                    </td>
+                    <td>
+                       <%= $dport %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_DESTINATION_PORT' %>
+                    </td>
+                    <td>
+                       <%= $dhost %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_RULE_COMMENT' %>
+                    </td>
+                    <td>
+                        <%= $cmmnt %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_ALLOW_HOSTS' %>
+                    </td>
+                    <td>
+                        <%= $allow %>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+        <br>
+
+        <%= hidden_field sport=>$sport %>
+        <%= hidden_field proto=>$proto %>
+
+        % my $btn = l('REMOVE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

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

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

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

@@ -1,51 +1,61 @@
 <div>
 
-    % 	my $btn = l('ADD');
+    <h2><%=l 'prt_CREATE_NEW_PRINTER' %></h2>
 
-    %= form_for '/printers2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'prt_CREATE_NEW_PRINTER'
-	</h2>
-	<br>
-	%=l 'prt_CREATE_NEW_DESC'
-	</p>
-	<br>
+    <br>
 
-	<p>
-	<span class="">
-	%=l 'prt_PRINTER_NAME', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Name', class => ""
-	</span>
-	</p>
+    <form action="/smanager/printers2" method="POST">
 
-	<p>
-	<span class="">
-	%=l 'DESCRIPTION_BRIEF', class => ""
-	</span>
-	<span class="">
-	%= text_field 'Description', class => ""
-	</span>
-	</p>
+        <br>
 
-	<p>
-	<span class="">
-	%=l 'LOCATION', class => ""
-	</span>
-	<span class="">
-	%= select_field 'Location' => $c->printerLocation_list(), class => ""
-	</span>
-	</p>
+        <div>
+            <%= l 'prt_CREATE_NEW_DESC' %>
+        </div>
 
-	<p>
-	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+        <br>
 
-	%= hidden_field 'trt' => $prt_datas->{trt}
-	
-    % end    
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputPrinterName" class="col-form-label"><%= l 'prt_PRINTER_NAME' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Name" id="inputPrinterName" class="form-control" aria-describedby="Printer Name">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputPrinterDesc" class="col-form-label"><%= l 'DESCRIPTION_BRIEF' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Description" id="inputPrinterDesc" class="form-control" aria-describedby="Printer Description">
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l 'LOCATION'%>
+                </div>
+                <div class="col-auto">
+                    <%= select_field 'Location' => $c->printerLocation_list(), class => "form-select" %>
+                </div>
+            </div>
+
+        <br><br>
+
+        <%= hidden_field 'trt' => $prt_datas->{trt} %>
+
+        % my $btn = l('ADD');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

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

@@ -1,30 +1,38 @@
 <div>
-    % 	my $btn = l('REMOVE');
-    %= form_for '/printers2' => (method => 'POST') => begin
-	<p>
-	<h2>
-	%=l 'prt_REMOVE_PRINTER'
-	</h2>
-	<br><br>
 
-	<%=l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%>
-	(<%=$prt_datas->{description}%>)
-	<br>
+    <h2><%= l 'prt_REMOVE_PRINTER' %></h2>
 
-	%=l 'prt_SPOOL_FILE_WARNING'
-	<br>
+    <form action="/smanager/printers2" method="POST">
 
-	%=l 'prt_ARE_YOU_SURE'
-	</p>
+    <br>
 
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+    <div>
+        <%= l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%> (<%=$prt_datas->{description}%>)
+    </div>
 
+    <br>
+
+    <div class="text-danger">
+       <%= l 'prt_SPOOL_FILE_WARNING' %>
+    </div>
+
+    <br>
+
+    <div>
+        <%= l 'prt_ARE_YOU_SURE' %>
+    </div>
+
+    <br>
         %= hidden_field 'trt' => $prt_datas->{trt}
         %= hidden_field 'printer' => $prt_datas->{printer}
 
-    % end    
+        % my $btn = l('REMOVE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

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

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

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

@@ -2,97 +2,84 @@
 
     % my $btn = l('pse_CLICK_TO_CREATE');
 
-    %= $c->render_to_string(inline => l('pse_DESCRIPTION'));
+    <form action="/smanager/pseudonyms" method="POST">
+        <%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+        <%= hidden_field 'trt' => 'ADD' %>
+    </form>
 
-    %= form_for '/pseudonyms' => (method => 'POST') => begin
+    <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 align-middle" colspan="2"><%= l 'ACTION' %></th>
+                <!-- <th class="" style="display: normal;"></th> -->
+            </tr>
+        </thead>
+        <tbody>
 
-        %= hidden_field 'trt' => 'ADD'
+            % foreach my $pseudonym ( @$pseudonyms ) {
+            % my $modifiable = $pseudonym->prop('Changeable') || 'yes';
+            % my $removable = $pseudonym->prop('Removable') || 'yes';
 
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
-    
-    % end    
+            % my $account = $pseudonym->prop('Account');
+            % $account = "Administrator" if ($account eq "admin");
+            % $account = $c->l("pse_EVERYONE") if ($account eq "shared");
 
+            % my $visible = $pseudonym->prop('Visible');
+            % $account .= $c->l("pse_LOCAL_ONLY")
+            % if (defined $visible && $visible eq "internal");
 
-    <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>
+                <tr>
+                    <td><%= $pseudonym->key%></td>
+                    <td><%= $account%></td>
 
-        <!-- <th class="" style="display: normal;"></th> -->
-    </tr>
-    </thead>
-    <tbody>
+                        % 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>
+                            % };
+                        % }
 
-    %    foreach my $pseudonym ( @$pseudonyms )
-    %    {
-    %       my $modifiable = $pseudonym->prop('Changeable') || 'yes';
-    %       my $removable = $pseudonym->prop('Removable') || 'yes';
+                        % if ($removable eq 'yes')  {
+                            %my $remove_text = l('REMOVE');  # Localized text
+                            %my $csrf_token = "TOKEN";  # CSRF token for security
+                            %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+                            %$actionRemove = qq{
+                            % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   $remove_text
+                            %   </button>
+                            % </a>
+                            % };
+                        % }
 
-    %       my $account = $pseudonym->prop('Account');
-    %       $account = "Administrator" if ($account eq "admin");
-    %       $account = $c->l("pse_EVERYONE") if ($account eq "shared");
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
-    %       my $visible = $pseudonym->prop('Visible');
-    %       $account .= $c->l("pse_LOCAL_ONLY")
-    %       if (defined $visible && $visible eq "internal");
-
-        <tr>
-            %= t td => (class => "") => $pseudonym->key
-            %= t td => (class => "") => $account
-
-            <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>
-                    %};
-                %}
-
-                %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,90 @@
 <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 %>
+
+    % if (config->{debug} == 1) {
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $userAccounts %>
+    </pre>
+    % }
+
+    <h2><%= l 'quo_CURRENT_USAGE_AND_SETTINGS' %></h2>
 
     <br>
-    %   my $numUsers = @$userAccounts;
-    %   if ($numUsers == 0){
-        %=l 'ACCOUNT_USER_NONE'
-    %   } 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;
 
-    <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>
 
-    %    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>
+    % if ($numUsers == 0){
+        <div>
+            <%= l 'ACCOUNT_USER_NONE' %>
+        </div>
+    % } 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#;
+
+        <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 align-middle"><%= l 'ACTION' %></th>
+                </tr>
+            </thead>
+
+            <tbody>
+
+            % foreach my $user (@$userAccounts) {
+
+            % my $uid = getpwnam($user->key);
+
+            % if (config->{debug} == 1) {
+                UID <%= l 'quo_COULD_NOT_GET_UID' %> <%= dumper $user->key %><br>
+            % }
+
+            <br>
+            % unless ($uid) {
+            %     warn (l 'quo_COULD_NOT_GET_UID', $user->key);
+            %     next;
+            % }
+            % my $name = $user->prop("FirstName")." ".$user->prop("LastName");
+            % my $dev = Quota::getqcarg('/home/e-smith/files');
+            % my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+
+                <tr>
+                    <td><%= $user->key %></td>
+                    <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="align-middle"><%= $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/_rvw_content.html.ep

@@ -2,8 +2,8 @@
     <table class="table table-bordered">
         <thead>
             <tr>
-            <th><%= l 'rvw_NETWORKING_PARAMS' %></th>
-            <th>&nbsp</th>
+            <th class="col-md-2"><%= l 'rvw_NETWORKING_PARAMS' %></th>
+            <th class="col-auto">&nbsp</th>
             </tr>
         </thead>
         <tbody>
@@ -11,19 +11,19 @@
             <td><%= l 'rvw_SERVER_MODE' %></td>
             <td><%= $rvw_datas->{servermode} %></td>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %></td>
             <td><%= $rvw_datas->{localip} %></td>
             </tr>
-            
+
             % if ( $rvw_datas->{publicip} ) {
                 <tr>
                 <td><%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %></td>
                 <td><%= $rvw_datas->{publicip} %></td>
-                </tr>        
+                </tr>
             % }
-            
+
             <tr>
             <td><%= l 'rvw_GATEWAY'%></td>
             <td>
@@ -31,24 +31,24 @@
             <%= $rvw_datas->{serveronly} %>
             </td>
             </tr>
-            
+
             <tr>
             <td>Local Networks (not translated?)</td>
             <td><%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%> </td>
             <tr>
-            
+
             <tr>
             <td><%= l 'rvw_DHCP_SERVER' %></td>
             <td><%= $rvw_datas->{dhcpserver} %></td>
             </tr>
         </tbody>
     </table>
-            
+
     <table class="table table-bordered">
         <thead>
             <tr>
-            <th><%= l 'rvw_SERVER_NAMES' %></th>
-            <th>&nbsp</th>
+            <th class="col-md-2"><%= l 'rvw_SERVER_NAMES' %></th>
+            <th class="col-auto">&nbsp</th>
             </tr>
         </thead>
         <tbody>
@@ -56,34 +56,34 @@
             <td><%= l 'rvw_DNS_SERVER' %></td>
             <td><%= $rvw_datas->{dnsserver} %></td>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_WEB_SERVER' %></td>
             <td><%= $rvw_datas->{webserver} %></tr>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_PROXY_SERVER' %></td>
             <td><%= $rvw_datas->{proxyserver} %></tr>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_FTP_SERVER' %></td>
             <td><%= $rvw_datas->{ftpserver} %></tr>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %></td>
             <td><%= $rvw_datas->{smtpserver} %></tr>
             </tr>
         </tbody>
     </table>
-            
+
     <table class="table table-bordered">
         <thead>
             <tr>
-            <th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
-            <th>&nbsp</th>
+            <th class="col-md-2"><%= l 'rvw_DOMAIN_INFORMATION' %></th>
+            <th class="col-auto">&nbsp</th>
             </tr>
         </thead>
         <tbody>
@@ -91,7 +91,7 @@
             <td><%= l 'rvw_PRIMARY_DOMAIN' %></td>
             <td><%= $rvw_datas->{domainname} %></td>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_VIRTUAL_DOMAINS' %></td>
             <td><%= $rvw_datas->{virtualdomains} %></td>
@@ -100,22 +100,22 @@
             <td><%= l 'rvw_PRIMARY_WEB_SITE' %></td>
             <td><%= $rvw_datas->{primarywebsite} %></td>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_SERVER_MANAGER' %></td>
             <td><%= $rvw_datas->{servermanager} %></td>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_USER_PASSWORD_PANEL' %></td>
             <td><%= $rvw_datas->{usermanager} %></td>
             </tr>
-            
+
             <tr>
             <td><%= l 'rvw_EMAIL_ADDRESSES' %></td>
             <td><%= $rvw_datas->{emailaddresses} %></td>
             </tr>
-      
+
         </tbody>
     </table>
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_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

@@ -25,17 +25,15 @@
 <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_field 'Theme' => $c->theme_list(), class => "form-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>
 
 

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

@@ -1,28 +1,54 @@
-<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>
-    
-    <br>
-    %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
-    <br>
-    %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
-    </p>
+    <form action="/smanager/useraccountsd" method="POST">
 
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <div>
+            <h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
+        </div>
+        <br>
+        <div>
+        Needs a text change in the Lex files
+        <br>
+        %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
+        </div>
+
+        <br><br>
+
+        <table class="table table-bordered user-table-max-width">
+            <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-danger"><%= $btn %></button>
+            </div>
+        </div>
+
+        <%= hidden_field 'trt' => $usr_datas->{trt} %>
+        <%= hidden_field 'user' => $usr_datas->{user} %>
+        <%= hidden_field 'name' => $usr_datas->{name} %>
+
+    </form>
 
-    %= hidden_field 'trt' => $usr_datas->{trt}
-    %= hidden_field 'user' => $usr_datas->{user}
-    %= hidden_field 'name' => $usr_datas->{name}
-    
-    % end    
 
 </div>

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

@@ -1,165 +1,161 @@
 <div>
 
-
     % my $btn = l('usr_ADD_USER');
 
-    %= form_for '/useraccounts' => (method => 'POST') => begin
+    <form action="/smanager/useraccounts" method="POST">
+        <br>
+        <div>
+            <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+        </div>
+    </form>
 
-<div>
-    <button type="submit" class="btn btn-primary"><%= $btn %> </button>
-</div>
-
-    % end    
-
-    <p>
-    %= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
     <br>
-    </p>
-    
-    %   my $numUsers = @$users;
-    %   if ($numUsers == 0){
-        %=l 'usr_NO_USER_ACCOUNTS'
-    %   } else {
-    <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) {
+    <%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) %>
+    <br>
 
-    %    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>
-                 <td><%= $username %></td>
-                 <td><%=$first %>&nbsp<%=$last %></td>
-                 <td><%= $vpnaccess %></td>
-                 <td><%= $fwd %></td>
-     
-                 % 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="btn btn-primary" title='$modify_text'>
-                         %       $modify_text
-                         %   </button>
-                         %</a>&nbsp;
-                     %};                             
-                     %$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>&nbsp;
-                     %};
-                 %} 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>&nbsp;
-                     %};
-                 %}
-                 %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="btn btn-primary" title="$password_text - currently unset" style = background:pink; >
-                             %       $password_text
-                             %   </button>
-                         %</a>&nbsp;
-                     %};
-                 %} 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="btn btn-primary" title='$lock_text' >
-                             %       $lock_text
-                             %   </button>
-                         %</a>&nbsp;
-                         %};
-                     %$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>&nbsp;
-                         %};
-                 %}
-                 %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="btn btn-primary" title='$remove_text' >
-                         %       $remove_text
-                         %   </button>
-                         %</a>&nbsp;
-                     %};
-                 %}
-                 
-                 % 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="btn btn-primary" title='$roundcube_text' >
-                     %       $roundcube_text
-                     %   </button>
-                     %</a>&nbsp;
-                 %};
-                 <td>          
-                         <%= $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>
-             </tr>
-        % }
-        </tbody>
+    %#= 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 class="text-center text-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 class="align-middle">
+                    <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="text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionLock) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
+                </tr>
+                % }
+            </tbody>
         </table>
+    </div>
 
-    <%} %>
+    % }
 
-        %= hidden_field 'trt' => $usr_datas->{trt}
+    <%= hidden_field 'trt' => $usr_datas->{trt} %>
 
 </div>
 
-
-<div>
-
-</div>