Skip to content

Commit d048ce2

Browse files
AlecRustAlecRust
authored
Minor UI fixes (hestiacp#3395)
* Fix space in languages list * Fix toolbar items on locales with long words fixes hestiacp#3380 * Add required attribute to Add/Edit User forms And tidy "Role" select menu code.
1 parent 21dae06 commit d048ce2

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,10 @@
568568
&.active {
569569
box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
570570
}
571+
572+
& .form-select {
573+
max-width: 200px;
574+
}
571575
}
572576
}
573577

‎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/locale/languages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"hu": ["Hungarian"],
5555
"hr_locale": ["Hravtski"],
5656
"hr": ["Croatian"],
57-
"fr_locale": ["Fran\u00e7ais "],
57+
"fr_locale": ["Fran\u00e7ais"],
5858
"fr": ["French"],
5959
"fi_locale": ["Suomi"],
6060
"fi": ["Finnish"],

‎web/templates/pages/add_user.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@
3333
<?php show_alert_message($_SESSION); ?>
3434
<div class="u-mb10">
3535
<label for="v_username" class="form-label"><?= _("Username") ?></label>
36-
<input type="text" class="form-control" name="v_username" id="v_username" value="<?= htmlentities(trim($v_username, "'")) ?>" tabindex="1">
36+
<input type="text" class="form-control" name="v_username" id="v_username" value="<?= htmlentities(trim($v_username, "'")) ?>" tabindex="1" required>
3737
</div>
3838
<div class="u-mb10">
3939
<label for="v_name" class="form-label"><?= _("Contact") ?></label>
40-
<input type="text" class="form-control" name="v_name" id="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>" tabindex="2">
40+
<input type="text" class="form-control" name="v_name" id="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>" tabindex="2" required>
4141
</div>
4242
<div class="u-mb10">
4343
<label for="v_email" class="form-label"><?= _("Email") ?></label>
44-
<input type="email" class="form-control" name="v_email" id="v_email" value="<?= htmlentities(trim($v_email, "'")) ?>" tabindex="3">
44+
<input type="email" class="form-control" name="v_email" id="v_email" value="<?= htmlentities(trim($v_email, "'")) ?>" tabindex="3" required>
4545
</div>
4646
<div class="u-mb10">
4747
<label for="v_password" class="form-label">
4848
<?= _("Password") ?>
4949
<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate icon-green"></i></a>
5050
</label>
5151
<div class="u-pos-relative u-mb10">
52-
<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>" tabindex="4">
52+
<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>" tabindex="4" required>
5353
<div class="password-meter">
5454
<meter max="4" class="password-meter-input js-password-meter"></meter>
5555
</div>
@@ -77,7 +77,7 @@
7777
</div>
7878
<div class="u-mb10">
7979
<label for="v_language" class="form-label"><?= _("Language") ?></label>
80-
<select class="form-select" name="v_language" id="v_language" tabindex="6">
80+
<select class="form-select" name="v_language" id="v_language" tabindex="6" required>
8181
<?php
8282
foreach ($languages as $key => $value) {
8383
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
@@ -96,15 +96,15 @@
9696
</div>
9797
<div class="u-mb10">
9898
<label for="v_role" class="form-label"><?= _("Role") ?></label>
99-
<select class="form-select" name="v_role" id="v_role">
100-
<option value="user"><?= _("User") ?>
101-
<option value="admin" <?php if($v_role == "admin" ){ echo "selected"; } ?>><?= _("Administrator") ?>
102-
<option value="dns-cluster" <?php if($v_role == "dns-cluster" ){ echo "selected"; } ?>><?= _("DNS Sync user") ?>
99+
<select class="form-select" name="v_role" id="v_role" required>
100+
<option value="user"><?= _("User") ?></option>
101+
<option value="admin" <?= $v_role == "admin" ? "selected" : "" ?>><?= _("Administrator") ?></option>
102+
<option value="dns-cluster" <?= $v_role == "dns-cluster" ? "selected" : "" ?>><?= _("DNS Sync user") ?></option>
103103
</select>
104104
</div>
105105
<div class="u-mb10">
106106
<label for="v_package" class="form-label"><?= _("Package") ?></label>
107-
<select class="form-select" name="v_package" id="v_package" tabindex="8">
107+
<select class="form-select" name="v_package" id="v_package" tabindex="8" required>
108108
<?php
109109
foreach ($data as $key => $value) {
110110
echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";

‎web/templates/pages/edit_user.php‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ class="<?= $v_status ?>"
7777
<?php show_alert_message($_SESSION); ?>
7878
<div class="u-mb10">
7979
<label for="v_user" class="form-label"><?= _("Username") ?></label>
80-
<input type="text" class="form-control" name="v_user" id="v_user" value="<?= htmlentities(trim($v_username, "'")) ?>" disabled>
80+
<input type="text" class="form-control" name="v_user" id="v_user" value="<?= htmlentities(trim($v_username, "'")) ?>" disabled required>
8181
<input type="hidden" name="v_username" value="<?= htmlentities(trim($v_username, "'")) ?>">
8282
</div>
8383
<div class="u-mb10">
8484
<label for="v_name" class="form-label"><?= _("Contact") ?></label>
85-
<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> >
85+
<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> required>
8686
<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
8787
<input type="hidden" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
8888
<?php } ?>
8989
</div>
9090
<div class="u-mb10">
9191
<label for="v_email" class="form-label"><?= _("Email") ?></label>
92-
<input type="email" class="form-control" name="v_email" id="v_email" value="<?=htmlentities(trim($v_email, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?>>
92+
<input type="email" class="form-control" name="v_email" id="v_email" value="<?=htmlentities(trim($v_email, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> required>
9393
<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
9494
<input type="hidden" name="v_email" value="<?=htmlentities(trim($v_email, "'"))?>">
9595
<?php } ?>
@@ -150,7 +150,7 @@ class="<?= $v_status ?>"
150150
</div>
151151
<div class="u-mb10">
152152
<label for="v_language" class="form-label"><?= _("Language") ?></label>
153-
<select class="form-select" name="v_language" id="v_language">
153+
<select class="form-select" name="v_language" id="v_language" required>
154154
<?php
155155
foreach ($languages as $key => $value) {
156156
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
@@ -166,20 +166,16 @@ class="<?= $v_status ?>"
166166
?>
167167
</select>
168168
</div>
169-
<?php if ($v_username == "admin") { ?>
170-
<!-- Hide option to change 'admin' user's role-->
171-
<?php } else { ?>
172-
<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["user"] != $v_username) { ?>
173-
<div class="u-mb10">
174-
<label for="v_role" class="form-label"><?= _("Role") ?></label>
175-
<select class="form-select" name="v_role" id="v_role">
176-
<option value="user"><?= _("User") ?>
177-
<option value="admin" <?php if($v_role == "admin" ){ echo "selected"; } ?>><?= _("Administrator") ?>
178-
<option value="dns-cluster" <?php if($v_role == "dns-cluster" ){ echo "selected"; } ?>><?= _("DNS Sync user") ?>
179-
</select>
180-
</div>
181-
<?php } ?>
182-
<?php } ?>
169+
<?php if ($v_username != "admin" && $_SESSION["userContext"] === "admin" && $_SESSION["user"] != $v_username): ?>
170+
<div class="u-mb10">
171+
<label for="v_role" class="form-label"><?= _("Role") ?></label>
172+
<select class="form-select" name="v_role" id="v_role" required>
173+
<option value="user"><?= _("User") ?></option>
174+
<option value="admin" <?= $v_role == "admin" ? "selected" : "" ?>><?= _("Administrator") ?></option>
175+
<option value="dns-cluster" <?= $v_role == "dns-cluster" ? "selected" : "" ?>><?= _("DNS Sync user") ?></option>
176+
</select>
177+
</div>
178+
<?php endif; ?>
183179
<?php if ($_SESSION["POLICY_USER_CHANGE_THEME"] !== "no") { ?>
184180
<div class="u-mb10">
185181
<label for="v_user_theme" class="form-label"><?= _("Theme") ?></label>
@@ -209,7 +205,7 @@ class="<?= $v_status ?>"
209205
<?php if ($_SESSION['userContext'] === 'admin') {?>
210206
<div class="u-mb20">
211207
<label for="v_package" class="form-label"><?= _("Package") ?></label>
212-
<select class="form-select" name="v_package" id="v_package">
208+
<select class="form-select" name="v_package" id="v_package" required>
213209
<?php
214210
foreach ($packages as $key => $value) {
215211
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";

0 commit comments

Comments
 (0)