Text input migration progress (#2963)

* Update some text inputs on Add/Edit User forms

* Improve checkbox "checked" attribute

- No quotes around the value i.e. renders as `checked=yes`
- Value is unnecessary anyway

* Migrate text inputs in Add/Edit Mail forms

* Migrate some text input in Add Mail Account form

* Migrate text inputs in Add/Edit IP Address form

* More consistent table HTML

* Migrate some text input in Edit Mail Account form

* Migrate text inputs on List Mail DNS form

* Remove important

* More consistent width

web/css/src/themes/default.css

@@ -3908,6 +3908,10 @@ meter[value="4"]::-moz-meter-bar { background: green; }
   padding-top: 6px !important;
 }
 
+.u-pt10 {
+  padding-top: 10px !important;
+}
+
 .u-pt18 {
   padding-top: 18px !important;
 }

web/templates/pages/add_cron.html

@@ -336,8 +336,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/add_ip.html

@@ -42,28 +42,20 @@
 						</tr>
 						<tr>
 							<td class="u-pt18">
-								<?=_('IP address') ?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+								<label for="v_ip" class="form-label"><?=_('IP address') ?></label>
+								<input type="text" class="form-control u-input-width" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Netmask');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_netmask" value="<?=htmlentities(trim($v_netmask, "'"))?>">
+								<label for="v_netmask" class="form-label"><?=_('Netmask');?></label>
+								<input type="text" class="form-control u-input-width" name="v_netmask" id="v_netmask" value="<?=htmlentities(trim($v_netmask, "'"))?>">
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
 								<label for="v_interface" class="form-label"><?=_('Interface');?></label>
-								<select class="form-select" name="v_interface" id="v_interface">
+								<select class="form-select u-input-width" name="v_interface" id="v_interface">
 									<?php
 										foreach ($interfaces as $key => $value) {
 											echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
@@ -77,7 +69,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_shared" id="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');">
+									<input class="form-check-input" type="checkbox" name="v_shared" id="v_shared" <?php if (empty($v_dedicated)) echo 'checked' ?> onclick="javascript:elementHideShow('usrtable');">
 									<label for="v_shared">
 										<?=_('Shared');?>
 									</label>
@@ -100,26 +92,22 @@
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Assigned domain');?> <span class="optional">(<?=_('optional');?>)</span>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
+								<label for="v_name" class="form-label">
+									<?=_('Assigned domain');?> <span class="optional">(<?=_('optional');?>)</span>
+								</label>
+								<input type="text" class="form-control u-input-width" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('NAT IP association');?> <span class="optional">(<?=_('optional');?>)</span>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
+								<label for="v_nat" class="form-label">
+									<?=_('NAT IP association');?> <span class="optional">(<?=_('optional');?>)</span>
+								</label>
+								<input type="text" class="form-control u-input-width" name="v_nat" id="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
 							</td>
 						</tr>
 					</table>
-					<table class="data-col2"></table>
+					<table class="data-col2 u-mb20"></table>
 				</td>
 			</tr>
 		</table>

web/templates/pages/add_mail.html

@@ -62,14 +62,14 @@
 							<tr>
 								<td class="u-pt18">
 									<label for="v_domain" class="form-label"><?=_('Domain');?></label>
-									<input type="text" class="form-control" name="v_domain" id="v_domain" style="max-width: 341px" value="<?=htmlentities(trim($v_domain, "'"))?>">
+									<input type="text" class="form-control u-input-width" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
 								</td>
 							</tr>
 							<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
 								<tr>
 									<td class="u-pt18">
 										<label for="v_webmail" class="form-label"><?=_('Webmail Client');?></label>
-										<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6" style="max-width: 360px">
+										<select class="form-select u-input-width" name="v_webmail" id="v_webmail" tabindex="6">
 											<?php foreach ($webmail_clients as $client){
 												echo "\t\t\t\t<option value=\"".htmlentities($client)."\"";
 												if (( $v_webmail == $client )) {
@@ -87,7 +87,7 @@
 								<tr>
 									<td class="u-pt18">
 										<div class="form-check">
-											<input class="form-check-input" type="checkbox" name="v_antispam" id="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>>
+											<input class="form-check-input" type="checkbox" name="v_antispam" id="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo 'checked'; ?>>
 											<label for="v_antispam">
 												<?=_('AntiSpam Support');?>
 											</label>
@@ -97,7 +97,7 @@
 								<tr>
 									<td class="u-pt6">
 										<div class="form-check">
-											<input class="form-check-input" type="checkbox" name="v_reject" id="v_reject" <?php if ((empty($v_reject)) || ($v_reject == 'yes')) echo "checked=yes"; ?>>
+											<input class="form-check-input" type="checkbox" name="v_reject" id="v_reject" <?php if ((empty($v_reject)) || ($v_reject == 'yes')) echo 'checked'; ?>>
 											<label for="v_reject">
 												<?=_('Reject spam');?>
 											</label>
@@ -109,7 +109,7 @@
 								<tr>
 									<td class="u-pt6">
 										<div class="form-check">
-											<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>>
+											<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo 'checked'; ?>>
 											<label for="v_antivirus">
 												<?=_('AntiVirus Support');?>
 											</label>
@@ -120,7 +120,7 @@
 							<tr>
 								<td class="u-pt6">
 									<div class="form-check">
-										<input class="form-check-input" type="checkbox" name="v_dkim" id="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>>
+										<input class="form-check-input" type="checkbox" name="v_dkim" id="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo 'checked'; ?>>
 										<label for="v_dkim">
 											<?=_('DKIM Support');?>
 										</label>
@@ -130,7 +130,7 @@
 							<tr>
 								<td class="u-pt6">
 									<div class="form-check">
-										<input class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');">
+										<input class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo 'checked'; ?> onclick="javascript:elementHideShow('smtp_relay_table');">
 										<label for="v_smtp_relay">
 											<?=_('SMTP Relay');?>
 										</label>
@@ -142,42 +142,26 @@
 									<table style="display:<?php if ($v_smtp_relay == 'true'){echo 'block';} else {echo 'none';} ?>;" id="smtp_relay_table">
 										<tr>
 											<td class="u-pt6">
-												<?=_('Host');?>
-											</td>
-										</tr>
-										<tr>
-											<td>
-												<input type="text" class="vst-input" name="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
+												<label for="v_smtp_relay_host" class="form-label"><?=_('Host');?></label>
+												<input type="text" class="form-control u-input-width" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
 											</td>
 										</tr>
 										<tr>
 											<td class="u-pt6">
-												<?=_('Port');?>
-											</td>
-										</tr>
-										<tr>
-											<td>
-												<input type="text" class="vst-input" name="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
+												<label for="v_smtp_relay_port" class="form-label"><?=_('Port');?></label>
+												<input type="text" class="form-control u-input-width" name="v_smtp_relay_port" id="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
 											</td>
 										</tr>
 										<tr>
 											<td class="u-pt6">
-												<?=_('Username');?>
-											</td>
-										</tr>
-										<tr>
-											<td>
-												<input type="text" class="vst-input" name="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
+												<label for="v_smtp_relay_user" class="form-label"><?=_('Username');?></label>
+												<input type="text" class="form-control u-input-width" name="v_smtp_relay_user" id="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
 											</td>
 										</tr>
 										<tr>
 											<td class="u-pt6">
-												<?=_('Password');?>
-											</td>
-										</tr>
-										<tr>
-											<td>
-												<input type="text" class="vst-input" name="v_smtp_relay_pass">
+												<label for="v_smtp_relay_pass" class="form-label"><?=_('Password');?></label>
+												<input type="text" class="form-control u-input-width" name="v_smtp_relay_pass" id="v_smtp_relay_pass">
 											</td>
 										</tr>
 									</table>

web/templates/pages/add_mail_acc.html

@@ -49,12 +49,8 @@
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Account');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_account" value="<?=htmlentities(trim($v_account, "'"))?>">
+								<label for="v_account" class="form-label"><?=_('Account');?></label>
+								<input type="text" class="form-control u-input-width" name="v_account" id="v_account" value="<?=htmlentities(trim($v_account, "'"))?>">
 							</td>
 						</tr>
 						<tr>
@@ -116,7 +112,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo 'checked' ?>>
 												<label for="v_blackhole">
 													<?=_('Discard all mail');?>
 												</label>
@@ -126,7 +122,7 @@
 									<tr <?php if ($v_blackhole == 'yes') echo 'style="display:none"'; ?> id="id_fwd_for">
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo 'checked' ?>>
 												<label for="v_fwd_for">
 													<?=_('Do not store forwarded mail');?>
 												</label>
@@ -135,12 +131,10 @@
 									</tr>
 									<tr>
 										<td class="u-pt6">
-											<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<input type="text" class="vst-input" name="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
+											<label for="v_rate" class="form-label">
+												<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
+											</label>
+											<input type="text" class="form-control u-input-width" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 										</td>
 									</tr>
 								</table>

web/templates/pages/add_user.html

@@ -42,22 +42,14 @@
 						</tr>
 						<tr>
 							<td class="u-pt18">
-								<?=_('Username');?>
+								<label for="v_username" class="form-label"><?=_('Username');?></label>
+								<input type="text" class="form-control" name="v_username" id="v_username" value="<?=htmlentities(trim($v_username, "'"))?>" tabindex="1">
 							</td>
 						</tr>
 						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_username" value="<?=htmlentities(trim($v_username, "'"))?>" tabindex="1">
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<?=_('Contact');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="2">
+							<td class="u-pt6">
+								<label for="v_name" class="form-label"><?=_('Contact');?></label>
+								<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="2">
 							</td>
 						</tr>
 						<tr>
@@ -90,7 +82,7 @@
 						<tr>
 							<td>
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled" onclick="javascript:elementHideShow('send-welcome');" <?php if ($v_login_disabled == "yes") echo "checked=yes" ?>>
+									<input class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled" onclick="javascript:elementHideShow('send-welcome');" <?php if ($v_login_disabled == "yes") echo 'checked' ?>>
 									<label for="v_login_disabled">
 										<?=_('Do not allow user to log in to Control Panel');?>
 									</label>

web/templates/pages/edit_backup_exclusions.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_cron.html

@@ -336,8 +336,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_db.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_dns.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_dns_rec.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_firewall.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_ip.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>
@@ -43,39 +42,27 @@
 						</tr>
 						<tr>
 							<td class="u-pt18">
-								<?=_('IP address'); ?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>" disabled>
+								<label for="v_ip" class="form-label"><?=_('IP address') ?></label>
+								<input type="text" class="form-control u-input-width" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>" disabled>
 								<input type="hidden" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Netmask');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_netmask" value="<?=htmlentities(trim($v_netmask, "'"))?>" disabled>
+								<label for="v_netmask" class="form-label"><?=_('Netmask');?></label>
+								<input type="text" class="form-control u-input-width" name="v_netmask" id="v_netmask" value="<?=htmlentities(trim($v_netmask, "'"))?>" disabled>
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Interface'); ?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_netmask" value="<?=htmlentities(trim($v_interface, "'"))?>" disabled>
+								<label for="v_interface" class="form-label"><?=_('Interface'); ?></label>
+								<input type="text" class="form-control u-input-width" name="v_interface" id="v_interface" value="<?=htmlentities(trim($v_interface, "'"))?>" disabled>
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_shared" id="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');">
+									<input class="form-check-input" type="checkbox" name="v_shared" id="v_shared" <?php if (empty($v_dedicated)) echo 'checked' ?> onclick="javascript:elementHideShow('usrtable');">
 									<label for="v_shared">
 										<?=_('Shared');?>
 									</label>
@@ -98,26 +85,22 @@
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Assigned domain');?> <span class="optional">(<?=_('optional');?>)</span>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
+								<label for="v_name" class="form-label">
+									<?=_('Assigned domain');?> <span class="optional">(<?=_('optional');?>)</span>
+								</label>
+								<input type="text" class="form-control u-input-width" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('NAT IP association');?> <span class="optional">(<?=_('optional');?>)</span>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
+								<label for="v_nat" class="form-label">
+									<?=_('NAT IP association');?> <span class="optional">(<?=_('optional');?>)</span>
+								</label>
+								<input type="text" class="form-control u-input-width" name="v_nat" id="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
 							</td>
 						</tr>
 					</table>
-					<table class="data-col2"></table>
+					<table class="data-col2 u-mb20"></table>
 				</td>
 			</tr>
 		</table>

web/templates/pages/edit_mail.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>
@@ -52,7 +51,7 @@
 							<tr>
 								<td class="u-pt18">
 									<label for="v_webmail" class="form-label"><?=_('Webmail Client');?></label>
-									<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6">
+									<select class="form-select u-input-width" name="v_webmail" id="v_webmail" tabindex="6">
 										<?php foreach ($webmail_clients as $client){
 											echo "\t\t\t\t<option value=\"".htmlentities($client)."\"";
 											if (( htmlentities(trim($v_webmail,"'")) == $client )) {
@@ -68,29 +67,23 @@
 						<?php } ?>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Catchall email');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_catchall" value="<?=htmlentities(trim($v_catchall, "'"))?>">
+								<label for="v_catchall" class="form-label"><?=_('Catchall email');?></label>
+								<input type="email" class="form-control u-input-width" name="v_catchall" id="v_catchall" value="<?=htmlentities(trim($v_catchall, "'"))?>">
 							</td>
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour / account');?>)</span>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
+								<label for="v_rate" class="form-label">
+									<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour / account');?>)</span>
+								</label>
+								<input type="text" class="form-control u-input-width" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 							</td>
 						</tr>
 						<?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) {?>
 							<tr>
 								<td class="u-pt18">
 									<div class="form-check">
-										<input class="form-check-input" type="checkbox" name="v_antispam" id="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>>
+										<input class="form-check-input" type="checkbox" name="v_antispam" id="v_antispam" <?php if ($v_antispam == 'yes') echo 'checked'; ?>>
 										<label for="v_antispam">
 											<?=_('AntiSpam Support');?>
 										</label>
@@ -100,7 +93,7 @@
 							<tr>
 								<td class="u-pt6">
 									<div class="form-check">
-										<input class="form-check-input" type="checkbox" name="v_reject" id="v_reject" <?php if ($v_reject == 'yes') echo "checked=yes"; ?>>
+										<input class="form-check-input" type="checkbox" name="v_reject" id="v_reject" <?php if ($v_reject == 'yes') echo 'checked'; ?>>
 										<label for="v_reject">
 											<?=_('Reject spam');?>
 										</label>
@@ -112,7 +105,7 @@
 							<tr>
 								<td class="u-pt6">
 									<div class="form-check">
-										<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>>
+										<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ($v_antivirus == 'yes') echo 'checked'; ?>>
 										<label for="v_antivirus">
 											<?=_('AntiVirus Support');?>
 										</label>
@@ -123,7 +116,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_dkim" id="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>>
+									<input class="form-check-input" type="checkbox" name="v_dkim" id="v_dkim" <?php if ($v_dkim == 'yes') echo 'checked'; ?>>
 									<label for="v_dkim">
 										<?=_('DKIM Support');?>
 									</label>
@@ -133,7 +126,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_ssl" id="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+									<input class="form-check-input" type="checkbox" name="v_ssl" id="v_ssl" <?php if ($v_ssl == 'yes') echo 'checked' ?> onclick="javascript:elementHideShow('ssltable');">
 									<label for="v_ssl">
 										<?=_('SSL Support');?>
 									</label>
@@ -146,7 +139,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_letsencrypt" id="v_letsencrypt" onclick="javascript:elementHideShow('ssl-details');App.Actions.MAIL.toggle_letsencrypt(this);" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo "checked=yes" ?>">
+												<input class="form-check-input" type="checkbox" name="v_letsencrypt" id="v_letsencrypt" onclick="javascript:elementHideShow('ssl-details');App.Actions.MAIL.toggle_letsencrypt(this);" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo 'checked' ?>">
 												<label for="v_letsencrypt">
 													<?=_('Lets Encrypt Support');?>
 												</label>
@@ -264,7 +257,7 @@
 							<td class="u-pt6">
 								<label>
 									<div class="form-check">
-										<input class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');">
+										<input class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo 'checked'; ?> onclick="javascript:elementHideShow('smtp_relay_table');">
 										<label for="v_smtp_relay">
 											<?=_('SMTP Relay');?>
 										</label>
@@ -277,42 +270,26 @@
 								<table style="display:<?php if ($v_smtp_relay == 'true') {echo 'block';} else {echo 'none';} ?>;" id="smtp_relay_table">
 									<tr>
 										<td class="u-pt6">
-											<?=_('Host');?>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<input type="text" class="vst-input" name="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
+											<label for="v_smtp_relay_host" class="form-label"><?=_('Host');?></label>
+											<input type="text" class="form-control u-input-width" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
 										</td>
 									</tr>
 									<tr>
 										<td class="u-pt6">
-											<?=_('Port');?>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<input type="text" class="vst-input" name="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
+											<label for="v_smtp_relay_port" class="form-label"><?=_('Port');?></label>
+											<input type="text" class="form-control u-input-width" name="v_smtp_relay_port" id="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
 										</td>
 									</tr>
 									<tr>
 										<td class="u-pt6">
-											<?=_('Username');?>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<input type="text" class="vst-input" name="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
+											<label for="v_smtp_relay_user" class="form-label"><?=_('Username');?></label>
+											<input type="text" class="form-control u-input-width" name="v_smtp_relay_user" id="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
 										</td>
 									</tr>
 									<tr>
 										<td class="u-pt6">
-											<?=_('Password');?>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<input type="text" class="vst-input" name="v_smtp_relay_pass">
+											<label for="v_smtp_relay_pass" class="form-label"><?=_('Password');?></label>
+											<input type="text" class="form-control u-input-width" name="v_smtp_relay_pass" id="v_smtp_relay_pass">
 										</td>
 									</tr>
 								</table>

web/templates/pages/edit_mail_acc.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>
@@ -43,12 +42,8 @@
 						</tr>
 						<tr>
 							<td class="u-pt18">
-								<?=_('Account');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_email" value="<?=htmlentities($_GET['account'])."@".htmlentities($_GET['domain'])?>" disabled>
+								<label for="v_email" class="form-label"><?=_('Account');?></label>
+								<input type="text" class="form-control u-input-width" name="v_email" id="v_email" value="<?=htmlentities($_GET['account'])."@".htmlentities($_GET['domain'])?>" disabled>
 								<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
 								<input type="hidden" name="v_account" value="<?=htmlentities(trim($v_account, "'"))?>">
 							</td>
@@ -105,7 +100,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo "checked=yes" ?>>
+									<input class="form-check-input" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo 'checked' ?>>
 									<label for="v_blackhole">
 										<?=_('Discard all mail');?>
 									</label>
@@ -115,7 +110,7 @@
 						<tr <?php if ($v_blackhole == 'yes') echo 'style="display:none"'; ?> id="id_fwd_for">
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo "checked=yes" ?>>
+									<input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo 'checked' ?>>
 									<label for="v_fwd_for">
 										<?=_('Do not store forwarded mail');?>
 									</label>
@@ -125,7 +120,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_autoreply" id="v_autoreply" <?php if ($v_autoreply == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('autoreplytable');">
+									<input class="form-check-input" type="checkbox" name="v_autoreply" id="v_autoreply" <?php if ($v_autoreply == 'yes') echo 'checked' ?> onclick="javascript:elementHideShow('autoreplytable');">
 									<label for="v_autoreply">
 										<?=_('Autoreply');?>
 									</label>
@@ -160,12 +155,10 @@
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
+								<label for="v_rate" class="form-label">
+									<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
+								</label>
+								<input type="text" class="form-control u-input-width" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 							</td>
 						</tr>
 					</table>

web/templates/pages/edit_package.html

@@ -24,8 +24,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/edit_server.html

@@ -99,7 +99,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_policy_user_change_theme" id="v_policy_user_change_theme" <?php if ((isset($_SESSION['POLICY_USER_CHANGE_THEME'])) && (!empty($_SESSION['POLICY_USER_CHANGE_THEME'])) && ($_SESSION['POLICY_USER_CHANGE_THEME'] == "no")) echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_policy_user_change_theme" id="v_policy_user_change_theme" <?php if ((isset($_SESSION['POLICY_USER_CHANGE_THEME'])) && (!empty($_SESSION['POLICY_USER_CHANGE_THEME'])) && ($_SESSION['POLICY_USER_CHANGE_THEME'] == "no")) echo 'checked' ?>>
 												<label for="v_policy_user_change_theme">
 													<?=_('Set as selected theme for all users');?>
 												</label>
@@ -167,7 +167,7 @@
 									<tr>
 										<td>
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_debug_mode" id="v_debug_mode" <?php if ((isset($_SESSION['DEBUG_MODE'])) && (!empty($_SESSION['DEBUG_MODE'])) && ($_SESSION['DEBUG_MODE'] == "true")) echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_debug_mode" id="v_debug_mode" <?php if ((isset($_SESSION['DEBUG_MODE'])) && (!empty($_SESSION['DEBUG_MODE'])) && ($_SESSION['DEBUG_MODE'] == "true")) echo 'checked' ?>>
 												<label for="v_debug_mode">
 													<?=_('Enable debug mode');?>
 												</label>
@@ -177,7 +177,7 @@
 									<tr>
 										<td>
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_experimental_features" id="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] == "true")) echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_experimental_features" id="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] == "true")) echo 'checked' ?>>
 												<label for="v_experimental_features">
 													<?=_('Enable preview features');?>
 												</label>
@@ -188,7 +188,7 @@
 									<tr>
 										<td>
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_upgrade_send_notification_email" id="v_upgrade_send_notification_email" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL'])) && ($_SESSION['UPGRADE_SEND_EMAIL'] == "true")) echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_upgrade_send_notification_email" id="v_upgrade_send_notification_email" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL'])) && ($_SESSION['UPGRADE_SEND_EMAIL'] == "true")) echo 'checked' ?>>
 												<label for="v_upgrade_send_notification_email">
 													<?=_('SYSTEM_UPGRADE_SEND_NOTIFICATION_EMAIL');?>
 												</label>
@@ -198,7 +198,7 @@
 									<tr>
 										<td>
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_upgrade_send_email_log" id="v_upgrade_send_email_log" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL_LOG'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL_LOG'])) && ($_SESSION['UPGRADE_SEND_EMAIL_LOG'] == "true")) echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_upgrade_send_email_log" id="v_upgrade_send_email_log" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL_LOG'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL_LOG'])) && ($_SESSION['UPGRADE_SEND_EMAIL_LOG'] == "true")) echo 'checked' ?>>
 												<label for="v_upgrade_send_email_log">
 													<?=_('SYSTEM_UPGRADE_SEND_EMAIL_LOG');?>
 												</label>
@@ -406,7 +406,7 @@
 										<tr>
 											<td class="u-pt6">
 												<div class="form-check">
-													<input class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');">
+													<input class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo 'checked'; ?> onclick="javascript:elementHideShow('smtp_relay_table');">
 													<label for="v_smtp_relay">
 														<?=_('Global SMTP Relay');?>
 													</label>
@@ -646,7 +646,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_backup_remote_adv" id="v_backup_remote_adv" <?php if (!empty($v_backup_remote_adv)) echo "checked=yes" ?> onclick="javascript:elementHideShow('remote_backup');">
+												<input class="form-check-input" type="checkbox" name="v_backup_remote_adv" id="v_backup_remote_adv" <?php if (!empty($v_backup_remote_adv)) echo 'checked' ?> onclick="javascript:elementHideShow('remote_backup');">
 												<label for="v_backup_remote_adv">
 													<?=_('Remote backup');?>
 												</label>

web/templates/pages/edit_user.html

@@ -57,8 +57,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>
@@ -83,12 +82,8 @@
 						</tr>
 						<tr>
 							<td class="u-pt6">
-								<?=_('Contact');?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> >
+								<label for="v_name" class="form-label"><?=_('Contact');?></label>
+								<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> >
 								<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
 									<input type="hidden" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
 								<?php } ?>
@@ -131,7 +126,7 @@
 										<tr>
 											<td>
 												<div class="form-check">
-													<input class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled" onclick="javascript:elementHideShow('password-options');elementHideShow('password-options-ip');" <?php if ($v_login_disabled === "yes") echo "checked=yes" ?>>
+													<input class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled" onclick="javascript:elementHideShow('password-options');elementHideShow('password-options-ip');" <?php if ($v_login_disabled === "yes") echo 'checked' ?>>
 													<label for="v_login_disabled">
 														<?=_('Do not allow user to log in to Control Panel');?>
 													</label>
@@ -142,7 +137,7 @@
 									<tr>
 										<td id="password-options" style="<?php if ($v_login_disabled === 'yes') { echo 'display: none;'; } else { echo 'display: table-cell;'; }?>">
 											<div class="form-check u-mt15">
-												<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
 												<label for="v_twofa">
 													<?=_('Enable 2FA');?>
 												</label>
@@ -157,7 +152,7 @@
 									<tr>
 										<td id="password-options-ip" style="<?php if ($v_login_disabled === 'yes') { echo 'display: none;'; } else { echo 'display: table-cell;'; }?>">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_login_use_iplist" id="v_login_use_iplist" onclick="javascript:elementHideShow('ip-allowlist')" <?php if ($v_login_use_iplist === "yes") echo "checked=yes" ?>>
+												<input class="form-check-input" type="checkbox" name="v_login_use_iplist" id="v_login_use_iplist" onclick="javascript:elementHideShow('ip-allowlist')" <?php if ($v_login_use_iplist === "yes") echo 'checked' ?>>
 												<label for="v_login_use_iplist">
 													<?=_('Use IP address allow list for login attempts');?>
 												</label>
@@ -169,7 +164,7 @@
 											<table id="ip-allowlist" style="<?php if ($v_login_use_iplist === 'yes') { echo 'display: table-cell;'; } else { echo 'display: none;'; } ?>">
 												<tr>
 													<td>
-														<input type="text" class="vst-input" name="v_login_allowed_ips" value="<?=htmlentities(trim($v_login_allowed_ips, "'"))?>" placeholder="<?=_('Example: 127.0.0.1,192.168.1.100');?>">
+														<input type="text" class="form-control u-input-width" name="v_login_allowed_ips" value="<?=htmlentities(trim($v_login_allowed_ips, "'"))?>" placeholder="<?=_('Example: 127.0.0.1,192.168.1.100');?>">
 													</td>
 												</tr>
 											</table>

web/templates/pages/edit_web.html

@@ -32,8 +32,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>
@@ -107,7 +106,7 @@
 						<tr class="stats-auth" style="<?php if ($v_stats == 'none') { ?>display:none<?php } ?>">
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_stats_auth" id="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
+									<input class="form-check-input" type="checkbox" name="v_stats_auth" id="v_stats_auth" <?php if (!empty($v_stats_user)) echo 'checked' ?> onclick="javascript:elementHideShow('statstable');">
 									<label for="v_stats_auth">
 										<?=_('Statistics Authorization');?>
 									</label>
@@ -139,7 +138,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v-redirect-checkbox" id="v-redirect-checkbox" <?php if (!empty($v_redirect)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_redirect');">
+									<input class="form-check-input" type="checkbox" name="v-redirect-checkbox" id="v-redirect-checkbox" <?php if (!empty($v_redirect)) echo 'checked' ?> onclick="javascript:elementHideShow('v_redirect');">
 									<label for="v-redirect-checkbox">
 										<?=_('Enable domain redirection');?>
 									</label>
@@ -150,19 +149,19 @@
 							<td class="u-pl50"> <!-- here -->
 								<div style="display:<?php if (empty($v_redirect)) { echo 'none';} else {echo 'block';}?> ;" id="v_redirect">
 									<div class="form-check">
-										<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-1" value="<?='www.'.htmlentities($v_domain);?>" <?php if ($v_redirect == "www.".$v_domain) echo "checked"; ?>>
+										<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-1" value="<?='www.'.htmlentities($v_domain);?>" <?php if ($v_redirect == "www.".$v_domain) echo 'checked'; ?>>
 										<label for="v-redirect-radio-1">
 											<?=sprintf(_('Redirect visitors to %s'),"www.".htmlentities($v_domain));?>
 										</label>
 									</div>
 									<div class="form-check">
-										<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-2" value="<?=htmlentities($v_domain);?>" <?php if( $v_redirect == $v_domain) echo "checked";?> >
+										<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-2" value="<?=htmlentities($v_domain);?>" <?php if( $v_redirect == $v_domain) echo 'checked';?> >
 										<label class="form-check-label" for="v-redirect-radio-2">
 											<?=sprintf(_('Redirect visitors to %s'),htmlentities($v_domain));?>
 										</label>
 									</div>
 									<div class="form-check">
-										<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-3" value="custom" <?php if( !empty($v_redirect_custom)) echo "checked";?>>
+										<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-3" value="custom" <?php if( !empty($v_redirect_custom)) echo 'checked';?>>
 										<label class="form-check-label" for="v-redirect-radio-3">
 											<?=_("Redirect visitors to a custom domain or web address");?>
 										</label>
@@ -194,7 +193,7 @@
 						<tr>
 							<td class="u-pt6">
 								<div class="form-check">
-									<input class="form-check-input" type="checkbox" name="v_ssl" id="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:App.Actions.WEB.toggle_ssl(this);">
+									<input class="form-check-input" type="checkbox" name="v_ssl" id="v_ssl" <?php if ($v_ssl == 'yes') echo 'checked' ?> onclick="javascript:App.Actions.WEB.toggle_ssl(this);">
 									<label for="v_ssl">
 										<?=_('SSL Support');?>
 									</label>
@@ -207,7 +206,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo "checked=yes" ?> onclick="elementHideShow('letsinfo');App.Actions.WEB.toggle_letsencrypt(this)">
+												<input class="form-check-input" type="checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo 'checked' ?> onclick="elementHideShow('letsinfo');App.Actions.WEB.toggle_letsencrypt(this)">
 												<label for="letsencrypt">
 													<?=_('Lets Encrypt Support');?>
 												</label>
@@ -217,7 +216,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_ssl_forcessl" id="v_ssl_forcessl" <?php if($v_ssl_forcessl == 'yes') echo "checked=yes" ?> onclick="">
+												<input class="form-check-input" type="checkbox" name="v_ssl_forcessl" id="v_ssl_forcessl" <?php if($v_ssl_forcessl == 'yes') echo 'checked' ?> onclick="">
 												<label for="v_ssl_forcessl">
 													<?=_('Force SSL/HTTPS');?>
 												</label>
@@ -227,7 +226,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_ssl_hsts" id="ssl_hsts" <?php if($v_ssl_hsts == 'yes') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_hsts(this)">
+												<input class="form-check-input" type="checkbox" name="v_ssl_hsts" id="ssl_hsts" <?php if($v_ssl_hsts == 'yes') echo 'checked' ?> onclick="App.Actions.WEB.toggle_hsts(this)">
 												<label for="ssl_hsts">
 													<?=_('Enable SSL HSTS');?>
 												</label>
@@ -369,7 +368,7 @@
 											<tr>
 												<td>
 													<div class="form-check">
-														<input class="form-check-input" type="checkbox" name="v_nginx_cache_check" id="v_nginx_cache_check" <?php if ($v_nginx_cache == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('v_nginx_duration');">
+														<input class="form-check-input" type="checkbox" name="v_nginx_cache_check" id="v_nginx_cache_check" <?php if ($v_nginx_cache == 'yes') echo 'checked' ?> onclick="javascript:elementHideShow('v_nginx_duration');">
 														<label for="v_nginx_cache_check">
 															<?=_('Enable FastCGI Cache'); ?>
 															<a href="https://docs.hestiacp.com/admin_docs/web/fastcgi.html#nginx-fastcgi-cache" target="_blank">
@@ -422,7 +421,7 @@
 											<tr style="display: none;">
 												<td class="u-pt6">
 													<div class="form-check">
-														<input class="form-check-input" type="checkbox" name="v_proxy" id="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+														<input class="form-check-input" type="checkbox" name="v_proxy" id="v_proxy" <?php if (!empty($v_proxy)) echo 'checked' ?> onclick="javascript:elementHideShow('proxytable');">
 														<label for="v_proxy">
 															<?=_('Proxy Support') . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
 														</label>
@@ -466,7 +465,7 @@
 									<tr>
 										<td class="u-pt6">
 											<div class="form-check">
-												<input class="form-check-input" type="checkbox" name="v_custom_doc_root_check" id="v_custom_doc_root_check" <?php if (!empty($v_custom_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');">
+												<input class="form-check-input" type="checkbox" name="v_custom_doc_root_check" id="v_custom_doc_root_check" <?php if (!empty($v_custom_doc_root)) echo 'checked' ?> onclick="javascript:elementHideShow('v_custom_doc_root');">
 												<label for="v_custom_doc_root_check">
 													<?=_('Custom document root');?>
 												</label>
@@ -506,7 +505,7 @@
 										<tr>
 											<td class="u-pt6">
 												<div class="form-check">
-													<input class="form-check-input" type="checkbox" name="v_ftp" id="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)">
+													<input class="form-check-input" type="checkbox" name="v_ftp" id="v_ftp" <?php if (!empty($v_ftp_user)) echo 'checked' ?> onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)">
 													<label for="v_ftp">
 														<?=_('Additional FTP Account');?>
 													</label>

web/templates/pages/generate_ssl.html

@@ -18,8 +18,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/list_mail_dns.html

@@ -34,62 +34,86 @@
 
 	<div class="l-unit animated fadeIn">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="mail.<?=htmlspecialchars($_GET['domain']);?>"></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>A</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>14400</b></div>
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=(empty($ips[array_key_first($ips)]['NAT'])) ?  array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>"></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control" style="width:260px;" value="mail.<?=htmlspecialchars($_GET['domain']);?>"></b>
+			</div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>A</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control u-input-width" value="<?=(empty($ips[array_key_first($ips)]['NAT'])) ? array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>"></b>
+			</div>
 		</div>
 	</div>
 	<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
-	<div class="l-unit animated fadeIn">
-		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain']);?>"></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>A</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>14400</b></div>
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=(empty($ips[array_key_first($ips)]['NAT'])) ?  array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>"></b></div>
+		<div class="l-unit animated fadeIn">
+			<div class="l-unit__col l-unit__col--right">
+				<div class="clearfix l-unit__stat-col--left wide-3">
+					<b><input type="text" class="form-control" style="width:260px;" value="<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain']);?>"></b>
+				</div>
+				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>A</b></div>
+				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+				<div class="clearfix l-unit__stat-col--left wide-3">
+					<b><input type="text" class="form-control u-input-width" value="<?=(empty($ips[array_key_first($ips)]['NAT'])) ? array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>"></b>
+				</div>
+			</div>
 		</div>
-	</div>
 	<?php } ?>
 	<div class="l-unit animated fadeIn">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=htmlspecialchars($_GET['domain']);?>"></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>MX</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>10</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>14400</b></div>
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="mail.<?=htmlspecialchars($_GET['domain']);?>."></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control" style="width:260px;" value="<?=htmlspecialchars($_GET['domain']);?>"></b>
+			</div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>MX</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>10</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control u-input-width" value="mail.<?=htmlspecialchars($_GET['domain']);?>."></b>
+			</div>
 		</div>
 	</div>
 	<div class="l-unit animated fadeIn">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=htmlspecialchars($_GET['domain']);?>"></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>TXT</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>14400</b></div>
-			<?php $ip = (empty($ips[array_key_first($ips)]['NAT'])) ?  array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=htmlspecialchars('v=spf1 a mx ip4:'.$ip.' -all');?>"></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control" style="width:260px;" value="<?=htmlspecialchars($_GET['domain']);?>"></b>
+			</div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>TXT</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<?php $ip = (empty($ips[array_key_first($ips)]['NAT'])) ? array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control u-input-width" value="<?=htmlspecialchars('v=spf1 a mx ip4:'.$ip.' -all');?>"></b>
+			</div>
 		</div>
 	</div>
 	<div class="l-unit animated fadeIn">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="_dmarc"></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>TXT</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>14400</b></div>
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=htmlspecialchars('v=DMARC1; p=quarantine; pct=100');?>"></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control" style="width:260px;" value="_dmarc"></b>
+			</div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>TXT</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3">
+				<b><input type="text" class="form-control u-input-width" value="<?=htmlspecialchars('v=DMARC1; p=quarantine; pct=100');?>"></b>
+			</div>
 		</div>
 	</div>
 	<?php foreach($dkim as $key => $value){ ?>
-	<div class="l-unit animated fadeIn">
-		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=htmlspecialchars($key);?>"></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>TXT</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt18"><b>3600</b></div>
-			<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?=htmlspecialchars(str_replace(array('"',"'"),'',$dkim[$key]['TXT']));?>"></b></div>
+		<div class="l-unit animated fadeIn">
+			<div class="l-unit__col l-unit__col--right">
+				<div class="clearfix l-unit__stat-col--left wide-3">
+					<b><input type="text" class="form-control" style="width:260px;" value="<?=htmlspecialchars($key);?>"></b>
+				</div>
+				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>TXT</b></div>
+				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>3600</b></div>
+				<div class="clearfix l-unit__stat-col--left wide-3">
+					<b><input type="text" class="form-control u-input-width" value="<?=htmlspecialchars(str_replace(array('"',"'"),'',$dkim[$key]['TXT']));?>"></b>
+				</div>
+			</div>
 		</div>
-	</div>
 	<?php } ?>
 </div>
 

web/templates/pages/list_ssl.html

@@ -19,8 +19,7 @@
 				<td class="data-dotted">
 					<table class="data-col1">
 						<tr>
-							<td>
-							</td>
+							<td></td>
 						</tr>
 					</table>
 				</td>

web/templates/pages/login/reset_3.html

@@ -22,13 +22,13 @@
 											<input type="hidden" name="user" value="<?=htmlentities($_GET['user']);?>">
 											<input type="hidden" name="code" value="<?=htmlentities($_GET['code']);?>">
 											<label for="password" class="form-label"><?=_('New Password');?></label>
-											<input type="password" class="form-control" name="password" id="password" tabindex="1" style="width:220px;">
+											<input type="password" class="form-control" name="password" id="password" tabindex="1" style="width:260px;">
 										</td>
 									</tr>
 									<tr>
 										<td style="padding: 12px 0 0 2px;">
 											<label for="password_confirm" class="form-label"><?=_('Confirm Password');?></label>
-											<input type="password" class="form-control" name="password_confirm" id="password_confirm" tabindex="2" style="width:220px;">
+											<input type="password" class="form-control" name="password_confirm" id="password_confirm" tabindex="2" style="width:260px;">
 										</td>
 									</tr>
 									<tr>