Skip to content

Commit 53d33ee

Browse files
authored
Minor UI updates (hestiacp#3485)
* Refactor to fix duplicate IDs in page HTML * Add "click outside to close" behaviour to sorting dropdown
1 parent 650a3e4 commit 53d33ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+128
-100
lines changed

web/css/src/themes/vestia.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ strong {
181181
text-shadow: none;
182182
}
183183

184-
& #btn-back {
184+
& .button-back {
185185
color: #326b9b;
186186
background: none;
187187
text-shadow: none;

web/css/themes/vestia.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/js/dist/main.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/js/dist/main.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/js/src/listSorting.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
// List view sorting dropdown
22
export default function initSorting() {
3+
// Toggle dropdown button
34
document.querySelectorAll('.toolbar-sorting-toggle').forEach((toggle) => {
45
toggle.addEventListener('click', (evt) => {
56
evt.preventDefault();
67
document.querySelector('.toolbar-sorting-menu').classList.toggle('u-hidden');
78
});
89
});
910

11+
// "Click outside" to close dropdown
12+
document.addEventListener('click', (event) => {
13+
const toggleButton = document.querySelector('.toolbar-sorting-toggle');
14+
const dropdown = document.querySelector('.toolbar-sorting-menu');
15+
16+
if (!dropdown || !toggleButton) return;
17+
18+
if (!dropdown.contains(event.target) && !toggleButton.contains(event.target)) {
19+
dropdown.classList.add('u-hidden');
20+
}
21+
});
22+
23+
// Inner dropdown sorting behavior
1024
document.querySelectorAll('.toolbar-sorting-menu span').forEach((span) => {
1125
span.addEventListener('click', function () {
1226
const menu = document.querySelector('.toolbar-sorting-menu');

web/js/src/shortcuts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export default function initShortcuts() {
106106
.register(
107107
{ key: 'A' },
108108
(_evt) => {
109-
const createButton = document.querySelector('.button#btn-create');
109+
const createButton = document.querySelector('a.js-button-create');
110110
if (!createButton) {
111111
return;
112112
}
@@ -129,7 +129,7 @@ export default function initShortcuts() {
129129
document.querySelector('form#vstobjects').submit();
130130
})
131131
.register({ code: 'Backspace', ctrlKey: true }, (_evt) => {
132-
const redirect = document.querySelector('a.button#btn-back').href;
132+
const redirect = document.querySelector('a.js-button-back').href;
133133
if (!redirect) {
134134
return;
135135
}

web/templates/pages/add_access_key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/list/access-key/">
5+
<a class="button button-secondary button-back js-button-back" href="/list/access-key/">
66
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
77
</a>
88
</div>

web/templates/pages/add_cron.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/list/cron/">
5+
<a class="button button-secondary button-back js-button-back" href="/list/cron/">
66
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
77
</a>
88
</div>

web/templates/pages/add_db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/list/db/">
5+
<a class="button button-secondary button-back js-button-back" href="/list/db/">
66
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
77
</a>
88
</div>

web/templates/pages/add_dns.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/list/dns/">
5+
<a class="button button-secondary button-back js-button-back" href="/list/dns/">
66
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
77
</a>
88
</div>

0 commit comments

Comments
 (0)