Skip to content

Commit 2526e4c

Browse files
AlecRustAlecRust
authored
UI updates (hestiacp#3344)
* Use open/close labels for debug panel * More open/close state * Bump npm deps * Bump jQuery to 3.6.4
1 parent 5ef0937 commit 2526e4c

File tree

9 files changed

+109
-82
lines changed

9 files changed

+109
-82
lines changed

‎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.3",
26-
"@typescript-eslint/eslint-plugin": "^5.54.0",
27-
"@typescript-eslint/parser": "^5.54.0",
26+
"@typescript-eslint/eslint-plugin": "^5.54.1",
27+
"@typescript-eslint/parser": "^5.54.1",
2828
"cssnano": "^5.1.15",
2929
"eslint": "^8.35.0",
3030
"eslint-config-prettier": "^8.7.0",
@@ -45,7 +45,7 @@
4545
"stylelint": "^15.2.0",
4646
"stylelint-config-standard": "^30.0.1",
4747
"typescript": "^4.9.5",
48-
"vitepress": "1.0.0-alpha.49",
48+
"vitepress": "1.0.0-alpha.50",
4949
"vue": "^3.2.47"
5050
}
5151
}

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

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

‎web/js/vendor/jquery-3.6.4.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,5 +1,5 @@
11
<script defer src="/js/main.js?<?= JS_LATEST_UPDATE ?>"></script>
2-
<script defer src="/js/vendor/jquery-3.6.3.min.js?<?= JS_LATEST_UPDATE ?>"></script>
2+
<script defer src="/js/vendor/jquery-3.6.4.min.js?<?= JS_LATEST_UPDATE ?>"></script>
33
<script defer src="/js/vendor/jquery-ui.min.js?<?= JS_LATEST_UPDATE ?>"></script>
44
<script defer src="/js/vendor/chart.min.js?<?= JS_LATEST_UPDATE ?>"></script>
55
<script defer src="/js/shortcuts.js?<?= JS_LATEST_UPDATE ?>"></script>

‎web/templates/includes/panel.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,14 @@ class="top-bar-notification-delete-all"
120120
<!-- Menu -->
121121
<nav x-data="{ open: false }" class="top-bar-menu">
122122

123-
<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?= _("Toggle menu") ?>">
123+
<button
124+
type="button"
125+
class="top-bar-menu-link u-hide-tablet"
126+
x-on:click="open = !open">
124127
<i class="fas fa-bars"></i>
125-
<span class="u-hidden"><?= _("Toggle menu") ?></span>
128+
<span class="u-hidden" x-text="open ? '<?= _("Close menu") ?>' : '<?= _("Open menu") ?>'">
129+
<?= _("Open menu") ?>
130+
</span>
126131
</button>
127132

128133
<ul x-cloak x-show="open" class="top-bar-menu-list">
@@ -224,6 +229,7 @@ class="top-bar-notification-delete-all"
224229
x-text="open ? '<?= _("Collapse main menu") ?>' : '<?= _("Expand main menu") ?>'"
225230
class="main-menu-toggle-label"
226231
>
232+
<?= _("Expand main menu") ?>
227233
</span>
228234
</button>
229235
<ul x-cloak x-show="open" class="main-menu-list">

‎web/templates/pages/debug_panel.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<div x-data="{ open: false }" class="debug-panel">
2-
<button x-on:click="open = !open" type="button" class="debug-panel-toggle">
3-
<?= _("Toggle Debug Panel") ?>
2+
<button
3+
type="button"
4+
class="debug-panel-toggle"
5+
x-on:click="open = !open"
6+
x-text="open ? '<?= _("Close debug panel") ?>' : '<?= _("Open debug panel") ?>'">
7+
<?= _("Open debug panel") ?>
48
</button>
59
<div x-cloak x-show="open" class="debug-panel-content animate__animated animate__fadeIn">
610
<?php

‎web/templates/pages/list_server_info.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,14 @@
1919
</div>
2020
<div class="top-bar-right">
2121
<nav x-data="{ open: false }" class="top-bar-menu">
22-
<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?= _("Toggle menu") ?>">
22+
<button
23+
type="button"
24+
class="top-bar-menu-link u-hide-tablet"
25+
x-on:click="open = !open">
2326
<i class="fas fa-bars"></i>
24-
<span class="u-hidden"><?= _("Toggle menu") ?></span>
27+
<span class="u-hidden" x-text="open ? '<?= _("Close menu") ?>' : '<?= _("Open menu") ?>'">
28+
<?= _("Open menu") ?>
29+
</span>
2530
</button>
2631
<ul x-cloak x-show="open" class="top-bar-menu-list">
2732
<li class="top-bar-menu-item">

‎web/templates/pages/list_weblog.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,14 @@
1919
</div>
2020
<div class="top-bar-right">
2121
<nav x-data="{ open: false }" class="top-bar-menu">
22-
<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?= _("Toggle menu") ?>">
22+
<button
23+
type="button"
24+
class="top-bar-menu-link u-hide-tablet"
25+
x-on:click="open = !open">
2326
<i class="fas fa-bars"></i>
24-
<span class="u-hidden"><?= _("Toggle menu") ?></span>
27+
<span class="u-hidden" x-text="open ? '<?= _("Close menu") ?>' : '<?= _("Open menu") ?>'">
28+
<?= _("Open menu") ?>
29+
</span>
2530
</button>
2631
<ul x-cloak x-show="open" class="top-bar-menu-list">
2732
<li class="top-bar-menu-item">

‎yarn.lock‎

Lines changed: 75 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -880,13 +880,13 @@ __metadata:
880880
languageName: node
881881
linkType: hard
882882

883-
"@typescript-eslint/eslint-plugin@npm:^5.54.0":
884-
version: 5.54.0
885-
resolution: "@typescript-eslint/eslint-plugin@npm:5.54.0"
883+
"@typescript-eslint/eslint-plugin@npm:^5.54.1":
884+
version: 5.54.1
885+
resolution: "@typescript-eslint/eslint-plugin@npm:5.54.1"
886886
dependencies:
887-
"@typescript-eslint/scope-manager": 5.54.0
888-
"@typescript-eslint/type-utils": 5.54.0
889-
"@typescript-eslint/utils": 5.54.0
887+
"@typescript-eslint/scope-manager": 5.54.1
888+
"@typescript-eslint/type-utils": 5.54.1
889+
"@typescript-eslint/utils": 5.54.1
890890
debug: ^4.3.4
891891
grapheme-splitter: ^1.0.4
892892
ignore: ^5.2.0
@@ -900,67 +900,67 @@ __metadata:
900900
peerDependenciesMeta:
901901
typescript:
902902
optional: true
903-
checksum: 4fdb520b8e0f6b9eb878206ddfa4212522f170d1507d7aba8a975159a198efa37af6d2d17982dd560317452d0748f2e2da5dd7347b172bc4446d1c5562ce2e94
903+
checksum: 76476c08ca0142a9bf6e2381f5cd1c037d86fbafa9c0dded4a97bd3b23b5962dd2c3943bade11b21d674195674f0e36dbf80faa15a1906f5a2ca1f699baf1dd5
904904
languageName: node
905905
linkType: hard
906906

907-
"@typescript-eslint/parser@npm:^5.54.0":
908-
version: 5.54.0
909-
resolution: "@typescript-eslint/parser@npm:5.54.0"
907+
"@typescript-eslint/parser@npm:^5.54.1":
908+
version: 5.54.1
909+
resolution: "@typescript-eslint/parser@npm:5.54.1"
910910
dependencies:
911-
"@typescript-eslint/scope-manager": 5.54.0
912-
"@typescript-eslint/types": 5.54.0
913-
"@typescript-eslint/typescript-estree": 5.54.0
911+
"@typescript-eslint/scope-manager": 5.54.1
912+
"@typescript-eslint/types": 5.54.1
913+
"@typescript-eslint/typescript-estree": 5.54.1
914914
debug: ^4.3.4
915915
peerDependencies:
916916
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
917917
peerDependenciesMeta:
918918
typescript:
919919
optional: true
920-
checksum: 368d6dd85be42c3f518f0ddeed23ecd1d3c9484a77ae291ee4e08e2703ed379bed613bde014cd8ab2a3e06e85dd8aef201112ae5e3d2a07deba29ae80bb1fe06
920+
checksum: f466513d306ca926b97c2cec1eebaf2cd15d45bd5633a4358f23ba9a4de1b0ec4630b1c20abc395943934ed1d2ef65f545fd6737c317a7abe579612101e8a83f
921921
languageName: node
922922
linkType: hard
923923

924-
"@typescript-eslint/scope-manager@npm:5.54.0":
925-
version: 5.54.0
926-
resolution: "@typescript-eslint/scope-manager@npm:5.54.0"
924+
"@typescript-eslint/scope-manager@npm:5.54.1":
925+
version: 5.54.1
926+
resolution: "@typescript-eslint/scope-manager@npm:5.54.1"
927927
dependencies:
928-
"@typescript-eslint/types": 5.54.0
929-
"@typescript-eslint/visitor-keys": 5.54.0
930-
checksum: e50f12396de0ddb94aab119bdd5f4769b80dd2c273e137fd25e5811e25114d7a3d3668cdb3c454aca9537e940744881d62a1fed2ec86f07f60533dc7382ae15c
928+
"@typescript-eslint/types": 5.54.1
929+
"@typescript-eslint/visitor-keys": 5.54.1
930+
checksum: 9add24cf3a7852634ad0680a827646860ac4698a6ac8aae31e8b781e29f59e84b51f0cdaacffd0747811012647f01b51969d988da9b302ead374ceebffbe204b
931931
languageName: node
932932
linkType: hard
933933

934-
"@typescript-eslint/type-utils@npm:5.54.0":
935-
version: 5.54.0
936-
resolution: "@typescript-eslint/type-utils@npm:5.54.0"
934+
"@typescript-eslint/type-utils@npm:5.54.1":
935+
version: 5.54.1
936+
resolution: "@typescript-eslint/type-utils@npm:5.54.1"
937937
dependencies:
938-
"@typescript-eslint/typescript-estree": 5.54.0
939-
"@typescript-eslint/utils": 5.54.0
938+
"@typescript-eslint/typescript-estree": 5.54.1
939+
"@typescript-eslint/utils": 5.54.1
940940
debug: ^4.3.4
941941
tsutils: ^3.21.0
942942
peerDependencies:
943943
eslint: "*"
944944
peerDependenciesMeta:
945945
typescript:
946946
optional: true
947-
checksum: 9cb5b52c7277bdf74b9ea3282fc40f41fda90ea4b1d33039044476e43cf05a766b1294e7d45f429594f2776828f7d17729cfa4ea027315f3df883e748ba57514
947+
checksum: 0073838b782b7f4619775be124ca6643fec43a2d56043eaf3ceb100960a5193f14ac747b28ce17a5c9ac643fdee8abda82a7d905c81521358de7b27a2dcbc9af
948948
languageName: node
949949
linkType: hard
950950

951-
"@typescript-eslint/types@npm:5.54.0":
952-
version: 5.54.0
953-
resolution: "@typescript-eslint/types@npm:5.54.0"
954-
checksum: 0f66b1b93078f3afea6dfcd3d4e2f0abea4f60cd0c613c2cf13f85098e5bf786185484c9846ed80b6c4272de2c31a70c5a8aacb91314cf1b6da7dcb8855cb7ac
951+
"@typescript-eslint/types@npm:5.54.1":
952+
version: 5.54.1
953+
resolution: "@typescript-eslint/types@npm:5.54.1"
954+
checksum: 84a8f725cfa10646af389659e09c510c38d82c65960c7b613f844a264acc0e197471cba03f3e8f4b6411bc35dca28922c8352a7bd44621411c73fd6dd4096da2
955955
languageName: node
956956
linkType: hard
957957

958-
"@typescript-eslint/typescript-estree@npm:5.54.0":
959-
version: 5.54.0
960-
resolution: "@typescript-eslint/typescript-estree@npm:5.54.0"
958+
"@typescript-eslint/typescript-estree@npm:5.54.1":
959+
version: 5.54.1
960+
resolution: "@typescript-eslint/typescript-estree@npm:5.54.1"
961961
dependencies:
962-
"@typescript-eslint/types": 5.54.0
963-
"@typescript-eslint/visitor-keys": 5.54.0
962+
"@typescript-eslint/types": 5.54.1
963+
"@typescript-eslint/visitor-keys": 5.54.1
964964
debug: ^4.3.4
965965
globby: ^11.1.0
966966
is-glob: ^4.0.3
@@ -969,35 +969,35 @@ __metadata:
969969
peerDependenciesMeta:
970970
typescript:
971971
optional: true
972-
checksum: 377c75c34c4f95b7ab6218c1d96a6db3ea6ed6727711b6a09354582fe0157861dc1b6fb9e3f7113cd09741f713735d59d5ab5845457f5733a4ebad7470bf600a
972+
checksum: ea42bdb4832fa96fa1121237c9b664ac4506e2836646651e08a8542c8601d78af6c288779707f893ca4c884221829bb7d7b4b43c4a9c3ed959519266d03a139b
973973
languageName: node
974974
linkType: hard
975975

976-
"@typescript-eslint/utils@npm:5.54.0":
977-
version: 5.54.0
978-
resolution: "@typescript-eslint/utils@npm:5.54.0"
976+
"@typescript-eslint/utils@npm:5.54.1":
977+
version: 5.54.1
978+
resolution: "@typescript-eslint/utils@npm:5.54.1"
979979
dependencies:
980980
"@types/json-schema": ^7.0.9
981981
"@types/semver": ^7.3.12
982-
"@typescript-eslint/scope-manager": 5.54.0
983-
"@typescript-eslint/types": 5.54.0
984-
"@typescript-eslint/typescript-estree": 5.54.0
982+
"@typescript-eslint/scope-manager": 5.54.1
983+
"@typescript-eslint/types": 5.54.1
984+
"@typescript-eslint/typescript-estree": 5.54.1
985985
eslint-scope: ^5.1.1
986986
eslint-utils: ^3.0.0
987987
semver: ^7.3.7
988988
peerDependencies:
989989
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
990-
checksum: b8f344fc2961c7af530b93e53d5a17b5084cdf550b381082e3fb7f349ef16e718d9eebde1b9fc2d8fc4ecf8d60d334b004359977247554265c1afc87323bed37
990+
checksum: 8f428ea4d338ce85d55fd0c9ae2b217b323f29f51b7c9f8077fef7001ca21d28b032c5e5165b67ae6057aef69edb0e7a164c3c483703be6f3e4e574248bbc399
991991
languageName: node
992992
linkType: hard
993993

994-
"@typescript-eslint/visitor-keys@npm:5.54.0":
995-
version: 5.54.0
996-
resolution: "@typescript-eslint/visitor-keys@npm:5.54.0"
994+
"@typescript-eslint/visitor-keys@npm:5.54.1":
995+
version: 5.54.1
996+
resolution: "@typescript-eslint/visitor-keys@npm:5.54.1"
997997
dependencies:
998-
"@typescript-eslint/types": 5.54.0
998+
"@typescript-eslint/types": 5.54.1
999999
eslint-visitor-keys: ^3.3.0
1000-
checksum: 17fc323c09e6272b603cdaec30a99916600fbbb737e1fbc8c1727a487753b4363cea112277fa43e0562bff34bdd1de9ad73ff9433118b1fd469b112fad0313ca
1000+
checksum: 3a691abd2a43b86a0c41526d14a2afcc93a2e0512b5f8b9ec43f6029c493870808036eae5ee4fc655d26e1999017c4a4dffb241f47c36c2a1238ec9fbd08719c
10011001
languageName: node
10021002
linkType: hard
10031003

@@ -1535,9 +1535,16 @@ __metadata:
15351535
linkType: hard
15361536

15371537
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001449":
1538-
version: 1.0.30001460
1539-
resolution: "caniuse-lite@npm:1.0.30001460"
1540-
checksum: dad91eb82aa65aecf33ad6a04ad620b9df6f0152020dc6c1874224e8c6f4aa50695f585201b3dfcd2760b3c43326a86c9505cc03af856698fbef67b267ef786f
1538+
version: 1.0.30001462
1539+
resolution: "caniuse-lite@npm:1.0.30001462"
1540+
checksum: e4a57d7851eec65e7c9b6c11c4bbcecdc49d87b1b01bff3c15ea27efb05f959891b4c70ac169842067c134d6fa126d9ad5a91d0f85c7387c5bd912eaf41ea647
1541+
languageName: node
1542+
linkType: hard
1543+
1544+
"chalk@npm:5.2.0":
1545+
version: 5.2.0
1546+
resolution: "chalk@npm:5.2.0"
1547+
checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
15411548
languageName: node
15421549
linkType: hard
15431550

@@ -2079,9 +2086,9 @@ __metadata:
20792086
linkType: hard
20802087

20812088
"electron-to-chromium@npm:^1.4.284":
2082-
version: 1.4.320
2083-
resolution: "electron-to-chromium@npm:1.4.320"
2084-
checksum: ea2c02bc286c0471ed7ad9b61225f6561921cf5f24a060cd1c46c2ea9932283ab924f66c370fbe5a229225dc1f747b395c943a0f5a9d058b72f561b1d8225787
2089+
version: 1.4.324
2090+
resolution: "electron-to-chromium@npm:1.4.324"
2091+
checksum: 06d0d8d27cbf8320fad6ba100bfffae2f48cd176eb30765cc179d199406a2fda395af00f86c9ca182add1f1b9fe0b8b6965ab4a6e5306ef3a163198b775d8fdf
20852092
languageName: node
20862093
linkType: hard
20872094

@@ -2815,8 +2822,8 @@ __metadata:
28152822
dependencies:
28162823
"@fortawesome/fontawesome-free": ^6.3.0
28172824
"@prettier/plugin-php": ^0.19.3
2818-
"@typescript-eslint/eslint-plugin": ^5.54.0
2819-
"@typescript-eslint/parser": ^5.54.0
2825+
"@typescript-eslint/eslint-plugin": ^5.54.1
2826+
"@typescript-eslint/parser": ^5.54.1
28202827
cssnano: ^5.1.15
28212828
eslint: ^8.35.0
28222829
eslint-config-prettier: ^8.7.0
@@ -2838,7 +2845,7 @@ __metadata:
28382845
stylelint: ^15.2.0
28392846
stylelint-config-standard: ^30.0.1
28402847
typescript: ^4.9.5
2841-
vitepress: 1.0.0-alpha.49
2848+
vitepress: 1.0.0-alpha.50
28422849
vue: ^3.2.47
28432850
languageName: unknown
28442851
linkType: soft
@@ -3261,11 +3268,11 @@ __metadata:
32613268
linkType: hard
32623269

32633270
"lint-staged@npm:^13.1.2":
3264-
version: 13.1.3
3265-
resolution: "lint-staged@npm:13.1.3"
3271+
version: 13.1.4
3272+
resolution: "lint-staged@npm:13.1.4"
32663273
dependencies:
3274+
chalk: 5.2.0
32673275
cli-truncate: ^3.1.0
3268-
colorette: ^2.0.19
32693276
commander: ^10.0.0
32703277
debug: ^4.3.4
32713278
execa: ^7.0.0
@@ -3280,7 +3287,7 @@ __metadata:
32803287
yaml: ^2.2.1
32813288
bin:
32823289
lint-staged: bin/lint-staged.js
3283-
checksum: 98a0410b98e8941059b477b38812d3c5ce8b93f3d8f65cfa4836f4b9ca861e7c935491a420b2f48d95acd8fd712dab10d95fffdd7868b072615d3d0fdec11e3c
3290+
checksum: 75729290bd78c026351b1fd39f9bcbee3744f93e6d66a0125119c59de108205872b6fb7732437dc3bd363716bf7c3585e0c1f93a3419eae87aaa2878de0225e3
32843291
languageName: node
32853292
linkType: hard
32863293

@@ -5478,12 +5485,12 @@ __metadata:
54785485
linkType: hard
54795486

54805487
"spdx-correct@npm:^3.0.0":
5481-
version: 3.1.1
5482-
resolution: "spdx-correct@npm:3.1.1"
5488+
version: 3.2.0
5489+
resolution: "spdx-correct@npm:3.2.0"
54835490
dependencies:
54845491
spdx-expression-parse: ^3.0.0
54855492
spdx-license-ids: ^3.0.0
5486-
checksum: 77ce438344a34f9930feffa61be0eddcda5b55fc592906ef75621d4b52c07400a97084d8701557b13f7d2aae0cb64f808431f469e566ef3fe0a3a131dcb775a6
5493+
checksum: e9ae98d22f69c88e7aff5b8778dc01c361ef635580e82d29e5c60a6533cc8f4d820803e67d7432581af0cc4fb49973125076ee3b90df191d153e223c004193b2
54875494
languageName: node
54885495
linkType: hard
54895496

@@ -6079,9 +6086,9 @@ __metadata:
60796086
languageName: node
60806087
linkType: hard
60816088

6082-
"vitepress@npm:1.0.0-alpha.49":
6083-
version: 1.0.0-alpha.49
6084-
resolution: "vitepress@npm:1.0.0-alpha.49"
6089+
"vitepress@npm:1.0.0-alpha.50":
6090+
version: 1.0.0-alpha.50
6091+
resolution: "vitepress@npm:1.0.0-alpha.50"
60856092
dependencies:
60866093
"@docsearch/css": ^3.3.3
60876094
"@docsearch/js": ^3.3.3
@@ -6094,7 +6101,7 @@ __metadata:
60946101
vue: ^3.2.47
60956102
bin:
60966103
vitepress: bin/vitepress.js
6097-
checksum: 392706ddb79321aac6160008083487251a526038e0f29966cd4d56b4ff609ed19ec939a54236db08a41156011ba00cfb301db721525c609c8ef498e17ae6da2e
6104+
checksum: 1e3dc30e8de05a18158fd330ff588229ef41db119f12773a764b4e93df30594adbfbb73c05e05cf40fcbb5aa2cde8d320d169d4a9a724b4ce8a217d8b9d686d9
60986105
languageName: node
60996106
linkType: hard
61006107

0 commit comments

Comments
 (0)