Skip to content

Commit ce0345f

Browse files
AlecRustAlecRust
authored
Tidy some classes (hestiacp#3722)
* Tidy classes * Replace .u-max-width250 with .u-max-width200 * Add .compact variant of table cells * Fix "Purge Nginx Cache" button not matching "caching-" closes hestiacp#3723
1 parent 9bac1d6 commit ce0345f

File tree

5 files changed

+41
-35
lines changed

5 files changed

+41
-35
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,11 @@
984984
&:nth-child(1) {
985985
line-height: 0.6;
986986
}
987+
988+
&.compact {
989+
padding-left: 10px;
990+
padding-right: 10px;
991+
}
987992
}
988993
}
989994

‎web/css/src/utilities.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
min-height: 600px !important;
140140
}
141141

142-
.u-max-width250 {
143-
max-width: 250px !important;
142+
.u-max-width200 {
143+
max-width: 200px !important;
144144
}
145145

146146
.u-max-width300 {

‎web/js/src/editWebListeners.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ export default function handleEditWebListeners() {
5555
const clearCacheButton = document.querySelector('.js-clear-cache-button');
5656
if (proxyTemplateSelect && clearCacheButton) {
5757
proxyTemplateSelect.addEventListener('change', () => {
58-
if (proxyTemplateSelect.value === 'caching') {
58+
// NOTE: Match "caching" and "caching-*" values
59+
if (proxyTemplateSelect.value === 'caching' || proxyTemplateSelect.value.match(/^caching-/)) {
5960
clearCacheButton.classList.remove('u-hidden');
6061
} else {
6162
clearCacheButton.classList.add('u-hidden');

‎web/templates/pages/list_packages.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -65,39 +65,39 @@
6565
<i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i>
6666
<span class="u-hidden-visually"><?= _("Bandwidth") ?></span>
6767
</div>
68-
<div class="units-table-cell u-text-center">
68+
<div class="units-table-cell compact u-text-center">
6969
<i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i>
7070
<span class="u-hidden-visually"><?= _("Web Domains") ?></span>
7171
</div>
72-
<div class="units-table-cell u-text-center">
72+
<div class="units-table-cell compact u-text-center">
7373
<i class="fas fa-link" title="<?= _("Web Aliases") ?>"></i>
7474
<span class="u-hidden-visually"><?= _("Web Aliases") ?></span>
7575
</div>
76-
<div class="units-table-cell u-text-center">
76+
<div class="units-table-cell compact u-text-center">
7777
<i class="fas fa-book-atlas" title="<?= _("DNS Zones") ?>"></i>
7878
<span class="u-hidden-visually"><?= _("DNS Zones") ?></span>
7979
</div>
80-
<div class="units-table-cell u-text-center">
80+
<div class="units-table-cell compact u-text-center">
8181
<i class="fas fa-globe" title="<?= _("DNS Records") ?>"></i>
8282
<span class="u-hidden-visually"><?= _("DNS Records") ?></span>
8383
</div>
84-
<div class="units-table-cell u-text-center">
84+
<div class="units-table-cell compact u-text-center">
8585
<i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i>
8686
<span class="u-hidden-visually"><?= _("Mail Domains") ?></span>
8787
</div>
88-
<div class="units-table-cell u-text-center">
88+
<div class="units-table-cell compact u-text-center">
8989
<i class="fas fa-inbox" title="<?= _("Mail Accounts") ?>"></i>
9090
<span class="u-hidden-visually"><?= _("Mail Accounts") ?></span>
9191
</div>
92-
<div class="units-table-cell u-text-center">
92+
<div class="units-table-cell compact u-text-center">
9393
<i class="fas fa-database" title="<?= _("Databases") ?>"></i>
9494
<span class="u-hidden-visually"><?= _("Databases") ?></span>
9595
</div>
96-
<div class="units-table-cell u-text-center">
96+
<div class="units-table-cell compact u-text-center">
9797
<i class="fas fa-clock" title="<?= _("Cron Jobs") ?>"></i>
9898
<span class="u-hidden-visually"><?= _("Cron Jobs") ?></span>
9999
</div>
100-
<div class="units-table-cell u-text-center">
100+
<div class="units-table-cell compact u-text-center">
101101
<i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i>
102102
<span class="u-hidden-visually"><?= _("Backups") ?></span>
103103
</div>
@@ -170,7 +170,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
170170
</ul>
171171
</div>
172172
<div class="units-table-cell u-text-center-desktop">
173-
<span class="u-hide-desktop"><?= _("Shell") ?>:</span>
173+
<span class="u-hide-desktop u-text-bold"><?= _("Shell") ?>:</span>
174174
<?php if ($data[$key]["SHELL"] == "nologin") { ?>
175175
<i class="fas fa-circle-minus icon-large" title="<?= _("SSH Access") ?>: <?= $data[$key]["SHELL"] ?>"> </i>
176176
<?php } else { ?>
@@ -211,7 +211,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
211211
<?php } ?>
212212
</span>
213213
</div>
214-
<div class="units-table-cell u-text-bold u-text-center-desktop">
214+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
215215
<span class="u-hide-desktop"><?= _("Web Domains") ?>:</span>
216216
<span class="badge" title="<?= _("Web Domains") ?>: <?= $data[$key]["WEB_DOMAINS"] ?>">
217217
<?php if ($data[$key]["WEB_DOMAINS"] == "unlimited") { ?>
@@ -221,7 +221,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
221221
<?php } ?>
222222
</span>
223223
</div>
224-
<div class="units-table-cell u-text-bold u-text-center-desktop">
224+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
225225
<span class="u-hide-desktop"><?= _("Web Aliases") ?>:</span>
226226
<span class="badge" title="<?= _("Web Aliases") ?>: <?= $data[$key]["WEB_ALIASES"] ?>">
227227
<?php if ($data[$key]["WEB_ALIASES"] == "unlimited") { ?>
@@ -231,7 +231,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
231231
<?php } ?>
232232
</span>
233233
</div>
234-
<div class="units-table-cell u-text-bold u-text-center-desktop">
234+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
235235
<span class="u-hide-desktop"><?= _("DNS Zones") ?>:</span>
236236
<span class="badge" title="<?= _("DNS Zones") ?>: <?= $data[$key]["DNS_DOMAINS"] ?>">
237237
<?php if ($data[$key]["DNS_DOMAINS"] == "unlimited") { ?>
@@ -241,7 +241,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
241241
<?php } ?>
242242
</span>
243243
</div>
244-
<div class="units-table-cell u-text-bold u-text-center-desktop">
244+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
245245
<span class="u-hide-desktop"><?= _("DNS Records") ?>:</span>
246246
<span class="badge" title="<?= _("DNS Records") ?>: <?= $data[$key]["DNS_RECORDS"] ?>">
247247
<?php if ($data[$key]["DNS_RECORDS"] == "unlimited") { ?>
@@ -251,7 +251,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
251251
<?php } ?>
252252
</span>
253253
</div>
254-
<div class="units-table-cell u-text-bold u-text-center-desktop">
254+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
255255
<span class="u-hide-desktop"><?= _("Mail Domains") ?>:</span>
256256
<span class="badge" title="<?= _("Mail Domains") ?>: <?= $data[$key]["MAIL_DOMAINS"] ?>">
257257
<?php if ($data[$key]["MAIL_DOMAINS"] == "unlimited") { ?>
@@ -261,7 +261,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
261261
<?php } ?>
262262
</span>
263263
</div>
264-
<div class="units-table-cell u-text-bold u-text-center-desktop">
264+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
265265
<span class="u-hide-desktop"><?= _("Mail Accounts") ?>:</span>
266266
<span class="badge" title="<?= _("Mail Accounts") ?>: <?= $data[$key]["MAIL_ACCOUNTS"] ?>">
267267
<?php if ($data[$key]["MAIL_ACCOUNTS"] == "unlimited") { ?>
@@ -271,7 +271,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
271271
<?php } ?>
272272
</span>
273273
</div>
274-
<div class="units-table-cell u-text-bold u-text-center-desktop">
274+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
275275
<span class="u-hide-desktop"><?= _("Databases") ?>:</span>
276276
<span class="badge" title="<?= _("Databases") ?>: <?= $data[$key]["DATABASES"] ?>">
277277
<?php if ($data[$key]["DATABASES"] == "unlimited") { ?>
@@ -281,7 +281,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
281281
<?php } ?>
282282
</span>
283283
</div>
284-
<div class="units-table-cell u-text-bold u-text-center-desktop">
284+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
285285
<span class="u-hide-desktop"><?= _("Cron Jobs") ?>:</span>
286286
<span class="badge" title="<?= _("Cron Jobs") ?>: <?= $data[$key]["CRON_JOBS"] ?>">
287287
<?php if ($data[$key]["CRON_JOBS"] == "unlimited") { ?>
@@ -291,7 +291,7 @@ class="units-table-row-action-link data-controls js-confirm-action"
291291
<?php } ?>
292292
</span>
293293
</div>
294-
<div class="units-table-cell u-text-bold u-text-center-desktop">
294+
<div class="units-table-cell compact u-text-bold u-text-center-desktop">
295295
<span class="u-hide-desktop"><?= _("Backups") ?>:</span>
296296
<span class="badge" title="<?= _("Backups") ?>: <?= $data[$key]["BACKUPS"] ?>">
297297
<?php if ($data[$key]["BACKUPS"] == "unlimited") { ?>

‎web/templates/pages/list_user.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,23 +88,23 @@
8888
<i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i>
8989
<span class="u-hidden-visually"><?= _("Bandwidth") ?></span>
9090
</div>
91-
<div class="units-table-cell u-text-center">
91+
<div class="units-table-cell compact u-text-center">
9292
<i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i>
9393
<span class="u-hidden-visually"><?= _("Web Domains") ?></span>
9494
</div>
95-
<div class="units-table-cell u-text-center">
95+
<div class="units-table-cell compact u-text-center">
9696
<i class="fas fa-book-atlas" title="<?= _("DNS Zones") ?>"></i>
9797
<span class="u-hidden-visually"><?= _("DNS Zones") ?></span>
9898
</div>
99-
<div class="units-table-cell u-text-center">
99+
<div class="units-table-cell compact u-text-center">
100100
<i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i>
101101
<span class="u-hidden-visually"><?= _("Mail Domains") ?></span>
102102
</div>
103-
<div class="units-table-cell u-text-center">
103+
<div class="units-table-cell compact u-text-center">
104104
<i class="fas fa-database" title="<?= _("Databases") ?>"></i>
105105
<span class="u-hidden-visually"><?= _("Databases") ?></span>
106106
</div>
107-
<div class="units-table-cell u-text-center">
107+
<div class="units-table-cell compact u-text-center">
108108
<i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i>
109109
<span class="u-hidden-visually"><?= _("Backups") ?></span>
110110
</div>
@@ -142,7 +142,7 @@
142142
</div>
143143
</div>
144144
<div class="units-table-cell units-table-heading-cell">
145-
<span class="u-hide-desktop"><?= _("Name") ?>:</span>
145+
<span class="u-hide-desktop u-text-bold"><?= _("Name") ?>:</span>
146146
<?php if ($key == $user_plain) { ?>
147147
<a href="/edit/user/?user=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Edit User") ?>">
148148
<span class="u-text-bold">
@@ -158,8 +158,8 @@
158158
(<?= $data[$key]["NAME"] ?>)
159159
</a>
160160
<?php } ?>
161-
<p class="u-max-width250 u-text-truncate">
162-
<span class="u-hide-desktop"><?= _("Email") ?>:</span>
161+
<p class="u-max-width200 u-text-truncate">
162+
<span class="u-hide-desktop u-text-bold"><?= _("Email") ?>:</span>
163163
<span title="<?= $data[$key]["CONTACT"] ?>"><?= $data[$key]["CONTACT"] ?></span>
164164
</p>
165165
</div>
@@ -266,31 +266,31 @@ class="units-table-row-action-link data-controls js-confirm-action"
266266
<?= humanize_usage_measure($data[$key]["BANDWIDTH"]) ?>
267267
</span>
268268
</div>
269-
<div class="units-table-cell u-text-center-desktop">
269+
<div class="units-table-cell compact u-text-center-desktop">
270270
<span class="u-hide-desktop u-text-bold"><?= _("Web Domains") ?>:</span>
271271
<span class="badge">
272272
<?= $data[$key]["U_WEB_DOMAINS"] ?>
273273
</span>
274274
</div>
275-
<div class="units-table-cell u-text-center-desktop">
275+
<div class="units-table-cell compact u-text-center-desktop">
276276
<span class="u-hide-desktop u-text-bold"><?= _("DNS Zones") ?>:</span>
277277
<span class="badge">
278278
<?= $data[$key]["U_DNS_DOMAINS"] ?>
279279
</span>
280280
</div>
281-
<div class="units-table-cell u-text-center-desktop">
281+
<div class="units-table-cell compact u-text-center-desktop">
282282
<span class="u-hide-desktop u-text-bold"><?= _("Mail Domains") ?>:</span>
283283
<span class="badge">
284284
<?= $data[$key]["U_MAIL_DOMAINS"] ?>
285285
</span>
286286
</div>
287-
<div class="units-table-cell u-text-center-desktop">
287+
<div class="units-table-cell compact u-text-center-desktop">
288288
<span class="u-hide-desktop u-text-bold"><?= _("Databases") ?>:</span>
289289
<span class="badge">
290290
<?= $data[$key]["U_DATABASES"] ?>
291291
</span>
292292
</div>
293-
<div class="units-table-cell u-text-center-desktop">
293+
<div class="units-table-cell compact u-text-center-desktop">
294294
<span class="u-hide-desktop u-text-bold"><?= _("Backups") ?>:</span>
295295
<span class="badge">
296296
<?= $data[$key]["U_BACKUPS"] ?>

0 commit comments

Comments
 (0)