use different icons for running servers

diff --git a/www/css/ext-pve.css b/www/css/ext-pve.css
index 6d6f8529e36a3665551a898be99536aacde19e75..422d2f9e2974c1cef151a0f29876f30d05698d7c 100644 (file)
--- a/www/css/ext-pve.css
+++ b/www/css/ext-pve.css
@@ -25,6 +25,7 @@
 .pve-itype-icon-openvz,
 .pve-itype-icon-openvz-running,
 .pve-itype-icon-node,
+.pve-itype-icon-node-running,
 .pve-itype-icon-storage,
 .pve-itype-icon-itype
 {
@@ -53,7 +54,14 @@
 .x-tree-node-server,
 .x-grid-tree-node-expanded .x-tree-node-server
 {
-    background-image:url(../images/network-server.png);
+    background-image:url(../images/network-server-off.png);
+}
+
+.pve-itype-icon-node-running,
+.x-tree-node-server-running,
+.x-grid-tree-node-expanded .x-tree-node-server-running
+{
+    background-image:url(../images/network-server-on.png);
 }
 
 .pve-itype-icon-storage,

diff --git a/www/images/Makefile b/www/images/Makefile
index 497bb7c5763177c1fc334fcb5ce236605cb1b993..214313b8c5e0277690cebb0d797b1015e73f69f4 100644 (file)
--- a/www/images/Makefile
+++ b/www/images/Makefile
@@ -16,6 +16,8 @@ IMAGES = ${GNOME_IMAGES}      \
        memory.png              \
        processor.png           \
        proxmox_logo.png        \
+       network-server-on.png   \
+       network-server-off.png  \
        blank.gif
 
 .PHONY: install 

diff --git a/www/images/network-server-off.png b/www/images/network-server-off.png
new file mode 100644 (file)
index 0000000..65f69e9
Binary files /dev/null and b/www/images/network-server-off.png differ

diff --git a/www/images/network-server-on.png b/www/images/network-server-on.png
new file mode 100644 (file)
index 0000000..c146b77
Binary files /dev/null and b/www/images/network-server-on.png differ

diff --git a/www/manager/data/ResourceStore.js b/www/manager/data/ResourceStore.js
index aff8e788d6a651728dc57ad94e3a3c3c7c0044aa..78c96fa4df5a3105a66f282fb4c191e9ae93d4e8 100644 (file)
--- a/www/manager/data/ResourceStore.js
+++ b/www/manager/data/ResourceStore.js
@@ -49,7 +49,7 @@ Ext.define('PVE.data.ResourceStore', {
                hidden: true,
                convert: function(value, record) {
                    var info = record.data;
-                   if (info.type === 'qemu' || info.type === 'openvz') {
+                   if (info.type === 'qemu' || info.type === 'openvz' || info.type === 'node') {
                        return (Ext.isNumeric(info.uptime) && (info.uptime > 0));
                    } else {
                        return false;

diff --git a/www/manager/tree/ResourceTree.js b/www/manager/tree/ResourceTree.js
index 5ea5eb6dd567b444b1e85b40089a4871d1a7c933..2101ba6abe1e6edb751d68c17247ae399a986f34 100644 (file)
--- a/www/manager/tree/ResourceTree.js
+++ b/www/manager/tree/ResourceTree.js
@@ -81,8 +81,7 @@ Ext.define('PVE.tree.ResourceTree', {
        }
     },
 
-    // private
-    addChildSorted: function(node, info) {
+    setIconCls: function(info) {
        var me = this;
 
        var defaults = PVE.tree.ResourceTree.typeDefaults[info.type];
@@ -93,7 +92,15 @@ Ext.define('PVE.tree.ResourceTree', {
                info.iconCls = defaults.iconCls;
            }
        }
+    },
+
+    // private
+    addChildSorted: function(node, info) {
+       var me = this;
+
+       me.setIconCls(info);
 
+       var defaults;
        if (info.groupbyid) {
            info.text = info.groupbyid;     
            if (info.type === 'type') {
@@ -242,14 +249,20 @@ Ext.define('PVE.tree.ResourceTree', {
 
                    if (!item || changed) {
                        //console.log("REM UID: " + key + " ITEM " + olditem.data.id);
-                       delete index[key];
-                       var parentNode = olditem.parentNode;
-                       //var expanded = parentNode.isExpanded();
-                       //if (expanded)
-                       //parentNode.collapse();                    
-                       parentNode.removeChild(olditem, true);
-                       //if (expanded) 
-                       //parentNode.expand();
+                       if (olditem.isLeaf()) {
+                           delete index[key];
+                           var parentNode = olditem.parentNode;
+                           parentNode.removeChild(olditem, true);
+                       } else {
+                           if (item && changed) {
+                               olditem.beginEdit();
+                               //console.log("REM UPDATE UID: " + key + " ITEM " + item.data.running);
+                               var info = olditem.data;
+                               Ext.apply(info, item.data);
+                               me.setIconCls(info);
+                               olditem.commit();
+                           }
+                       }
                    }
                }
            }