Skip to content

Commit 56c2a9f

Browse files
AlecRustAlecRust
authored
UI fixes (hestiacp#3700)
* Improve robustness of list view actions on desktop * Prevent DNS record values breaking table layout * Tidy some view code * Tidy some view code
1 parent aa110b8 commit 56c2a9f

File tree

7 files changed

+25
-22
lines changed

7 files changed

+25
-22
lines changed

‎web/add/access-key/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
_("Access key {%s} has been created successfully."),
8080
htmlentities($key_data["ACCESS_KEY_ID"]),
8181
),
82-
"</b>",
83-
"<b>",
82+
"</code>",
83+
"<code>",
8484
);
8585
unset($apis_selected);
8686
unset($check_invalid_apis);

‎web/css/src/themes/default.css‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@
994994

995995
@media (--viewport-large) {
996996
visibility: hidden;
997+
flex-wrap: nowrap;
997998
padding-top: 0;
998999
}
9991000
}
@@ -2387,7 +2388,7 @@
23872388
}
23882389

23892390
.inline-alert-warning {
2390-
color: #ffd500;
2391+
color: #ecc500;
23912392
}
23922393

23932394
.inline-alert-success {
@@ -2463,7 +2464,7 @@
24632464
background-color: #ff0;
24642465

24652466
&:hover {
2466-
background-color: #ee0;
2467+
background-color: #f1f100;
24672468
}
24682469
}
24692470

‎web/templates/includes/panel.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ class="main-menu-toggle-label"
260260
<p class="main-menu-item-label"><?= _("USER") ?><i class="fas fa-users"></i></p>
261261
<ul class="main-menu-stats">
262262
<li>
263-
<?= _("Users") ?>: <span><?= htmlspecialchars($user_count) ?></span>
263+
<?= _("Users") ?>: <?= htmlspecialchars($user_count) ?>
264264
</li>
265265
<li>
266-
<?= _("Suspended") ?>: <span><?= $panel[$user]["SUSPENDED_USERS"] ?></span>
266+
<?= _("Suspended") ?>: <?= $panel[$user]["SUSPENDED_USERS"] ?>
267267
</li>
268268
</ul>
269269
</a>
@@ -278,10 +278,10 @@ class="main-menu-toggle-label"
278278
<p class="main-menu-item-label"><?= _("WEB") ?><i class="fas fa-earth-americas"></i></p>
279279
<ul class="main-menu-stats">
280280
<li>
281-
<?= _("Domains") ?>: <span><?= $panel[$user]["U_WEB_DOMAINS"] ?> / <?= $panel[$user]["WEB_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["WEB_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_WEB"] ?>)</span>
281+
<?= _("Domains") ?>: <?= $panel[$user]["U_WEB_DOMAINS"] ?> / <?= $panel[$user]["WEB_DOMAINS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["WEB_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_WEB"] ?>)
282282
</li>
283283
<li>
284-
<?= _("Aliases") ?>: <span><?= $panel[$user]["U_WEB_ALIASES"] ?> / <?= $panel[$user]["WEB_ALIASES"] == "unlimited" || $panel[$user]["WEB_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["WEB_ALIASES"] * $panel[$user]["WEB_DOMAINS"] ?></span>
284+
<?= _("Aliases") ?>: <?= $panel[$user]["U_WEB_ALIASES"] ?> / <?= $panel[$user]["WEB_ALIASES"] == "unlimited" || $panel[$user]["WEB_DOMAINS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["WEB_ALIASES"] * $panel[$user]["WEB_DOMAINS"] ?>
285285
</li>
286286
</ul>
287287
</a>
@@ -297,10 +297,10 @@ class="main-menu-toggle-label"
297297
<p class="main-menu-item-label"><?= _("DNS") ?><i class="fas fa-book-atlas"></i></p>
298298
<ul class="main-menu-stats">
299299
<li>
300-
<?= _("Zones") ?>: <span><?= $panel[$user]["U_DNS_DOMAINS"] ?> / <?= $panel[$user]["DNS_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["DNS_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_DNS"] ?>)</span>
300+
<?= _("Zones") ?>: <?= $panel[$user]["U_DNS_DOMAINS"] ?> / <?= $panel[$user]["DNS_DOMAINS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["DNS_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_DNS"] ?>)
301301
</li>
302302
<li>
303-
<?= _("Records") ?>: <span><?= $panel[$user]["U_DNS_RECORDS"] ?> / <?= $panel[$user]["DNS_RECORDS"] == "unlimited" || $panel[$user]["DNS_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["DNS_RECORDS"] * $panel[$user]["DNS_DOMAINS"] ?></span>
303+
<?= _("Records") ?>: <?= $panel[$user]["U_DNS_RECORDS"] ?> / <?= $panel[$user]["DNS_RECORDS"] == "unlimited" || $panel[$user]["DNS_DOMAINS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["DNS_RECORDS"] * $panel[$user]["DNS_DOMAINS"] ?>
304304
</li>
305305
</ul>
306306
</a>
@@ -316,10 +316,10 @@ class="main-menu-toggle-label"
316316
<p class="main-menu-item-label"><?= _("MAIL") ?><i class="fas fa-envelopes-bulk"></i></p>
317317
<ul class="main-menu-stats">
318318
<li>
319-
<?= _("Domains") ?>: <span><?= $panel[$user]["U_MAIL_DOMAINS"] ?> / <?= $panel[$user]["MAIL_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["MAIL_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_MAIL"] ?>)</span>
319+
<?= _("Domains") ?>: <?= $panel[$user]["U_MAIL_DOMAINS"] ?> / <?= $panel[$user]["MAIL_DOMAINS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["MAIL_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_MAIL"] ?>)
320320
</li>
321321
<li>
322-
<?= _("Accounts") ?>: <span><?= $panel[$user]['U_MAIL_ACCOUNTS'] ?> / <?= $panel[$user]['MAIL_ACCOUNTS']=='unlimited' || $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['MAIL_ACCOUNTS'] * $panel[$user]['MAIL_DOMAINS'] ?></span>
322+
<?= _("Accounts") ?>: <?= $panel[$user]['U_MAIL_ACCOUNTS'] ?> / <?= $panel[$user]['MAIL_ACCOUNTS']=='unlimited' || $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]['MAIL_ACCOUNTS'] * $panel[$user]['MAIL_DOMAINS'] ?>
323323
</li>
324324
</ul>
325325
</a>
@@ -335,7 +335,7 @@ class="main-menu-toggle-label"
335335
<p class="main-menu-item-label"><?= _("DB") ?><i class="fas fa-database"></i></p>
336336
<ul class="main-menu-stats">
337337
<li>
338-
<?= _("Databases") ?>: <span><?= $panel[$user]["U_DATABASES"] ?> / <?= $panel[$user]["DATABASES"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["DATABASES"] ?> (<?= $panel[$user]["SUSPENDED_DB"] ?>)</span>
338+
<?= _("Databases") ?>: <?= $panel[$user]["U_DATABASES"] ?> / <?= $panel[$user]["DATABASES"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["DATABASES"] ?> (<?= $panel[$user]["SUSPENDED_DB"] ?>)
339339
</li>
340340
</ul>
341341
</a>
@@ -351,7 +351,7 @@ class="main-menu-toggle-label"
351351
<p class="main-menu-item-label"><?= _("CRON") ?><i class="fas fa-clock"></i></p>
352352
<ul class="main-menu-stats">
353353
<li>
354-
<?= _("Jobs") ?>: <span><?= $panel[$user]["U_CRON_JOBS"] ?> / <?= $panel[$user]["CRON_JOBS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["CRON_JOBS"] ?> (<?= $panel[$user]["SUSPENDED_CRON"] ?>)</span>
354+
<?= _("Jobs") ?>: <?= $panel[$user]["U_CRON_JOBS"] ?> / <?= $panel[$user]["CRON_JOBS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["CRON_JOBS"] ?> (<?= $panel[$user]["SUSPENDED_CRON"] ?>)
355355
</li>
356356
</ul>
357357
</a>
@@ -367,7 +367,7 @@ class="main-menu-toggle-label"
367367
<p class="main-menu-item-label"><?= _("BACKUP") ?><i class="fas fa-file-zipper"></i></p>
368368
<ul class="main-menu-stats">
369369
<li>
370-
<?= _("Backups") ?>: <span><?= $panel[$user]["U_BACKUPS"] ?> / <?= $panel[$user]["BACKUPS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["BACKUPS"] ?></span>
370+
<?= _("Backups") ?>: <?= $panel[$user]["U_BACKUPS"] ?> / <?= $panel[$user]["BACKUPS"] == "unlimited" ? "<span class=\"u-text-bold\">∞</span>" : $panel[$user]["BACKUPS"] ?>
371371
</li>
372372
</ul>
373373
</a>

‎web/templates/pages/add_db.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<?php } ?>
4646
<?php if (($user_plain == "admin" && $accept === "true") || $user_plain !== "admin") { ?>
4747
<p class="hint u-mb20">
48-
<?= sprintf(_("Prefix %s will be automatically added to database name and database user"), "<b>" . $user_plain . "_</b>") ?>
48+
<?= sprintf(_("Prefix %s will be automatically added to database name and database user"), "<span class=\"u-text-bold\">" . $user_plain . "_</span>") ?>
4949
</p>
5050
<div class="u-mb10">
5151
<label for="v_database" class="form-label"><?= _("Database") ?></label>

‎web/templates/pages/debug_panel.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ class="debug-panel-toggle"
1010
<?php
1111
echo "<h3 class=\"u-mb10\">Server Variables</h3>";
1212
foreach ($_SERVER as $key => $val) {
13-
echo "<b>" . $key . "= </b> " . $val . " ";
13+
echo "<span class=\"u-text-bold\">" . $key . "= </span> " . $val . " ";
1414
}
1515
?>
1616
<?php
1717
echo "<h3 class=\"u-mb10 u-mt10\">Session Variables</h3>";
1818
foreach ($_SESSION as $key => $val) {
19-
echo "<b>" . $key . "= </b> " . $val . " ";
19+
echo "<span class=\"u-text-bold\">" . $key . "= </span> " . $val . " ";
2020
}
2121
?>
2222
<?php
2323
echo "<h3 class=\"u-mb10 u-mt10\">POST Variables</h3>";
2424
foreach ($_POST as $key => $val) {
25-
echo "<b>" . $key . "= </b> " . $val . " ";
25+
echo "<span class=\"u-text-bold\">" . $key . "= </span> " . $val . " ";
2626
}
2727
?>
2828
<?php
2929
echo "<h3 class=\"u-mb10 u-mt10\">GET Variables</h3>";
3030
foreach ($_GET as $key => $val) {
31-
echo "<b>" . $key . "= </b> " . $val . " ";
31+
echo "<span class=\"u-text-bold\">" . $key . "= </span> " . $val . " ";
3232
}
3333
?>
3434
</div>

‎web/templates/pages/list_dns_rec.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ class="units-table-row-action-link data-controls js-confirm-action"
163163
</div>
164164
<div class="units-table-cell">
165165
<span class="u-hide-desktop u-text-bold"><?= _("IP or Value") ?>:</span>
166-
<?= htmlspecialchars($data[$key]["VALUE"], ENT_QUOTES, "UTF-8") ?>
166+
<span class="u-text-break">
167+
<?= htmlspecialchars($data[$key]["VALUE"], ENT_QUOTES, "UTF-8") ?>
168+
</span>
167169
</div>
168170
</div>
169171
<?php } ?>

‎web/templates/pages/list_firewall.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<label for="check<?= $i ?>" class="u-hide-desktop"><?= _("Select") ?></label>
106106
</div>
107107
</div>
108-
<div class="units-table-cell u-text-bold units-table-heading-cell">
108+
<div class="units-table-cell units-table-heading-cell u-text-bold">
109109
<span class="u-hide-desktop"><?= _("Action") ?>:</span>
110110
<a href="/edit/firewall/?rule=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Edit Firewall Rule") ?>">
111111
<?php

0 commit comments

Comments
 (0)