Skip to content

Commit 5fa8203

Browse files
myreverymyrevery
authored
Minor UI fixes to server console output (hestiacp#3556)
* Minor UI fixes to server console output * Apply the suggested CSS updates * Fix missing changes
1 parent 276dcc2 commit 5fa8203

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎bin/v-list-sys-cpu-status‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
# Displaying top 30
1414
top -b -n1 | head -n 37
15-
echo -en "\n-------------------------------------"
16-
echo -en "-------------------------------------\n\n"
15+
echo -en "\n---------------------------------------------"
16+
echo -en "---------------------------------------------\n\n"
1717

1818
# Displaying process tree
1919
pstree -s
20-
echo -en "\n-------------------------------------"
21-
echo -en "-------------------------------------\n\n"
20+
echo -en "\n---------------------------------------------"
21+
echo -en "---------------------------------------------\n\n"
2222

2323
# Displaying CPU information
2424
grep 'model name' /proc/cpuinfo | cut -f 2 -d : | sed "s/ //"

‎bin/v-list-sys-db-status‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ for db in $(echo $DB_SYSTEM | tr ',' '\n'); do
6565
mysqladmin --defaults-file=$mycnf status | sed -e "s/ /\n/g"
6666
echo
6767
mysqladmin --defaults-file=$mycnf processlist
68-
echo -en "\n-------------------------------------"
69-
echo -en "-------------------------------------\n\n"
68+
echo -en "\n---------------------------------------------"
69+
echo -en "---------------------------------------------\n\n"
7070
fi
7171

7272
# Checking PostgreSQL

‎bin/v-list-sys-disk-status‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212

1313
# Displaying disk usage
1414
df -h
15-
echo -en "\n-------------------------------------"
16-
echo -en "-------------------------------------\n\n"
15+
echo -en "\n---------------------------------------------"
16+
echo -en "---------------------------------------------\n\n"
1717

1818
# Displaying inodes usage
1919
df -ih
20-
echo -en "\n-------------------------------------"
21-
echo -en "-------------------------------------\n\n"
20+
echo -en "\n---------------------------------------------"
21+
echo -en "---------------------------------------------\n\n"
2222

2323
# Displaying I/O usage
2424
iostat -m
25-
echo -en "\n-------------------------------------"
26-
echo -en "-------------------------------------\n\n"
25+
echo -en "\n---------------------------------------------"
26+
echo -en "---------------------------------------------\n\n"
2727

2828
# Displaying disk information
2929
fdisk -l

‎bin/v-list-sys-mail-status‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ fi
3535
# Displaying exim queue status
3636
echo "Exim queue status"
3737
exim -bp
38-
echo -en "\n-------------------------------------"
39-
echo -en "-------------------------------------\n\n"
38+
echo -en "\n---------------------------------------------"
39+
echo -en "---------------------------------------------\n\n"
4040

4141
# Displaying exim stats
4242
if [ -e "/var/log/exim4/mainlog" ]; then

‎bin/v-list-sys-memory-status‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
# Displaying memory and swap usage
1414
free -t -m
15-
echo -en "\n-------------------------------------"
16-
echo -en "-------------------------------------\n\n"
15+
echo -en "\n---------------------------------------------"
16+
echo -en "---------------------------------------------\n\n"
1717

1818
# Displaying memory stats
1919
vmstat -S m -s
20-
echo -en "\n-------------------------------------"
21-
echo -en "-------------------------------------\n\n"
20+
echo -en "\n---------------------------------------------"
21+
echo -en "---------------------------------------------\n\n"
2222

2323
# Displaying ram information
2424
dmidecode -t 17 2> /dev/null

‎bin/v-list-sys-network-status‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
# Displaying network stats
1414
ss -s
15-
echo -en "\n-------------------------------------"
16-
echo -en "-------------------------------------\n\n"
15+
echo -en "\n---------------------------------------------"
16+
echo -en "---------------------------------------------\n\n"
1717

1818
# Displaying network usage
19-
lsof -itcp -n -P
20-
echo -en "\n-------------------------------------"
21-
echo -en "-------------------------------------\n\n"
19+
lsof -iudp -itcp -n -P
20+
echo -en "\n---------------------------------------------"
21+
echo -en "---------------------------------------------\n\n"
2222

2323
# Displaying network interfaces
2424
ip addr list

‎web/css/src/themes/dark.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ strong {
834834
}
835835

836836
.server-console-output {
837-
background: #282828;
837+
background-color: #282828;
838838
}
839839

840840
.body-stats .units .l-unit {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2248,9 +2248,10 @@
22482248
}
22492249

22502250
.console-output {
2251+
color: #202020;
22512252
font-family: var(--font-family-monospace);
22522253
font-size: 0.92rem;
2253-
color: #202020;
2254+
line-height: 1.15;
22542255
}
22552256

22562257
#vstobjects.suspended {
@@ -2438,9 +2439,8 @@
24382439
}
24392440

24402441
.server-console-output {
2441-
color: #c36;
2442+
background-color: #fff;
24422443
padding: 10px 0 20px 20px;
2443-
background: #fff;
24442444
}
24452445

24462446
.userlist-email {

‎web/templates/pages/list_backup_detail.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@
184184
<input id="check5<?= $i ?>" class="ch-toggle" type="checkbox" name="check" value="<?= $key ?>">
185185
</div>
186186
<div class="clearfix l-unit__stat-col--left compact-4">
187-
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Cron Records") ?></div>
187+
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Cron Jobs") ?></div>
188188
</div>
189189
<div class="clearfix l-unit__stat-col--left wide-7">
190-
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= "cron " . _("Records") ?></b></div>
190+
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= _("Jobs") ?></b></div>
191191
</div>
192192
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
193193
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">

‎web/templates/pages/list_server_info.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@ class="button button-secondary button-circle button-floating button-floating-top
119119
<span class="u-hidden"><?= _("Top") ?></span>
120120
</a>
121121

122-
<div class="server-console-output">.</div>
122+
<div class="server-console-output">&nbsp;</div>
123123
<div class="container">
124124
<pre class="console-output animate__animated animate__fadeIn">

0 commit comments

Comments
 (0)