Skip to content

Commit cfc125f

Browse files
authored
Fix lots of aliases impacting table (hestiacp#3651)
1 parent 6e3c54a commit cfc125f

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
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 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 with a "failed to obtain exit status for remote process" error. If this happens simply unmount and remount e.g.
1919

2020
```bash
2121
multipass unmount hestia-dev

web/css/src/utilities.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@
127127
width: 100% !important;
128128
}
129129

130+
.u-text-ellipsis {
131+
overflow: hidden !important;
132+
text-overflow: ellipsis !important;
133+
white-space: nowrap !important;
134+
}
135+
130136
.u-min-height100 {
131137
min-height: 100px !important;
132138
}
@@ -139,6 +145,10 @@
139145
min-height: 600px !important;
140146
}
141147

148+
.u-max-width300 {
149+
max-width: 300px !important;
150+
}
151+
142152
.u-max-height300 {
143153
max-height: 300px !important;
144154
}

web/templates/pages/list_user.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@
144144
<?php if ($key == $user_plain) { ?>
145145
<a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit User") ?>">
146146
<span class="u-text-bold">
147-
<?=$key?>
147+
<?= $key ?>
148148
</span>
149149
(<?=$data[$key]['NAME'];?>)
150150
</a>
151151
<?php } else { ?>
152152
<a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Log in as") ?> <?=$key?>">
153153
<span class="u-text-bold">
154-
<?=$key?>
154+
<?= $key ?>
155155
</span>
156156
(<?=$data[$key]['NAME'];?>)
157157
</a>

web/templates/pages/list_web.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,25 @@
195195
</div>
196196
<div class="units-table-cell u-text-bold">
197197
<span class="u-hide-desktop"><?= _("Name") ?>:</span>
198-
<?php if ($read_only === 'true') {?>
199-
<?=$key?>
198+
<?php if ($read_only === 'true') { ?>
199+
<?= $key ?>
200200
<?php } else {
201201
$aliases = explode(',', $data[$key]['ALIAS']);
202202
$alias_new = array();
203203
foreach($aliases as $alias){
204-
if($alias != 'www.'.$key){
204+
if ($alias != 'www.'.$key) {
205205
$alias_new[] = trim($alias);
206206
}
207207
}
208208
?>
209209
<a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Domain") ?>: <?=$key?>">
210210
<?= $key ?>
211-
<?php if (!empty($alias_new) && !empty($data[$key]['ALIAS'])) {
212-
echo " <span class=\"hint\">(".implode(',',$alias_new).")";
213-
} ?>
211+
<?php
212+
if (!empty($alias_new) && !empty($data[$key]['ALIAS'])) {
213+
$aliases = implode(', ', $alias_new);
214+
echo "<p class='hint u-max-width300 u-text-ellipsis'>($aliases)</p>";
215+
}
216+
?>
214217
</a>
215218
<?php } ?>
216219
</div>

0 commit comments

Comments
 (0)