mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-13 03:17:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Drive names truncated in Web UI #2055

Browse Source
This commit is contained in:
nicolargo
2022-07-26 10:32:53 +02:00
parent d5efb63591
commit ca0aaed56c
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glances/outputs/static/js/components/plugin-diskio/view.html
View File

@@ -7,10 +7,10 @@
<div class="table-cell" ng-show="vm.arguments.diskio_iops">IOW/s</div>
</div>
<div class="table-row" ng-repeat="disk in vm.disks">
<div class="table-cell text-left">{{(disk.alias ? disk.alias : disk.name) | min_size:9}}</div>
<div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{disk.bitrate.txps }}</div>
<div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{disk.bitrate.rxps }}</div>
<div class="table-cell text-left">{{ (disk.alias ? disk.alias : disk.name) | min_size:32 }}</div>
<div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{ disk.bitrate.txps }}</div>
<div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{ disk.bitrate.rxps }}</div>
<div class="table-cell" ng-show="vm.arguments.diskio_iops">{{disk.count.txps }}</div>
<div class="table-cell" ng-show="vm.arguments.diskio_iops">{{disk.count.rxps }}</div>
<div class="table-cell" ng-show="vm.arguments.diskio_iops">{{ disk.count.txps }}</div>
<div class="table-cell" ng-show="vm.arguments.diskio_iops">{{ disk.count.rxps }}</div>
</div>

4
glances/outputs/static/js/components/plugin-fs/controller.js
View File

@@ -22,8 +22,8 @@ export default function GlancesPluginFsController($scope, $filter, GlancesStats,
var fsData = stats[i];
var shortMountPoint = fsData['mnt_point'];
if (shortMountPoint.length > 9) {
shortMountPoint = '_' + fsData['mnt_point'].slice(-8);
if (shortMountPoint.length > 22) {
shortMountPoint = '_' + fsData['mnt_point'].slice(-21);
}
vm.fileSystems.push({

4
glances/outputs/static/js/components/plugin-fs/view.html
View File

@@ -7,8 +7,8 @@
<div class="table-cell">Total</div>
</div>
<div class="table-row" ng-repeat="fs in vm.fileSystems">
<div class="table-cell text-left">{{ fs.shortMountPoint }} <span class="visible-lg-inline"
ng-show="fs.name.length <= 20">({{ fs.name }})</span>
<div class="table-cell text-left">{{ fs.shortMountPoint }}
<span class="visible-lg-inline" ng-show="fs.shortMountPoint <= 12">({{ fs.name }})</span>
</div>
<div class="table-cell" ng-class="vm.getDecoration(fs.mountPoint, 'used')">
<span ng-show="!vm.arguments.fs_free_space">{{ fs.used | bytes }}</span>

BIN
glances/outputs/static/public/glances.js vendored
View File

Binary file not shown.

BIN
glances/outputs/static/public/glances.map.js vendored
View File

Binary file not shown.

5
glances/plugins/glances_diskio.py
View File

@@ -187,10 +187,7 @@ class Plugin(GlancesPlugin):
if all([self.get_views(item=i[self.get_key()], key=f, option='hidden') for f in self.hide_zero_fields]):
continue
# Is there an alias for the disk name ?
disk_real_name = i['disk_name']
disk_name = self.has_alias(i['disk_name'])
if disk_name is None:
disk_name = disk_real_name
disk_name = self.has_alias(i['disk_name']) if self.has_alias(i['disk_name']) else i['disk_name']
# New line
ret.append(self.curse_new_line())
if len(disk_name) > name_max_width: