and use the font awesome equivalent instead. this way the icons don't appear blurry and we safe a bit of overhead for storing and loading the png.
Signed-off-by: Shannon Sterz <[email protected]> --- www/css/ext6-pve.css | 18 ------------------ www/images/Makefile | 5 ++--- www/images/icon-display.png | Bin 221 -> 0 bytes www/manager6/dc/Tasks.js | 6 +++++- www/manager6/grid/PoolMembers.js | 2 +- 5 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 www/images/icon-display.png diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css index 356427ead..5e77698e9 100644 --- a/www/css/ext6-pve.css +++ b/www/css/ext6-pve.css @@ -95,12 +95,6 @@ background-image: url(../ext6/theme-crisp/resources/images/loadmask/loading.gif); } -/* console icon in task list */ -.x-grid-row-console { - background: no-repeat center center; - background-image: url(../images/icon-display.png); -} - /* for font-awesome colors */ /* tree icons */ @@ -299,12 +293,10 @@ .pve-itype-icon-tigervnc, .pve-itype-icon-novnc, .pve-itype-icon-xtermjs, -.pve-itype-icon-display, .pve-itype-icon-network, .pve-itype-icon-network-server, .pve-itype-icon-keyboard, .pve-itype-icon-cdrom, -.pve-itype-icon-qemu, .pve-itype-icon-qemu-template, .pve-itype-icon-qemu-running, .pve-itype-icon-lxc, @@ -341,12 +333,6 @@ font-size: 14px; } -.pve-itype-icon-qemu, -.x-tree-node-computer, -.x-grid-tree-node-expanded .x-tree-node-computer { - background-image: url(../images/icon-display.png); -} - .pve-itype-icon-lxc, .x-tree-node-lxc, .x-grid-tree-node-expanded .x-tree-node-lxc { @@ -391,10 +377,6 @@ background-image: url(../images/icon-cd-drive.svg); } -.pve-itype-icon-display { - background-image: url(../images/icon-display.png); -} - .pve-itype-icon-tigervnc { background-image: url(../images/tigervnc.png); } diff --git a/www/images/Makefile b/www/images/Makefile index 8072d0292..65ead9789 100644 --- a/www/images/Makefile +++ b/www/images/Makefile @@ -16,8 +16,8 @@ all: # icon-cd, icon-pci # are self made (sources as .xcf) -# icon-swap, icon-display, icon-keyboard, icon-network, icon-usb, icon-cloud -# come from fontawesome (respective fa-refresh, fa-desktop, fa-keyboard-o, fa-exchange, fa-usb, fa-ellipsis-h, fa-cloud) +# icon-swap, icon-keyboard, icon-network, icon-usb, icon-cloud +# come from fontawesome (respective fa-refresh, fa-keyboard-o, fa-exchange, fa-usb, fa-ellipsis-h, fa-cloud) # icon-serial is a modified version of # https://commons.wikimedia.org/wiki/File:DE9_Diagram.svg # (public domain) @@ -67,7 +67,6 @@ IMAGES = $(GNOME_IMAGES) \ icon-swap.png \ icon-cd.png \ icon-network.png \ - icon-display.png \ icon-keyboard.png \ logo-ceph.png \ logo-128.png \ diff --git a/www/images/icon-display.png b/www/images/icon-display.png deleted file mode 100644 index 21c50c3293ae8c760dea69bd687937a05a3307c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_WJY5_^ zEPCHwHsm^#z|;2d`Fh#V4<dYhatChiuIP?Cm~FA!ihI%O%@s_tx^DxHZoBa?KivMr zgbD9?6;%=%P2C<%NtQ1-&UoJAfP}V&LAObDb=Q*ijSKA`aKB*oQdn{B#{q4j2}z$A zzl1fNX83QJ(6#iL{+W%rruhYHpIZ9GKJnQaWxFZ9H<LY~J$iN7n^|Tas(YFwf<k&) R^ntEp@O1TaS?83{1OR^pS55!` diff --git a/www/manager6/dc/Tasks.js b/www/manager6/dc/Tasks.js index 8c6f864f8..a89ad22d6 100644 --- a/www/manager6/dc/Tasks.js +++ b/www/manager6/dc/Tasks.js @@ -81,19 +81,23 @@ Ext.define('PVE.dc.Tasks', { header: gettext('End Time'), dataIndex: 'endtime', width: 150, + align: 'inherit', renderer: function (value, metaData, record) { + metaData.tdStyle = 'text-align: left;'; if (record.data.pid) { if ( record.data.type === 'vncproxy' || record.data.type === 'vncshell' || record.data.type === 'spiceproxy' ) { - metaData.tdCls = 'x-grid-row-console'; + metaData.tdStyle = 'text-align: center;'; + return '<i class="fa fa-desktop"></i>'; } else { metaData.tdCls = 'x-grid-row-loading'; } return ''; } + return Ext.Date.format(value, 'M d H:i:s'); }, }, diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js index c6e7e9175..83046ee0e 100644 --- a/www/manager6/grid/PoolMembers.js +++ b/www/manager6/grid/PoolMembers.js @@ -243,7 +243,7 @@ Ext.define('PVE.grid.PoolMembers', { items: [ { text: gettext('Virtual Machine'), - iconCls: 'pve-itype-icon-qemu', + iconCls: 'fa fa-desktop', handler: function () { var win = Ext.create('PVE.pool.AddVM', { pool: me.pool }); win.on('destroy', reload); -- 2.47.2 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
