Skip to content

Commit 24fca50

Browse files
authored
UI fixes/refactors (hestiacp#3162)
* UI fixes/refactors * Bump jQuery to 3.6.3
1 parent d166181 commit 24fca50

Some content is hidden

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

53 files changed

+383
-385
lines changed

docs/docs/contributing/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ These are example instructions for creating a virtual machine running Hestia for
1515
These instructions use [Multipass](https://multipass.run/) to create the VM. Feel free to adapt the commands for any virtualization software you prefer.
1616

1717
::: warning
18-
Sometimes during this process, the mapping between the source code directory on your local machine to the directory in the VM can be lost. If this happens simply unmount and remount e.g.
18+
Sometimes the mapping between the source code directory on your local machine to the directory in the VM can be lost. If this happens simply unmount and remount e.g.
1919

2020
```bash
2121
multipass unmount hestia-dev

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"devDependencies": {
2525
"@prettier/plugin-php": "^0.19.2",
26-
"@typescript-eslint/eslint-plugin": "^5.46.1",
27-
"@typescript-eslint/parser": "^5.46.1",
26+
"@typescript-eslint/eslint-plugin": "^5.47.0",
27+
"@typescript-eslint/parser": "^5.47.0",
2828
"cssnano": "^5.1.14",
2929
"eslint": "^8.30.0",
3030
"eslint-config-prettier": "^8.5.0",
@@ -45,7 +45,7 @@
4545
"stylelint-config-prettier": "^9.0.4",
4646
"stylelint-config-standard": "^29.0.0",
4747
"typescript": "^4.9.4",
48-
"vitepress": "1.0.0-alpha.32",
48+
"vitepress": "1.0.0-alpha.33",
4949
"vue": "^3.2.45"
5050
}
5151
}

web/inc/main.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,20 @@ function show_alert_message($data) {
235235

236236
if (!empty($msgText)) {
237237
printf(
238-
'<p class="inline-alert %s u-mb20"><i class="fas %s"></i> %s</p>',
238+
'<div class="inline-alert %s u-mb20" role="alert"><i class="fas %s"></i><p>%s</p></div>',
239239
$msgClass,
240240
$msgIcon,
241241
$msgText,
242242
);
243243
}
244244
}
245245

246+
function show_error_message($error) {
247+
if (isset($error)) {
248+
echo $error;
249+
}
250+
}
251+
246252
function top_panel($user, $TAB) {
247253
$command = HESTIA_CMD . "v-list-user " . $user . " 'json'";
248254
exec($command, $output, $return_var);

web/js/vendor/jquery-3.6.2.min.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

web/js/vendor/jquery-3.6.3.min.js

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

web/templates/includes/js.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script defer src="/js/main.js?<?= JS_LATEST_UPDATE ?>"></script>
22
<script defer src="/js/shortcuts.js?<?= JS_LATEST_UPDATE ?>"></script>
33
<script defer src="/js/vendor/alpine-3.10.5.min.js?<?= JS_LATEST_UPDATE ?>"></script>
4-
<script defer src="/js/vendor/jquery-3.6.2.min.js?<?= JS_LATEST_UPDATE ?>"></script>
4+
<script defer src="/js/vendor/jquery-3.6.3.min.js?<?= JS_LATEST_UPDATE ?>"></script>
55
<script defer src="/js/vendor/jquery-ui.min.js?<?= JS_LATEST_UPDATE ?>"></script>
66
<script defer src="/js/vendor/chart.min.js?<?= JS_LATEST_UPDATE ?>"></script>
77
<script defer src="/js/events.js?<?= JS_LATEST_UPDATE ?>"></script>

web/templates/pages/add_access_key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</a>
88
</div>
99
<div class="toolbar-buttons">
10-
<button class="button" type="submit" form="vstobjects">
10+
<button type="submit" class="button" form="vstobjects">
1111
<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
1212
</button>
1313
</div>

web/templates/pages/add_cron.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</a>
88
</div>
99
<div class="toolbar-buttons">
10-
<button class="button" type="submit" form="vstobjects">
10+
<button type="submit" class="button" form="vstobjects">
1111
<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
1212
</button>
1313
</div>
@@ -344,7 +344,7 @@
344344
<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
345345
<input type="hidden" name="ok" value="Add">
346346

347-
<div class="form-container">
347+
<div class="form-container form-container-wide">
348348
<h1 class="form-title"><?= _("Adding Cron Job") ?></h1>
349349
<?php show_alert_message($_SESSION); ?>
350350
<div class="u-mb20">

web/templates/pages/add_db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</a>
88
</div>
99
<div class="toolbar-buttons">
10-
<button class="button" type="submit" form="vstobjects">
10+
<button type="submit" class="button" form="vstobjects">
1111
<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
1212
</button>
1313
</div>

web/templates/pages/add_dns.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</a>
88
</div>
99
<div class="toolbar-buttons">
10-
<button class="button" type="submit" form="vstobjects">
10+
<button type="submit" class="button" form="vstobjects">
1111
<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
1212
</button>
1313
</div>

0 commit comments

Comments
 (0)