[pve-devel] [PATCH manager 2/4] ui: use some icons from widget-toolkit

Dominik Csapak d.csapak at proxmox.com
Mon Apr 19 13:00:46 CEST 2021


we moved them there

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 www/css/ext6-pve.css                     |  12 ------------
 www/images/Makefile                      |   4 +---
 www/images/icon-cpu.png                  | Bin 205 -> 0 bytes
 www/images/icon-cpu.xcf                  | Bin 816 -> 0 bytes
 www/images/icon-ram.png                  | Bin 193 -> 0 bytes
 www/images/icon-ram.xcf                  | Bin 747 -> 0 bytes
 www/manager6/lxc/Resources.js            |   4 ++--
 www/manager6/node/StatusView.js          |   4 ++--
 www/manager6/panel/GuestStatusView.js    |   4 ++--
 www/manager6/panel/TemplateStatusView.js |   4 ++--
 www/manager6/qemu/HardwareView.js        |   4 ++--
 11 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 www/images/icon-cpu.png
 delete mode 100644 www/images/icon-cpu.xcf
 delete mode 100644 www/images/icon-ram.png
 delete mode 100644 www/images/icon-ram.xcf

diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css
index 3b7a896b..80b726f9 100644
--- a/www/css/ext6-pve.css
+++ b/www/css/ext6-pve.css
@@ -281,8 +281,6 @@
 .pve-itype-icon-novnc,
 .pve-itype-icon-xtermjs,
 .pve-itype-icon-display,
-.pve-itype-icon-memory,
-.pve-itype-icon-processor,
 .pve-itype-icon-network,
 .pve-itype-icon-network-server,
 .pve-itype-icon-keyboard,
@@ -389,16 +387,6 @@
     background-image:url(../images/icon-cd.png);
 }
 
-.pve-itype-icon-memory
-{
-    background-image:url(../images/icon-ram.png);
-}
-
-.pve-itype-icon-processor
-{
-    background-image:url(../images/icon-cpu.png);
-}
-
 .pve-itype-icon-display
 {
     background-image:url(../images/icon-display.png);
diff --git a/www/images/Makefile b/www/images/Makefile
index 7e58901c..8b2d1796 100644
--- a/www/images/Makefile
+++ b/www/images/Makefile
@@ -14,7 +14,7 @@ all:
 # unchecked.png converted from extjs examples/ux/css/images/unchecked.gif
 # swap.png downloaded from https://www.iconfinder.com/icons/17009/arrows_exchange_interact_refresh_reload_swap_sync_update_icon#size=16
 
-# icon-ram, icon-cpu, icon-cd, icon-pci
+# icon-cd, icon-pci
 # are self made (sources as .xcf)
 # icon-swap, icon-display, icon-harddisk, icon-keyboard, icon-network, icon-usb, icon-cloud
 # come from fontawesome (respective fa-refresh, fa-desktop, fa-hdd-o, fa-keyboard-o, fa-exchange, fa-usb, fa-ellipsis-h, fa-cloud)
@@ -65,8 +65,6 @@ IMAGES = ${GNOME_IMAGES}	\
 	openvz-off.png		\
 	blank.gif		\
 	swap.png		\
-	icon-ram.png		\
-	icon-cpu.png		\
 	icon-swap.png		\
 	icon-cd.png		\
 	icon-network.png	\
diff --git a/www/images/icon-cpu.png b/www/images/icon-cpu.png
deleted file mode 100644
index e1cc6c2b1eaa188e52ee2f7661911874d56e132d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmeAS at N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4 at xYmNj^kiEpy*OmPNvlth at M);3UAfq at +Tq8=H^K)}k^GX=Lotd^DDCXwr
z;uvCaIyu3C^?&D*hYg*LP6s-UmQDI%xF|D4#mTs<N=(J~e`f)w at -9~$6)V}hq7ktU
rK at vT?8n|9IJeqRC;K9t!BnAe%cxjpJUyk#DCNg-s`njxgN at xNAPL)7X

diff --git a/www/images/icon-cpu.xcf b/www/images/icon-cpu.xcf
deleted file mode 100644
index be5e6034fa4398d08a6d31a27dcd07a864f054d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 816
zcmb_aOHRWu5VcJUC8eT#S1i0t7eVcY1N0PZ(=;&_`BX_NwGt9n-~wEeT?uaz8xj$A
zO!Pc&-pphiJ4z=TxeFp0={RJtsR8i|fO9NYz-al#7y)(-41gox)^Mu3LHz^#MB%kw
zkR?f&mWUZ832a(tbmFVfQ at LJ~h6HDBQSReV7Fn#<Gslfoki}Up-P(D%TKRH*Kd-Ha
zEKF*K)>Tid&C9<DweE_IALvxcg`EX)-zOT)+ormdIt`w}g8H*4D#G%6gVg<7YLsp(
zor5v{ZW+A24m!N?(hr_ho^8|m*n}xNhNsJ at fRW);erh-zyK8Z$#m6mv*5Z>EKL at Ax
zS~~%ud1UrSuzP_d9_!4{)=?|st|ne6e#I^=1pBD)1<f;T2Lt9*f{AJb2zEflusWcS
VBmSfS3;&l)Gr_4k<2%76`vM+NtEK<|

diff --git a/www/images/icon-ram.png b/www/images/icon-ram.png
deleted file mode 100644
index cf9c8121777844a6f3f74ea15a585055be5a6cc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS at N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4 at xYmNj^kiEpy*OmPNvlthr{`_MH%7H>0C9V-A&iT2ysd*&~-_A_i4-~WV
zba4!^IQ{m5As2%JkMqUl75}xb$Cg|uGx5$)P_5Y~rF65tPQc*WgAF<5&GS+(Xgf?Z
g=vXDX{a-6*o2&rSws$7VKvNhzUHx3vIVCg!06ddBl>h($

diff --git a/www/images/icon-ram.xcf b/www/images/icon-ram.xcf
deleted file mode 100644
index 1507a041f1f0e51d2991c501280ce38ed5179b1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 747
zcmZ`%%TB{E5Og90r6Ewn<HW(o^bpiuxPtl>T+`Gs7I{=jDzy?4zrYXhlN_l^n04(a
z6=9|Ej%R0+jUB17C11x0PgE)xVq`%45^x+WSHNKQ!59H?4IBYO;MQ>R-N65V>`Od0
zjEgK2d5t}zB7u!`MP-o`p)A#cG!z^bRP`nmyed+)7!QL)#zk6`JkTjD<vik(`-zSo
zGBu?!TIW5jw$A at 2)Vi*gQLJ*wr}kYCH+`bf!d0$nuJZUrRMcN2NhRubK<fT0?Uln;
zItLTZr)9|YI_U7cSros at vRLK%*j!^fMyAVXfPvv;KQ$bQ-E}x!8u=+a!1A*W_dEOo
zoStjr1jP2(AHmLolKX6oc64~%^iXr(X#b8WEgso<v%@ENY}+6;PV>_)-z2m<t at lV<
T?ef?TR=;uBmu}j(Vtr!2fCZER

diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index 02a9f999..96114460 100644
--- a/www/manager6/lxc/Resources.js
+++ b/www/manager6/lxc/Resources.js
@@ -39,7 +39,7 @@ Ext.define('PVE.lxc.RessourceView', {
 		header: gettext('Memory'),
 		editor: caps.vms['VM.Config.Memory'] ? 'PVE.lxc.MemoryEdit' : undefined,
 		defaultValue: 512,
-		tdCls: 'pve-itype-icon-memory',
+		tdCls: 'pmx-itype-icon-memory',
 		group: 1,
 		renderer: function(value) {
 		    return Proxmox.Utils.format_size(value*1024*1024);
@@ -59,7 +59,7 @@ Ext.define('PVE.lxc.RessourceView', {
 		header: gettext('Cores'),
 		editor: caps.vms['VM.Config.CPU'] ? 'PVE.lxc.CPUEdit' : undefined,
 		defaultValue: '',
-		tdCls: 'pve-itype-icon-processor',
+		tdCls: 'pmx-itype-icon-processor',
 		group: 3,
 		renderer: function(value) {
 		    var cpulimit = me.getObjectValue('cpulimit');
diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js
index bc16da6a..573fbfae 100644
--- a/www/manager6/node/StatusView.js
+++ b/www/manager6/node/StatusView.js
@@ -23,7 +23,7 @@ Ext.define('PVE.node.StatusView', {
     items: [
 	{
 	    itemId: 'cpu',
-	    iconCls: 'fa fa-fw pve-itype-icon-processor pve-icon',
+	    iconCls: 'fa fa-fw pmx-itype-icon-processor pmx-icon',
 	    title: gettext('CPU usage'),
 	    valueField: 'cpu',
 	    maxField: 'cpuinfo',
@@ -49,7 +49,7 @@ Ext.define('PVE.node.StatusView', {
 	    padding: '0 0 20 0',
 	},
 	{
-	    iconCls: 'fa fa-fw pve-itype-icon-memory pve-icon',
+	    iconCls: 'fa fa-fw pmx-itype-icon-memory pmx-icon',
 	    itemId: 'memory',
 	    title: gettext('RAM usage'),
 	    valueField: 'memory',
diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js
index 83a3ce9d..d8439e5d 100644
--- a/www/manager6/panel/GuestStatusView.js
+++ b/www/manager6/panel/GuestStatusView.js
@@ -67,7 +67,7 @@ Ext.define('PVE.panel.GuestStatusView', {
 	},
 	{
 	    itemId: 'cpu',
-	    iconCls: 'fa fa-fw pve-itype-icon-processor pve-icon',
+	    iconCls: 'fa fa-fw pmx-itype-icon-processor pmx-icon',
 	    title: gettext('CPU usage'),
 	    valueField: 'cpu',
 	    maxField: 'cpus',
@@ -78,7 +78,7 @@ Ext.define('PVE.panel.GuestStatusView', {
 	},
 	{
 	    itemId: 'memory',
-	    iconCls: 'fa fa-fw pve-itype-icon-memory pve-icon',
+	    iconCls: 'fa fa-fw pmx-itype-icon-memory pmx-icon',
 	    title: gettext('Memory usage'),
 	    valueField: 'mem',
 	    maxField: 'maxmem',
diff --git a/www/manager6/panel/TemplateStatusView.js b/www/manager6/panel/TemplateStatusView.js
index f7080043..b8e01d43 100644
--- a/www/manager6/panel/TemplateStatusView.js
+++ b/www/manager6/panel/TemplateStatusView.js
@@ -36,13 +36,13 @@ Ext.define('PVE.panel.TemplateStatusView', {
 	},
 	{
 	    itemId: 'cpus',
-	    iconCls: 'fa fa-fw pve-itype-icon-processor pve-icon',
+	    iconCls: 'fa fa-fw pmx-itype-icon-processor pmx-icon',
 	    title: gettext('Processors'),
 	    textField: 'cpus',
 	},
 	{
 	    itemId: 'memory',
-	    iconCls: 'fa fa-fw pve-itype-icon-memory pve-icon',
+	    iconCls: 'fa fa-fw pmx-itype-icon-memory pmx-icon',
 	    title: gettext('Memory'),
 	    textField: 'maxmem',
 	    renderer: Proxmox.Utils.render_size,
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 98352e3f..200e3c28 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -66,7 +66,7 @@ Ext.define('PVE.qemu.HardwareView', {
 		editor: caps.vms['VM.Config.Memory'] ? 'PVE.qemu.MemoryEdit' : undefined,
 		never_delete: true,
 		defaultValue: '512',
-		tdCls: 'pve-itype-icon-memory',
+		tdCls: 'pmx-itype-icon-memory',
 		group: 2,
 		multiKey: ['memory', 'balloon', 'shares'],
 		renderer: function(value, metaData, record, ri, ci, store, pending) {
@@ -95,7 +95,7 @@ Ext.define('PVE.qemu.HardwareView', {
 		never_delete: true,
 		editor: caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']
 		    ? 'PVE.qemu.ProcessorEdit' : undefined,
-		tdCls: 'pve-itype-icon-processor',
+		tdCls: 'pmx-itype-icon-processor',
 		group: 3,
 		defaultValue: '1',
 		multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits'],
-- 
2.20.1





More information about the pve-devel mailing list