Refactor nameserver fields (#4153)

web/css/src/utilities.css

@@ -23,6 +23,12 @@
 	user-select: none !important;
 }
 
+.u-button-reset {
+	border: 0 !important;
+	padding: 0 !important;
+	background-color: transparent !important;
+}
+
 .u-text-right {
 	text-align: right !important;
 }

web/templates/includes/extra-ns-fields.php

@@ -0,0 +1,15 @@
+<?php
+	$nsValues = ['v_ns3', 'v_ns4', 'v_ns5', 'v_ns6', 'v_ns7', 'v_ns8'];
+	foreach ($nsValues as $nsValue) {
+		if ($$nsValue) {
+			?>
+			<div class="u-side-by-side u-mb5">
+				<input type="text" class="form-control" name="<?php echo $nsValue; ?>" value="<?php echo htmlentities(trim($$nsValue, "'")); ?>">
+				<button type="button" class="u-button-reset u-ml10 js-remove-ns" title="<?= _("Remove") ?>">
+					<i class="fas fa-trash icon-dim icon-red"></i>
+				</button>
+			</div>
+			<?php
+		}
+	}
+?>

web/templates/pages/add_dns.php

@@ -115,44 +115,7 @@
 					<div class="u-mb5">
 						<input type="text" class="form-control" name="v_ns2" value="<?= htmlentities(trim($v_ns2, "'")) ?>">
 					</div>
-					<?php
-						if ($v_ns3) {
-							echo '<div class="u-side-by-side u-mb5">
-								<input type="text" class="form-control" name="v_ns3" value="' . htmlentities(trim($v_ns3, "'")) . '">
-								<span class="form-link form-link-danger u-ml10 js-remove-ns">' . _('Delete') . '</span>
-							</div>';
-						}
-						if ($v_ns4) {
-							echo '<div class="u-side-by-side u-mb5">
-								<input type="text" class="form-control" name="v_ns4" value="' . htmlentities(trim($v_ns4, "'")) . '">
-								<span class="form-link form-link-danger u-ml10 js-remove-ns">' . _('Delete') . '</span>
-							</div>';
-						}
-						if ($v_ns5) {
-							echo '<div class="u-side-by-side u-mb5">
-								<input type="text" class="form-control" name="v_ns5" value="' . htmlentities(trim($v_ns5, "'")) . '">
-								<span class="form-link form-link-danger u-ml10 js-remove-ns">' . _('Delete') . '</span>
-							</div>';
-						}
-						if ($v_ns6) {
-							echo '<div class="u-side-by-side u-mb5">
-								<input type="text" class="form-control" name="v_ns6" value="' . htmlentities(trim($v_ns6, "'")) . '">
-								<span class="form-link form-link-danger u-ml10 js-remove-ns">' . _('Delete') . '</span>
-							</div>';
-						}
-						if ($v_ns7) {
-							echo '<div class="u-side-by-side u-mb5">
-								<input type="text" class="form-control" name="v_ns7" value="' . htmlentities(trim($v_ns7, "'")) . '">
-								<span class="form-link form-link-danger u-ml10 js-remove-ns">' . _('Delete') . '</span>
-							</div>';
-						}
-						if ($v_ns8) {
-							echo '<div class="u-side-by-side u-mb5">
-								<input type="text" class="form-control" name="v_ns8" value="' . htmlentities(trim($v_ns8, "'")) . '">
-								<span class="form-link form-link-danger u-ml10 js-remove-ns">' . _('Delete') . '</span>
-							</div>';
-						}
-					?>
+					<?php require $_SERVER["HESTIA"] . "/web/templates/includes/extra-ns-fields.php"; ?>
 					<button type="button" class="form-link u-mt20 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
 						<?= _("Add Name Server") ?>
 					</button>

web/templates/pages/add_package.php

@@ -186,44 +186,7 @@
 						<div class="u-mb5">
 							<input type="text" class="form-control" name="v_ns2" value="<?= htmlentities(trim($v_ns2, "'")) ?>">
 						</div>
-						<?php
-							if ($v_ns3) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns4) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns5) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns6) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns7) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns8) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-						?>
+						<?php require $_SERVER["HESTIA"] . "/web/templates/includes/extra-ns-fields.php"; ?>
 						<button type="button" class="form-link u-mt20 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
 							<?= _("Add Name Server") ?>
 						</button>

web/templates/pages/edit_package.php

@@ -191,44 +191,7 @@
 						<div class="u-mb5">
 							<input type="text" class="form-control" name="v_ns2" value="<?= htmlentities(trim($v_ns2, "'")) ?>">
 						</div>
-						<?php
-							if ($v_ns3) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns4) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns5) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns6) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns7) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns8) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-						?>
+						<?php require $_SERVER["HESTIA"] . "/web/templates/includes/extra-ns-fields.php"; ?>
 						<button type="button" class="form-link u-mt20 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
 							<?= _("Add Name Server") ?>
 						</button>

web/templates/pages/edit_user.php

@@ -248,44 +248,7 @@
 						<div class="u-mb5">
 							<input type="text" class="form-control" name="v_ns2" value="<?= htmlentities(trim($v_ns2, "'")) ?>">
 						</div>
-						<?php
-							if ($v_ns3) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns4) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns5) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns6) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns7) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-							if ($v_ns8) {
-								echo '<div class="u-side-by-side u-mb5">
-									<input type="text" class="form-control" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
-									<span class="u-ml10 js-remove-ns"><i class="fas fa-trash icon-dim icon-red"></i></span>
-								</div>';
-							}
-						?>
+						<?php require $_SERVER["HESTIA"] . "/web/templates/includes/extra-ns-fields.php"; ?>
 						<button type="button" class="form-link u-mt20 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
 							<?= _("Add Name Server") ?>
 						</button>