From dd4460c4b5b48ca69fe9af803524f5cbb1aa0750 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Thu, 8 Oct 2020 08:40:26 +0200 Subject: [PATCH] WebUI : Hide the process count of amp if regex is not defined --- glances/outputs/static/css/style.scss | 4 ++-- .../js/components/plugin-amps/controller.js | 2 +- .../js/components/plugin-amps/view.html | 4 ++-- glances/outputs/static/public/glances.js | Bin 2207089 -> 2207085 bytes glances/outputs/static/public/glances.map.js | Bin 2637194 -> 2637194 bytes 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glances/outputs/static/css/style.scss b/glances/outputs/static/css/style.scss index 8985d464..f461386b 100644 --- a/glances/outputs/static/css/style.scss +++ b/glances/outputs/static/css/style.scss @@ -148,7 +148,7 @@ body { } } -#amps-plugin .process-result { +#amps .process-result { max-width: 300px; overflow: hidden; white-space: pre-wrap; @@ -156,7 +156,7 @@ body { text-overflow: ellipsis; } -#gpu-plugin .gpu-name { +#gpu .gpu-name { white-space: nowrap; overflow: hidden; width: 100%; diff --git a/glances/outputs/static/js/components/plugin-amps/controller.js b/glances/outputs/static/js/components/plugin-amps/controller.js index d552530b..b66fe548 100644 --- a/glances/outputs/static/js/components/plugin-amps/controller.js +++ b/glances/outputs/static/js/components/plugin-amps/controller.js @@ -22,7 +22,7 @@ export default function GlancesPluginAmpsController($scope, GlancesStats, favico }, this); }; - vm.getDescriptionDecoration = function (process) { + vm.getNameDecoration = function (process) { var count = process.count; var countMin = process.countmin; var countMax = process.countmax; diff --git a/glances/outputs/static/js/components/plugin-amps/view.html b/glances/outputs/static/js/components/plugin-amps/view.html index 09f9298e..cc312250 100644 --- a/glances/outputs/static/js/components/plugin-amps/view.html +++ b/glances/outputs/static/js/components/plugin-amps/view.html @@ -1,8 +1,8 @@
-
{{ process.name }}
-
{{ process.count }}
+
{{ process.name }}
+
{{ process.count }}
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index 272b3715fe754d2f15f302b1ec5122c679a16dc1..9858f5d8d299fc1079382f271f9cdfb23b8460b9 100644 GIT binary patch delta 200 zcmex(tBvt35I3|iwlK9Yx3ILZwy?FZw{UFXd>AtQMF{8Q_NGuyAm##MZXo6XVqPHT z17dz4764*FAQl2*VIUR(Vo@L#17dL?mH=W&AeI7RX&{yXVp$-T+ujr^FSv@uFEKZD z`orT2;?rjsDGE>j6(YmC{px@D6lOk~%ZW<( delta 193 zcmaERtBvs^5I3|iwlK9Yx3ILZwy?FZw{UFXd>F#6TaZ(lo|!lOVF>4B7^l4?loN=# zfS4PId4QM~i1~n+ABY8jSP+PXfLIuaMSxfoh{b?d9Ec@=SQ3b(fLI!cWq?=~h~>7I zgvtx9;&MqXPAS^|(y;y2xsnywFW|nV6!)YiHlv|4sqUT}KU22d-ODz}DU=;kL zB?)Q?q6R&14DusnA3*3s1liNx@EabUXLu^#HBy0Uz?AlfvVn}>>+>!LyqP6mC>&h5 ze70S^sC1`dT_kTmbhk@%G}tBcS}DSDQiK}1#Hq+#azj*$1=&GVpazZNAk2NmQAluH zA>kIV79#F^jN|e#cMd5RS>?EBd56AUGakBe&g>~C7mO1A_k|p9F`xw<^nf0Ep%40D zK#8{uM|bp{H{Po49)WK1Mp15OjW7s9FbpGLf>9U)Gg!b1<1hh}V1p@`20J*w2{SMY zb4okQ9&c;5Qu{phezIoTsIw;e)L`{WwZVR=4S&r#pO%WL!<;12+K0Q&{T39Bhrlp!Cn@!BW8T(0#zX(uvYj0r zvz@1#{b$rI64}*=wt$UnNHS@j?QIa(>G3G)tm0w!J4(briXRAC02K|yB}i(Vm2UV z2VxE&<^*CcAm#>Q9w6r3?tYA~d_KEwK~8CUX5RFDsr<8Goc4$`ejpYAVnHAl0%Bnx z76D>WAQl5+aUhleVo4yD0%B<(mH}c}AeIASc_3B*VnrZU0%Bz#Rsmww?Gb5eul>1Q rQj3#|G7CyF^Yf+~+)xwW9=A=6g#|@8ZI@bF`-@#_+h6QbU(^HuUNwg=