Merge branch 'develop' of https://github.com/nicolargo/glances into develop

2 files changed, 2 insertions, 2 deletions

diff --git a/glances/outputs/static/html/plugins/ip.html b/glances/outputs/static/html/plugins/ip.html
index 5e075618..bfcbf643 100644
--- a/glances/outputs/static/html/plugins/ip.html
+++ b/glances/outputs/static/html/plugins/ip.html
@@ -1 +1 @@
-&nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ statsIp.address }}/{{ statsIp.maskCidr }}</span>&nbsp;<span class="title">Pub</span>&nbsp;<span>{{ statsIp.publicAddress }}</span>
+&nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ statsIp.address }}/{{ statsIp.maskCidr }}</span>&nbsp;<span ng-if="statsIp.publicAddress" class="title">Pub</span>&nbsp;<span>{{ statsIp.publicAddress }}</span>
diff --git a/glances/outputs/static/public/js/templates.min.js b/glances/outputs/static/public/js/templates.min.js
index db0d5d6d..69e92aa5 100644
--- a/glances/outputs/static/public/js/templates.min.js
+++ b/glances/outputs/static/public/js/templates.min.js
@@ -7,7 +7,7 @@ $templateCache.put('plugins/docker.html','<span class="title">CONTAINERS</span>
 $templateCache.put('plugins/folders.html','<div class="table-row">\n    <div class="table-cell text-left title">FOLDERS</div>\n    <div class="table-cell">Size</div>\n</div>\n<div class="table-row" ng-repeat="folder in statsFolders.folders">\n    <div class="table-cell text-left">{{ folder.path }}</div>\n    <div class="table-cell" ng-class="statsFolders.getDecoration(folder)">{{ folder.size | bytes }}</div>\n</div>\n');
 $templateCache.put('plugins/fs.html','<div class="table-row">\n    <div class="table-cell text-left title">FILE SYS</div>\n    <div class="table-cell">\n        <span ng-show="!arguments.fs_free_space">Used</span>\n        <span ng-show="arguments.fs_free_space">Free</span>\n    </div>\n    <div class="table-cell">Total</div>\n</div>\n<div class="table-row" ng-repeat="fs in statsFs.fileSystems | orderBy:  \'mnt_point\'">\n    <div class="table-cell text-left">{{ fs.mountPoint }} <span class="visible-lg-inline" ng-show="fs.name.length <= 20">({{ fs.name }})<span></div>\n    <div class="table-cell" ng-class="statsFs.getDecoration(fs.mountPoint, \'used\')">\n        <span ng-show="!arguments.fs_free_space">{{ fs.used | bytes }}</span>\n        <span ng-show="arguments.fs_free_space">{{ fs.free | bytes }}</span>\n    </div>\n    <div class="table-cell">{{ fs.size | bytes }}</div>\n</div>\n');
 $templateCache.put('plugins/gpu.html','<div class="gpu-name title">\n    {{ statsGpu.name }}\n</div>\n<div class="table">\n    <div class="table-row" ng-if="arguments.meangpu || statsGpu.gpus.length === 1">\n        <div class="table-cell text-left">proc:</div>\n        <div class="table-cell" ng-class="statsGpu.getMeanDecoration(\'proc\')" ng-if="statsGpu.mean.proc">{{ statsGpu.mean.proc | number : 0 }}%</div>\n        <div class="table-cell" ng-if="!statsGpu.mean.proc">N/A</div>\n    </div>\n    <div class="table-row" ng-if="arguments.meangpu || statsGpu.gpus.length === 1">\n        <div class="table-cell text-left">mem:</div>\n        <div class="table-cell" ng-class="statsGpu.getMeanDecoration(\'mem\')" ng-if="statsGpu.mean.mem">{{ statsGpu.mean.mem | number : 0 }}%</div>\n        <div class="table-cell" ng-if="!statsGpu.mean.mem">N/A</div>\n    </div>\n    <div class="table-row" ng-if="!arguments.meangpu && statsGpu.gpus.length > 1" ng-repeat="gpu in statsGpu.gpus">\n        <div class="table-cell text-left">\n            {{ gpu.gpu_id }}:\n            <span ng-class="statsGpu.getDecoration(gpu.gpu_id, \'proc\')" ng-if="gpu.proc">{{ gpu.proc | number : 0 }}%</span>\n            <span ng-if="!gpu.proc">N/A</span>\n            mem:\n            <span ng-class="statsGpu.getDecoration(gpu.gpu_id, \'mem\')" ng-if="gpu.mem">{{ gpu.mem | number : 0 }}%</span>\n            <span ng-if="!gpu.mem">N/A</span>\n        </div>\n    </div>\n</div>\n');
-$templateCache.put('plugins/ip.html','&nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ statsIp.address }}/{{ statsIp.maskCidr }}</span>&nbsp;<span class="title">Pub</span>&nbsp;<span>{{ statsIp.publicAddress }}</span>\n');
+$templateCache.put('plugins/ip.html','&nbsp;-&nbsp;<span class="title">IP</span>&nbsp;<span>{{ statsIp.address }}/{{ statsIp.maskCidr }}</span>&nbsp;<span ng-if="statsIp.publicAddress" class="title">Pub</span>&nbsp;<span>{{ statsIp.publicAddress }}</span>\n');
 $templateCache.put('plugins/irq.html','<div class="table-row">\n    <div class="table-cell text-left title">IRQ</div>\n    <div class="table-cell"></div>\n    <div class="table-cell">Rate/s</div>\n</div>\n<div class="table-row" ng-repeat="irq in statsIrq.irqs">\n    <div class="table-cell text-left">{{irq.irq_line}}</div>\n    <div class="table-cell"></div>\n    <div class="table-cell"><span>{{irq.irq_rate}}</span></div>\n</div>\n');
 $templateCache.put('plugins/load.html','<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left title">LOAD</div>\n        <div class="table-cell">{{ statsLoad.cpucore }}-core</div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">1 min:</div>\n        <div class="table-cell">\n            {{ statsLoad.min1 | number : 2}}\n        </div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">5 min:</div>\n        <div class="table-cell" ng-class="statsLoad.getDecoration(\'min5\')">\n            {{ statsLoad.min5 | number : 2}}\n        </div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">15 min:</div>\n        <div class="table-cell" ng-class="statsLoad.getDecoration(\'min15\')">\n            {{ statsLoad.min15 | number : 2}}\n        </div>\n    </div>\n</div>\n');
 $templateCache.put('plugins/mem.html','<div class="table">\n    <div class="table-row">\n        <div class="table-cell text-left title">MEM</div>\n        <div class="table-cell">{{ statsMem.percent }}%</div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">total:</div>\n        <div class="table-cell">{{ statsMem.total | bytes }}</div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">used:</div>\n        <div class="table-cell" ng-class="statsMem.getDecoration(\'used\')">\n            {{ statsMem.used | bytes:2 }}\n        </div>\n    </div>\n    <div class="table-row">\n        <div class="table-cell text-left">free:</div>\n        <div class="table-cell">{{ statsMem.free | bytes }}</div>\n    </div>\n</div>\n');