ui: use some icons from widget-toolkit

we moved them there

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css
index 3b7a896bde3c2859042968dbaf66ea824089ae56..80b726f95ad4d1e0123d16c6d700294c8d5536de 100644 (file)
--- 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 7e58901cb01fe01b2ab6423671c1f4378527be5a..8b2d1796b729068443d460b445460b43a6366788 100644 (file)
--- 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 (file)
index e1cc6c2..0000000
Binary files a/www/images/icon-cpu.png and /dev/null differ

diff --git a/www/images/icon-cpu.xcf b/www/images/icon-cpu.xcf
deleted file mode 100644 (file)
index be5e603..0000000
Binary files a/www/images/icon-cpu.xcf and /dev/null differ

diff --git a/www/images/icon-ram.png b/www/images/icon-ram.png
deleted file mode 100644 (file)
index cf9c812..0000000
Binary files a/www/images/icon-ram.png and /dev/null differ

diff --git a/www/images/icon-ram.xcf b/www/images/icon-ram.xcf
deleted file mode 100644 (file)
index 1507a04..0000000
Binary files a/www/images/icon-ram.xcf and /dev/null differ

diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index 02a9f9993aa93e8d0b80b6cb1a3336988b761b28..96114460684be6af9111b7f83247af4d93e32331 100644 (file)
--- 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 bc16da6a85d8ba56eb4f2dec9b35b6aceda4bed8..573fbfae67b9025168bdeb56135d920bc2588355 100644 (file)
--- 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 83a3ce9d7ebc8e29e435a36e9bc5206ba0260325..d8439e5dc2bd71f9e0c26f331ed5e3d057310f1f 100644 (file)
--- 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 f708004371f74f660b84be9c45b21252f323b423..b8e01d433947c2c81543d4b7a474822e127a024d 100644 (file)
--- 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 98352e3f1a182accf505eabdb563d611a139c4e8..200e3c2844c40f2ea20da0fda17519628a42ecf2 100644 (file)
--- 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'],