From 6ec2c38b76adff4f515d854eca090f09998b7c47 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 11 Sep 2012 11:27:40 +0200 Subject: [PATCH] add icons for snapshots --- www/css/ext-pve.css | 12 ++++++++++++ www/images/Makefile | 2 ++ www/images/now.png | Bin 0 -> 948 bytes www/images/snapshot.png | Bin 0 -> 570 bytes www/manager/qemu/SnapshotTree.js | 21 ++++++++++++++++++--- 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 www/images/now.png create mode 100644 www/images/snapshot.png diff --git a/www/css/ext-pve.css b/www/css/ext-pve.css index a2507b6f..7322bd4a 100644 --- a/www/css/ext-pve.css +++ b/www/css/ext-pve.css @@ -84,6 +84,18 @@ background-image:url(../images/drive-harddisk.png); } +.x-tree-node-snapshot, +.x-grid-tree-node-expanded .x-tree-node-snapshot +{ + background-image:url(../images/snapshot.png); +} + +.x-tree-node-now, +.x-grid-tree-node-expanded .x-tree-node-now +{ + background-image:url(../images/now.png); +} + .pve-itype-icon-pool, .x-tree-node-pool, .x-grid-tree-pool-expanded .x-tree-node-pool diff --git a/www/images/Makefile b/www/images/Makefile index 2011ba64..6873d20b 100644 --- a/www/images/Makefile +++ b/www/images/Makefile @@ -19,6 +19,8 @@ GNOME_IMAGES = \ computer.png IMAGES = ${GNOME_IMAGES} \ + snapshot.png \ + now.png \ computer-on.png \ memory.png \ processor.png \ diff --git a/www/images/now.png b/www/images/now.png new file mode 100644 index 0000000000000000000000000000000000000000..31d862460d2712872e0a123f7105090876e355e2 GIT binary patch literal 948 zcmV;l155mgP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01egv01egwkZ*aM00007bV*G`2iyq@ z2sJVn%uxye00T5hL_t(I%f*vlOjCCp#n1QN+skb)w@@MUULfFrp(2{HO&3E_M;4he zY8(-Wn)qikYQlpry6gpGG+SnZ#)r8mOZ>AXOQ*)*AKbDnV|&0gj2Xl~Ad;@K*4rYL zTS^P%mizMoB}??(@7sC!eok_74)CUr{x29~V%LEK%LXoA+BvT4t4!0Z005g!7|vC- zzp5IW&eyfI-6f)#R{-Nro;a^HHZ+g^-E%}@OwDmP60%*I;W=(LkxWTOD&?FaimEGC zwr;p|NZLW+yjBrr@SLQ z{s!IeZ@<~x0LIvNM3m+Mpe_~nM6O?HFUfWAIh&imxm~~UqTiW6B!1R%SpWG(wfBN= zf6=z>J%SN4Fx3BkY~*q6q+$Ga{+3_o03g!Yu~ie9=2%vJ^;%KI)q|gY^6!Jeq3MMZ zoF!S53m{EIk1D@Bepaoi@o6GcBb^;v0e}Ml@tN*XWHIsdt%|ObZ6_iCNZvVY;^!^fOl zv@M$g!T&-fqFqc#R=R3FM3+ObESjZQIBWtS%d%MP;XsDU-|iMe0dKvX1Te;>B$-A= zBg#T%@-By90hu{~T&VU>MZ&e^{oRX@r-c#I>CVOPrvf*B`MRjA+{XY$M3m-jQ<+08 zZay=e?IZh)!zZYUiPfg^Nw;jHGI$p zD9Y01eYh2x%OHQto=&+~4HlTj=BBa1h7ao3$jH+y5YK^l9xjzuf3!BY1!GO_%tWJH ztOoP9?CG3uB4bP*KXY_%^z@OVfp~@<^UfR7dG0?Wi{Bjp0Cn)6B~mQ9x^#A8eOZpc z-1`o-y7so7A)=%J07R6uk_jK5tz>7N`)Y@4B-$7momi*n!2|#-;7vsnAgg8WK;Ev; zFDM`H_7PF?bz^eP4E3!^c6?hm-P=_@s|TyW0A4G-C$0E!Sl+bz53$noD-n&q{CN({ W&``b)J$E7i0000%A_P)Px#0%A)?L;(MXkIcUS000SaNLh0L01egv01egwkZ*aM00007bV*G`2iyq@2s8-D z+qwAw00F*9L_t(2&#jTYYZGArhkx(;o)?43VW>$=(v;c?f<`fZfJkc6MI;zIRa{!A z;_Rx}q2p~%t~v^Kh@k|;Dp$V{YCTge)UU*pOL9qsrk;14cQyAq=-?mVvp(DN0RIUt z&Zb9YaS>Hi#l;bMHqFIJS8Jag{Ny%V^6|!l+>*zNd4K|1+~3{*{#F~H6gIWs;~^NAR{Xja2Pj|-kRRc8 z&!fZx-|iFkh$^J~DY?_I1^^0(X5Z1b0gr!iPu6z`LXB;NzcqudCz^l&9Mo2aDv3z5 zi~Ht+G8_R1p|Lvo6J8vdS#3BG-$CSeL!FN$2 zi9Wz}xN)Q-H^vwIIzax;3h8Ic!)5x?2b^{aUcMfCMtT778*8bx+r*~Gn*aa+07*qo IM6N<$f~txFJOBUy literal 0 HcmV?d00001 diff --git a/www/manager/qemu/SnapshotTree.js b/www/manager/qemu/SnapshotTree.js index 46169dbf..14e82f98 100644 --- a/www/manager/qemu/SnapshotTree.js +++ b/www/manager/qemu/SnapshotTree.js @@ -19,6 +19,11 @@ Ext.define('PVE.qemu.SnapshotTree', { Ext.Array.each(response.result.data, function(item) { item.leaf = true; item.children = []; + if (item.name === '__current') { + item.iconCls = 'x-tree-node-now'; + } else { + item.iconCls = 'x-tree-node-snapshot'; + } idhash[item.name] = item; }); @@ -118,7 +123,10 @@ Ext.define('PVE.qemu.SnapshotTree', { animate: false, selModel: sm, tbar: [ me.rollbackBtn, me.deleteBtn ], - fields: ['name', 'description' ], + fields: [ + 'name', 'description', + { name: 'snaptime', type: 'date', dateFormat: 'timestamp' } + ], columns: [ { xtype: 'treecolumn', @@ -127,12 +135,19 @@ Ext.define('PVE.qemu.SnapshotTree', { width: 200, renderer: function(value, metaData, record) { if (value === '__current') { - return "CWD"; + return "NOW"; } else { return value; } } }, + { + xtype: 'datecolumn', + text: gettext('Date'), + dataIndex: 'snaptime', + format: 'Y-m-d H:i:s', + width: 120 + }, { text: gettext('Description'), dataIndex: 'description', @@ -148,7 +163,7 @@ Ext.define('PVE.qemu.SnapshotTree', { ] }); - me.callParent(); + me.callParent(); me.on('show', me.reload); }