Merge pull request #1907 from nicolargo/webui-network-name

[WebUI] Better truncate of network name
nicolargo · Jul 28, 2021 · fe37342 · fe37342
2 parents 42d5642 + fd6e198
commit fe37342
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 42 deletions.
diff --git a/glances/outputs/static/js/components/plugin-fs/view.html b/glances/outputs/static/js/components/plugin-fs/view.html
@@ -8,7 +8,7 @@
 </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>
+            ng-show="fs.name.length <= 20">({{ 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>

diff --git a/glances/outputs/static/js/components/plugin-network/controller.js b/glances/outputs/static/js/components/plugin-network/controller.js
@@ -18,17 +18,18 @@ export default function GlancesPluginNetworkController($scope, $filter, GlancesS
         vm.networks = [];
         for (var i = 0; i < networkStats.length; i++) {
             var networkData = networkStats[i];
+            var alias = networkData['alias'] !== undefined ? networkData['alias'] : null
 
             var network = {
                 'interfaceName': networkData['interface_name'],
+                'ifname': alias ? alias : networkData['interface_name'],
                 'rx': networkData['rx'],
                 'tx': networkData['tx'],
                 'cx': networkData['cx'],
                 'time_since_update': networkData['time_since_update'],
                 'cumulativeRx': networkData['cumulative_rx'],
                 'cumulativeTx': networkData['cumulative_tx'],
                 'cumulativeCx': networkData['cumulative_cx'],
-                'alias': networkData['alias'] !== undefined ? networkData['alias'] : null
             };
 
             vm.networks.push(network);

diff --git a/glances/outputs/static/js/components/plugin-network/view.html b/glances/outputs/static/js/components/plugin-network/view.html
@@ -13,7 +13,10 @@
     <div class="table-cell" ng-show="vm.arguments.network_cumul && vm.arguments.network_sum">Rx+Tx</div>
 </div>
 <div class="table-row" ng-repeat="network in vm.networks track by network.interfaceName">
-    <div class="table-cell text-left">{{ (network.alias ? network.alias : network.interfaceName) | min_size }}</div>
+    <div class="table-cell text-left">
+        <span class="visible-lg-inline">{{ network.ifname }}</span>
+        <span class="hidden-lg">{{ network.ifname | min_size }}</span>
+    </div>
     <div class="table-cell" ng-show="!vm.arguments.network_cumul && !vm.arguments.network_sum">{{ vm.arguments.byte ?
         (network.rx / network.time_since_update | bytes) : (network.rx / network.time_since_update | bits) }}
     </div>

diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json