add icons for snapshots

diff --git a/www/css/ext-pve.css b/www/css/ext-pve.css
index a2507b6f2a8d6f7c31a22b283868475d3efb0f16..7322bd4ad72dc9b1591056192da0fd4b13deb5ae 100644 (file)
--- 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 2011ba64c00a38a57baf95037d349845175009bb..6873d20bdf019db328edf995738aeb478fbdbbbc 100644 (file)
--- 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 (file)
index 0000000..31d8624
Binary files /dev/null and b/www/images/now.png differ

diff --git a/www/images/snapshot.png b/www/images/snapshot.png
new file mode 100644 (file)
index 0000000..96a167a
Binary files /dev/null and b/www/images/snapshot.png differ

diff --git a/www/manager/qemu/SnapshotTree.js b/www/manager/qemu/SnapshotTree.js
index 46169dbfe2ce2cca13832577bb240180ec94aa3d..14e82f98d48cb707b7d05d50fee97e6585cf1671 100644 (file)
--- 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);
     }