From 198ad8b9cb61c0c8adb31c2f83c238ae5d057e1b Mon Sep 17 00:00:00 2001
From: Floran Brutel <contact@floran.fr>
Date: Sun, 20 Dec 2020 17:30:52 +0100
Subject: [PATCH 1/2] Display N/A only if gpu values are null

---
 .../static/js/components/plugin-gpu/view.html |  17 ++++++++---------
 glances/outputs/static/public/glances.js      | Bin 2206844 -> 2207031 bytes
 glances/outputs/static/public/glances.map.js  | Bin 2636911 -> 2637097 bytes
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/glances/outputs/static/js/components/plugin-gpu/view.html b/glances/outputs/static/js/components/plugin-gpu/view.html
index bdbf1695..bcbb986d 100644
--- a/glances/outputs/static/js/components/plugin-gpu/view.html
+++ b/glances/outputs/static/js/components/plugin-gpu/view.html
@@ -5,27 +5,26 @@
     <div class="table">
         <div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1">
             <div class="table-cell text-left">proc:</div>
-            <div class="table-cell" ng-class="vm.getMeanDecoration('proc')" ng-if="vm.mean.proc">{{ vm.mean.proc |
+            <div class="table-cell" ng-class="vm.getMeanDecoration('proc')" ng-if="vm.mean.proc != null">{{ vm.mean.proc |
                 number : 0 }}%
             </div>
-            <div class="table-cell" ng-if="!vm.mean.proc">N/A</div>
+            <div class="table-cell" ng-if="vm.mean.proc == null">N/A</div>
         </div>
         <div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1">
             <div class="table-cell text-left">mem:</div>
-            <div class="table-cell" ng-class="vm.getMeanDecoration('mem')" ng-if="vm.mean.mem">{{ vm.mean.mem | number :
+            <div class="table-cell" ng-class="vm.getMeanDecoration('mem')" ng-if="vm.mean.mem != null">{{ vm.mean.mem | number :
                 0 }}%
             </div>
-            <div class="table-cell" ng-if="!vm.mean.mem">N/A</div>
+            <div class="table-cell" ng-if="vm.mean.mem == null">N/A</div>
         </div>
         <div class="table-row" ng-if="!arguments.meangpu && vm.gpus.length > 1" ng-repeat="gpu in vm.gpus">
             <div class="table-cell text-left">
                 {{ gpu.gpu_id }}:
-                <span ng-class="vm.getDecoration(gpu.gpu_id, 'proc')"
-                      ng-if="gpu.proc">{{ gpu.proc | number : 0 }}%</span>
-                <span ng-if="!gpu.proc">N/A</span>
+                <span ng-class="vm.getDecoration(gpu.gpu_id, 'proc')" ng-if="gpu.proc != null">{{ gpu.proc | number : 0 }}%</span>
+                <span ng-if="gpu.proc == null">N/A</span>
                 mem:
-                <span ng-class="vm.getDecoration(gpu.gpu_id, 'mem')" ng-if="gpu.mem">{{ gpu.mem | number : 0 }}%</span>
-                <span ng-if="!gpu.mem">N/A</span>
+                <span ng-class="vm.getDecoration(gpu.gpu_id, 'mem')" ng-if="gpu.mem != null">{{ gpu.mem | number : 0 }}%</span>
+                <span ng-if="gpu.mem == null">N/A</span>
             </div>
         </div>
     </div>
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 73e2003dd868ae9bf49fe61eec010b36d61c9151..9c8320a9390c1e5c244c902174b6d2ae8c519456 100644
GIT binary patch
delta 784
zcmex!qm6O<tv1Gn7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB827Qq&w7U33=
z7SR^57V#E|7ReT=7U>q57TFfLE%Ju@S#$D>67#kj?w99~g0QCp*%sRiZ_0~ELj@Fh
z6zsPj`66%5i!5Npr0|>*svW4pnF}H5uziV`LcIX8K(e~RYDt8E{dQkR1yLjw_S+W*
zD#!~VtN5R+z=2|;TcLt3KeCEV4GMD^ITRFa74k}Ra;Ez?DO60q)2zTDR8W+ktY8Zf
zj#0An(|4SH@U()(^a<Y-IHxx>D#T5%Y*xra=zQL+P!7_`&4*Lh#ukNVk_vh0x|wOV
zF-qwLrFvjXV0Q0sRd5r4i$blQ&ex_;jj*M&O~I8Pq$W2t7iJGgiS+dK%M~_kU)Zj&
znjP7D-Texl&=8&ujsxMD3MojzY`=ZmVukHI$XeEHPzdHm7O>l+Fa<@0;7Ns9D53i5
znnDOH>cO_uepL7<h-}7MX2q|_Q8iu8Sdo4E3lYW5$c}-CK9pDdhZ2iGwNfY%U+$x*
rB@Quu`@&?!U3|z^%_>ryi)`rjvRcJG9LOpP+Z07ne0X%C;&v$j^P~xI

delta 523
zcmX|-ODKd<6vz9<Ft2YOjCtcbS2Cq2SrAF1j4a5=!oq?KvY7FHHPOVGZ|sD{&0@;J
zjs>M|nW@P}*+^M1R!Xr`gq4Mvxi`Dt{oQl^opaceD*ZmHQXD1JU<qom6w6SDdNiOB
zO(>%oEoem>mSY9lu@W8VL>IczgI@Gu6;@--h0>g*p&Mvp(X4Xk;TX#)mA(RYvHLHj
z)y#1~18)Y7>oRDK9Iu=Zw{cAP;k200#g+r$5cW0%N(C=y4uf8VZOlWXmD~3?q$GN<
z1#4!q5^0J|jz^p37G@`yvJG~Lwj->{{~wXb2+jLmYD&N>T^u5ATXec{W~y_vc6x5P
z*hh^j1P$c>Ii^C4zNpZnFS<fPUis+rwPK@ZBjku_cHl(EhxyorKC$HHA%w+}^~b>E
zLP0mHJBL9N$8-kvWR|x%u~hT{hP^ze>=Qo9Id*8tx46ZUgItQp1t6t%UXX4fUU4^1
iKWT7rn+%hfg=27$q(qy4lVtSV`jf<AVu5|~<NX6i%ERLT

diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js
index 670581e59a187eba150f5267735a193f2838fee5..109f3f2b4b91070342d741eefcd4cd82d9a11568 100644
GIT binary patch
delta 1239
zcmZvaZAep57{{4;+vcXb+thq-Yk8g-m-&*-iOKaUBpGHQgp?t&ra|r|fexu4lhFsE
zbT>L!7*f$2DI&x{5-Ad)A{8RAPxZ+!5e9we1;w6CZD-JjAD4Un|L5hL=UM$VrhD>d
zOgH3B?<lLNtnhV|dj0-@x2&T)P<f_gcp_h$Ow#wOVO1Aalfvqbu$uf_6$VER`<fNS
z*DU$!@KY!CwJ1toi{!;WZ=K{t&D$*b6~!-w>J=qaFZI=;p;qc_RFuv}DTIHa+A2k<
z>*}PFH-!o6IISz9OOJ#?IvLSfS<@Zi^}heMbdAgl$WBC$7!V_pf|w99l8U4u7DPm>
zhz+qL=|~2WiR?nMkZdFe$wl&ze53%`jW`e|vIlV?dl{K8{5B<Yoxjko()L%xr-{i1
zD&HVR*4jrb*_^`eN66)z_<_vY#>s6HcR*`qNE*dB8@)14M0R$X{MK*k40HDz;@%p%
zFh@*uW04r60U2~*4YKHB2)u0MEtyT@oSMmCre7<;$>u(hk6Cd=*2WEDRI$-_Yf!{o
zKgdZgP-ZhaSQa@ym2F_4OBrCK>qd7K+ieGXLjOlyU}l#K;BhJ!6)`1KsT^ZsJwzn9
zt1~#9)eg0%tBaO+U?9CW=m`eeRZsVY^L|J5rovu&pqMkR7Q<EhwlNq8Zu=<uj?;w_
z_(`)pU=lmKdp7fISNL8EN8+bj*=g>6D4@qKl4ROZ2L5<IZ_1#-63xMtU}z5S<Zi@1
zS3+=WFwvpQTF{)zJ>&-k0^F=*DjouXU21?L{<XBHsj(m@vz-9V$mOR^ZD3^I+Cb#}
z?BF@bH1oFgUNC6SEU}l3%`lhY2IO%|Cu^f(Y{X7>Y8XZnhPnO_EdO>Vk1kCUGaI-E
ztrot7{2uh$sx^fbPr*jQoubOESxgZd>w_22YUKhM$^!|zHfT?w*MDrU!GRU1$mIN5
zce=nP*I+&2f<tDvmEo!_Cse*-bL&~I-Mz9k6Q;{?M-twz#^n~M1a2ey;&R`}`U`z9
B$2I@}

delta 952
zcmZwEOGs2v7zc1>nmf+Jab|KfpEa7E?^+j~lEy)UIu3=Hkzr&+lH)6)yiJ*yl|{)A
z;YOY6Bg+t4h=FB793tsK&>{)i7!)mn#1>IX7(Jlq^PZ_yiyxft{Lej)?~eT(G0lG;
zG4%(1kx*Ntr6sVTHPRGm4F<|WO>IpBw{znY=A?6aOgF`Jb4*_r(=GROrSEEWM;+%K
zby_IQc_^#}>NyY8YeA}lVJ(q0bKb0VR&m~0rFB<w-d(93tl|7%jn+j~S7im~;po~h
z-o2!ZqrbsagfB;xLYx>hdBu)v%F{Lfz0(EuOd(d1L~O)P9K=bIiHoEVH}McJSx!=k
zkED@wvVvrgOp-;iNe;;+E6FP2CwU~FtR@A5JuCb)iBG<;kf`lu{!BR>A7njQOT$e<
zA7?{OIjp(QifqO(e#UAQkDjoNvJ{)1v!Gih4x0<dHOLbmUbC4DL3_-mEG3)qjsx5{
zeTbqgGmLtS<#>2G*n}$;>g5^nAxAPk7-W8Y{FbHR=V`VY=ie}=Sg{JWxI{z)rx}kI
zLoWu-GK;;vHKG?sj~!_i&JrjwVPyc$8;Q+G+FRR^f}N<YgKv20GWf21_9&Rs%N(`?
z(N5z_EME`X?0NsnQ>CyH{im4)#d>JQ{8Fg487XZhD2!R<#oISRvZyVGNRq4@IatIG
z4r8(<SX&K>_*e}^iHF^Cxt1PZATI8Pe!KCFXlR5?8DnD<yn=EiSw_ASus0KrPQvE+
z4Ub!P^!)$~dyF~k8-*0vr;$Q6N4Rf7gImz*9rmSsD?S!r#o>owmkqC&f_+{iiSJ2G
z5eqLs&yd&dc?S+GS^T^3)f|+i8%aFsQ}DN0wTu0~U{T&GzCF#G_&Xn1j+k|**AuTj
rnXY=|QD0NlDcPd<P<mpHWvlt}$+(cKDmXdFim-o<Ws8{tbyvn8@hNXc


From a6dbea1e25351bc60298bf40b2edaaad1276259e Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Tue, 22 Dec 2020 08:15:43 +1100
Subject: [PATCH 2/2] docs: fix simple typo, optionnal -> optional

There is a small typo in glances/static_list.py.

Should read `optional` rather than `optionnal`.
---
 glances/static_list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glances/static_list.py b/glances/static_list.py
index 29088f51..0a14f6ed 100644
--- a/glances/static_list.py
+++ b/glances/static_list.py
@@ -54,7 +54,7 @@ class GlancesStaticServer(object):
                 for s in ['name', 'port', 'alias']:
                     new_server[s] = config.get_value(self._section, '%s%s' % (postfix, s))
                 if new_server['name'] is not None:
-                    # Manage optionnal information
+                    # Manage optional information
                     if new_server['port'] is None:
                         new_server['port'] = '61209'
                     new_server['username'] = 'glances'