Browse Source

Minor UI fixes to server console output (#3556)

* Minor UI fixes to server console output

* Apply the suggested CSS updates

* Fix missing changes
myrevery 2 years ago
parent
commit
5fa820312b

+ 4 - 4
bin/v-list-sys-cpu-status

@@ -12,13 +12,13 @@
 
 # Displaying top 30
 top -b -n1 | head -n 37
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying process tree
 pstree -s
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying CPU information
 grep 'model name' /proc/cpuinfo | cut -f 2 -d : | sed "s/ //"

+ 2 - 2
bin/v-list-sys-db-status

@@ -65,8 +65,8 @@ for db in $(echo $DB_SYSTEM | tr ',' '\n'); do
 				mysqladmin --defaults-file=$mycnf status | sed -e "s/  /\n/g"
 				echo
 				mysqladmin --defaults-file=$mycnf processlist
-				echo -en "\n-------------------------------------"
-				echo -en "-------------------------------------\n\n"
+				echo -en "\n---------------------------------------------"
+				echo -en "---------------------------------------------\n\n"
 			fi
 
 			# Checking PostgreSQL

+ 6 - 6
bin/v-list-sys-disk-status

@@ -12,18 +12,18 @@
 
 # Displaying disk usage
 df -h
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying inodes usage
 df -ih
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying I/O usage
 iostat -m
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying disk information
 fdisk -l

+ 2 - 2
bin/v-list-sys-mail-status

@@ -35,8 +35,8 @@ fi
 # Displaying exim queue status
 echo "Exim queue status"
 exim -bp
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying exim stats
 if [ -e "/var/log/exim4/mainlog" ]; then

+ 4 - 4
bin/v-list-sys-memory-status

@@ -12,13 +12,13 @@
 
 # Displaying memory and swap usage
 free -t -m
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying memory stats
 vmstat -S m -s
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying ram information
 dmidecode -t 17 2> /dev/null

+ 5 - 5
bin/v-list-sys-network-status

@@ -12,13 +12,13 @@
 
 # Displaying network stats
 ss -s
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying network usage
-lsof -itcp -n -P
-echo -en "\n-------------------------------------"
-echo -en "-------------------------------------\n\n"
+lsof -iudp -itcp -n -P
+echo -en "\n---------------------------------------------"
+echo -en "---------------------------------------------\n\n"
 
 # Displaying network interfaces
 ip addr list

+ 1 - 1
web/css/src/themes/dark.css

@@ -834,7 +834,7 @@ strong {
 }
 
 .server-console-output {
-	background: #282828;
+	background-color: #282828;
 }
 
 .body-stats .units .l-unit {

+ 3 - 3
web/css/src/themes/default.css

@@ -2248,9 +2248,10 @@
 }
 
 .console-output {
+	color: #202020;
 	font-family: var(--font-family-monospace);
 	font-size: 0.92rem;
-	color: #202020;
+	line-height: 1.15;
 }
 
 #vstobjects.suspended {
@@ -2438,9 +2439,8 @@
 }
 
 .server-console-output {
-	color: #c36;
+	background-color: #fff;
 	padding: 10px 0 20px 20px;
-	background: #fff;
 }
 
 .userlist-email {

+ 2 - 2
web/templates/pages/list_backup_detail.php

@@ -184,10 +184,10 @@
 					<input id="check5<?= $i ?>" class="ch-toggle" type="checkbox" name="check" value="<?= $key ?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Cron Records") ?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Cron Jobs") ?></div>
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-7">
-					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= "cron " . _("Records") ?></b></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= _("Jobs") ?></b></div>
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
 					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">

+ 1 - 1
web/templates/pages/list_server_info.php

@@ -119,6 +119,6 @@
 		<span class="u-hidden"><?= _("Top") ?></span>
 	</a>
 
-	<div class="server-console-output">.</div>
+	<div class="server-console-output">&nbsp;</div>
 	<div class="container">
 		<pre class="console-output animate__animated animate__fadeIn">