Skip to content

Commit 3cbd7b3

Browse files
AlecRustAlecRust
authored
Apply more Prettier formatting (hestiacp#3122)
* Tidy copy * Improve link URL * Bump node deps * Apply Prettier formatting * Manually apply Prettier formatting
1 parent 81b4449 commit 3cbd7b3

Some content is hidden

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

77 files changed

+2064
-2065
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
"markdownlint-cli2": "^0.5.1",
3535
"postcss": "^8.4.19",
3636
"postcss-cli": "^10.1.0",
37-
"postcss-import": "^15.0.1",
37+
"postcss-import": "^15.1.0",
3838
"postcss-preset-env": "^7.8.3",
3939
"postcss-size": "^4.0.1",
40-
"prettier": "^2.8.0",
40+
"prettier": "^2.8.1",
4141
"prettier-plugin-nginx": "^1.0.2",
4242
"prettier-plugin-sh": "^0.12.8",
4343
"prettier-plugin-sql": "^0.12.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
border-top: none;
162162

163163
@media (--viewport-small) {
164-
width: 320px;
164+
width: 330px;
165165
}
166166

167167
@media (--viewport-medium) {

‎web/css/themes/default.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/templates/footer.php‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
</main>
2-
<?php
3-
if (($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes')) {
4-
if ($_SESSION['UPDATE_AVAILABLE'] === 'yes') {
5-
?>
6-
<div x-data="{ open: false }" x-cloak x-show="open" class="footer-banner updates" id="banner">
7-
<div>
8-
<b>New updates are available!</b> To upgrade your server now, run <span style="font-family:'Courier New', Courier, monospace">apt update && apt upgrade</span> from a shell session.
2+
<?php if (
3+
$_SESSION["userContext"] === "admin" &&
4+
$_SESSION["POLICY_SYSTEM_HIDE_SERVICES"] !== "yes"
5+
) { ?>
6+
<?php if ($_SESSION["UPDATE_AVAILABLE"] === "yes") { ?>
7+
<div x-data="{ open: false }" x-cloak x-show="open" class="footer-banner updates" id="banner">
8+
<div>
9+
<b>New updates are available!</b> To upgrade your server now, run <span style="font-family:'Courier New', Courier, monospace">apt update && apt upgrade</span> from a shell session.
10+
</div>
11+
<div style="margin-top: 4px;"></div><a href="#" x-on:click="open = false">Hide</a></div>
912
</div>
10-
<div style="margin-top: 4px;"></div><a href="#" x-on:click="open = false">Hide</a></div>
11-
</div>
12-
<?php
13-
}
14-
}
15-
?>
16-
<div title="<?=_('Confirmation');?>" class="dialog js-confirm-dialog-redirect">
17-
<p><?=_('LEAVE_PAGE_CONFIRMATION')?></p>
13+
<?php } ?>
14+
<?php } ?>
15+
<div title="<?= _("Confirmation") ?>" class="dialog js-confirm-dialog-redirect">
16+
<p><?= _("LEAVE_PAGE_CONFIRMATION") ?></p>
1817
</div>
1918

2019
<div x-data>
2120
<dialog x-ref="dialog" class="shortcuts animate__animated animate__fadeIn">
2221
<div class="shortcuts-header">
23-
<div class="shortcuts-title"><?=_('Shortcuts')?></div>
22+
<div class="shortcuts-title"><?= _("Shortcuts") ?></div>
2423
<div
2524
x-on:click="$refs.dialog.close()"
2625
class="shortcuts-close"
@@ -30,24 +29,24 @@ class="shortcuts-close"
3029
</div>
3130
<div class="shortcuts-inner">
3231
<ul class="shortcuts-list">
33-
<li><span class="key">a</span><?=_('Add New object')?></li>
34-
<li><span class="key">Ctrl + Enter</span><?=_('Save Form')?></li>
35-
<li class="u-mb20"><span class="key">Ctrl + Backspace</span><?=_('Cancel saving form')?></li>
36-
<li><span class="key">1</span><?=_('Go to WEB list')?></li>
37-
<li><span class="key">2</span><?=_('Go to DNS list')?></li>
38-
<li><span class="key">3</span><?=_('Go to MAIL list')?></li>
39-
<li><span class="key">4</span><?=_('Go to DB list')?></li>
40-
<li><span class="key">5</span><?=_('Go to CRON list')?></li>
41-
<li><span class="key">6</span><?=_('Go to BACKUP list')?></li>
32+
<li><span class="key">a</span><?= _("Add New object") ?></li>
33+
<li><span class="key">Ctrl + Enter</span><?= _("Save Form") ?></li>
34+
<li class="u-mb20"><span class="key">Ctrl + Backspace</span><?= _("Cancel saving form") ?></li>
35+
<li><span class="key">1</span><?= _("Go to WEB list") ?></li>
36+
<li><span class="key">2</span><?= _("Go to DNS list") ?></li>
37+
<li><span class="key">3</span><?= _("Go to MAIL list") ?></li>
38+
<li><span class="key">4</span><?= _("Go to DB list") ?></li>
39+
<li><span class="key">5</span><?= _("Go to CRON list") ?></li>
40+
<li><span class="key">6</span><?= _("Go to BACKUP list") ?></li>
4241
</ul>
4342
<ul class="shortcuts-list">
44-
<li class="u-mb20"><span class="key">f</span><?=_('Focus on search')?></li>
45-
<li class="u-mb20"><span class="key">h</span><?=_('Display/Close shortcuts')?></li>
46-
<li><span class="key bigger">&larr;</span><?=_('Move backward through top menu')?></li>
47-
<li><span class="key bigger">&rarr;</span><?=_('Move forward through top menu')?></li>
48-
<li class="u-mb20"><span class="key">Enter</span><?=_('Enter focused element')?></li>
49-
<li><span class="key bigger">&uarr;</span><?=_('Move up through elements list')?></li>
50-
<li><span class="key bigger">&darr;</span><?=_('Move down through elements list')?></li>
43+
<li class="u-mb20"><span class="key">f</span><?= _("Focus on search") ?></li>
44+
<li class="u-mb20"><span class="key">h</span><?= _("Display/Close shortcuts") ?></li>
45+
<li><span class="key bigger">&larr;</span><?= _("Move backward through top menu") ?></li>
46+
<li><span class="key bigger">&rarr;</span><?= _("Move forward through top menu") ?></li>
47+
<li class="u-mb20"><span class="key">Enter</span><?= _("Enter focused element") ?></li>
48+
<li><span class="key bigger">&uarr;</span><?= _("Move up through elements list") ?></li>
49+
<li><span class="key bigger">&darr;</span><?= _("Move down through elements list") ?></li>
5150
</ul>
5251
</div>
5352
</dialog>
@@ -56,24 +55,22 @@ class="shortcuts-close"
5655
x-on:click="$refs.dialog.showModal()"
5756
type="button"
5857
class="button button-secondary button-circle button-floating button-floating-shortcuts"
59-
title="<?=_('Shortcuts');?>"
58+
title="<?= _("Shortcuts") ?>"
6059
>
6160
<i class="fas fa-keyboard"></i>
62-
<span class="u-hidden"><?=_('Shortcuts');?></span>
61+
<span class="u-hidden"><?= _("Shortcuts") ?></span>
6362
</button>
6463
</div>
6564
<a
6665
href="#top"
6766
class="button button-secondary button-circle button-floating button-floating-top "
68-
title="<?=_('Top');?>"
67+
title="<?= _("Top") ?>"
6968
>
7069
<i class="fas fa-arrow-up"></i>
71-
<span class="u-hidden"><?=_('Top');?></span>
70+
<span class="u-hidden"><?= _("Top") ?></span>
7271
</a>
7372

74-
<?php
75-
if (!empty($_SESSION['error_msg'])):
76-
?>
73+
<?php if (!empty($_SESSION["error_msg"])): ?>
7774
<div>
7875
<script>
7976
$(function() {
@@ -95,7 +92,7 @@ class="button button-secondary button-circle button-floating button-floating-top
9592
});
9693
</script>
9794
<div id="dialog-message" title="">
98-
<p><?=htmlentities($_SESSION['error_msg'])?></p>
95+
<p><?= htmlentities($_SESSION["error_msg"]) ?></p>
9996
</div>
10097
</div>
10198
<?php

‎web/templates/includes/js.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
UNLIM_VALUE: 'unlimited',
3434
UNLIM_TRANSLATED_VALUE: '<?= _("unlimited") ?>',
3535
NOTIFICATIONS_EMPTY: '<?= _("no notifications") ?>',
36-
NOTIFICATIONS_DELETE_ALL: '<?= _("Delete notifications") ?>',
36+
NOTIFICATIONS_DELETE_ALL: '<?= _("Delete all notifications") ?>',
3737
isUnlimitedValue(value) {
3838
return value.trim() == this.UNLIM_VALUE || value.trim() == this.UNLIM_TRANSLATED_VALUE;
3939
}

0 commit comments

Comments
 (0)