Correct some minor artifact issue in the WebUI

pull/2135/head
nicolargo 2022-09-11 18:04:04 +02:00
parent 5a1315130b
commit 8a1d4ab53a
7 changed files with 35 additions and 17 deletions

View File

@ -118,6 +118,9 @@ run: ## Start Glances in console mode (also called standalone)
run-debug: ## Start Glances in debug console mode (also called standalone)
./venv/bin/python -m glances -C ./conf/glances.conf -d
run-local-conf: ## Start Glances in console mode with the system conf file
./venv/bin/python -m glances
run-webserver: ## Start Glances in Web server mode
./venv/bin/python -m glances -C ./conf/glances.conf -w

View File

@ -159,6 +159,22 @@ body {
text-overflow: ellipsis;
}
#ip {
padding-left: 10px;
}
#ip span {
padding-left: 10px;
}
#processcount > span:nth-child(1) {
padding-left: 0px;
}
#processcount span {
padding-left: 10px;
}
/* Loading page */
#loading-page .glances-logo {

View File

@ -11,7 +11,7 @@
<div class="pull-left">
<glances-plugin-system :data="data"></glances-plugin-system>
</div>
<div class="pull-left" v-if="args.disable_ip">
<div class="pull-left" v-if="!args.disable_ip">
<glances-plugin-ip :data="data"></glances-plugin-ip>
</div>
<div class="pull-right">

View File

@ -1,11 +1,10 @@
<template>
<section id="ip" v-if="address != undefined">
-
<span v-if="address != undefined" class="title">IP</span>
<span v-if="address != undefined">{{ address }}/{{ maskCidr }}</span>
<span v-if="publicAddress" class="title">Pub</span>
<span v-if="publicAddress">{{ publicAddress }}</span>
<span v-if="publicInfo">({{ publicInfo }})</span>
<span v-if="address != undefined">{{ address }}/{{ maskCdir }}</span>
<span v-if="publicAddress != undefined" class="title">Pub</span>
<span v-if="publicAddress != undefined">{{ publicAddress }}</span>
<span v-if="publicInfo != undefined">({{ publicInfo }})</span>
</section>
</template>
@ -26,9 +25,9 @@ export default {
gateway() {
return this.ipStats.gateway;
},
mask() {
return this.ipStats.mask;
},
// mask() {
// return this.ipStats.mask;
// },
maskCdir() {
return this.ipStats.mask_cidr;
},

View File

@ -5,10 +5,8 @@
<span>{{ running }} run,</span>
<span>{{ sleeping }} slp,</span>
<span>{{ stopped }} oth</span>
<span>
sorted {{ sorter.auto ? 'automatically' : '' }} by
{{ sorter.getColumnLabel(sorter.column) }}, flat view
</span>
<span class="title">sorted {{ sorter.auto ? 'automatically' : '' }}</span>
<span>by {{ sorter.getColumnLabel(sorter.column) }}</span>
</section>
</template>

File diff suppressed because one or more lines are too long

View File

@ -127,8 +127,10 @@ class Plugin(GlancesPlugin):
logger.debug("Cannot grab public IP information ({})".format(e))
else:
stats['public_address'] = self.public_address
stats['public_info'] = self.public_info
stats['public_info_human'] = self.public_info_for_human(stats['public_info'])
# Too much information provided in the public_info
# Limit it to public_info_for_human
# stats['public_info'] = self.public_info
stats['public_info_human'] = self.public_info_for_human(self.public_info)
elif self.input_method == 'snmp':
# Not implemented yet