From ca0f89bd5286de9fb68fbbaaf3e240fa9784aa13 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 19 Sep 2011 09:41:35 +0200 Subject: [PATCH] use different icons for running servers --- www/css/ext-pve.css | 10 ++++++++- www/images/Makefile | 2 ++ www/images/network-server-off.png | Bin 0 -> 833 bytes www/images/network-server-on.png | Bin 0 -> 845 bytes www/manager/data/ResourceStore.js | 2 +- www/manager/tree/ResourceTree.js | 33 +++++++++++++++++++++--------- 6 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 www/images/network-server-off.png create mode 100644 www/images/network-server-on.png diff --git a/www/css/ext-pve.css b/www/css/ext-pve.css index 6d6f8529..422d2f9e 100644 --- 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 497bb7c5..214313b8 100644 --- 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 index 0000000000000000000000000000000000000000..65f69e94ca225cf5c1af3bacd0d290e405931d51 GIT binary patch literal 833 zcmV-H1HSx;P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk{ z3N$8-lz@H!00O~DL_t(I%XQLEXq-hH#_{jWJ2UV0-IYy~G)dbe8{G9!s&;K@)7lyl zLuf12ixkoJ?7v#91iThRp+$%&NEJ^aYK4j*dJ++0jbh6t^=4ahN^v*MrX;#~=Y8LK zUoURjvh+C)JRfF$zY$rM(azNSXJ7KohWGrO?;B&#N+E>6rH&|yiL6}YmJl=mpbb8zxnZ}AF@`fb?ns1$C;abSXpIlWCVnyarIBW`}TVPeBZFN)FeyOP9TnB%J-M)?de8qgVqLPGza!ShD#C> zm*5gd5CmNOWx5lHq8R5K7rws0`1q4d|9lY}hTIure2%|xoH$8t1AE8DrqyPfK zqCAh@o*q0;VZ)G0rA%n;T{G~MB93Er>>kaGR^OLd6Y^cT)TFa?b{#Z^5skHd}J3hzs^vtR+*ixA*IAx+quT}DuW=;=$?HD z0psHnNFg|M@F_s>_}CM~vArj7{?*rBISL5w5g`OZh>R@#s(tn!a~Tm0xmm7E00000 LNkvXXu0mjfFhz^C literal 0 HcmV?d00001 diff --git a/www/images/network-server-on.png b/www/images/network-server-on.png new file mode 100644 index 0000000000000000000000000000000000000000..c146b77e0b39366e7a7ba39fe6e53b672486603f GIT binary patch literal 845 zcmV-T1G4;yP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk{ z3Ns051S{YG00PZPL_t(I%XQLEY?MVD#_{jWJM+HlyKA=H(w2Yi8h1Sy)UJ@SfTqUS zG=P8?Lrj%3ph(0t@k*l6Ku9o}81#&P@PH-;IcSVY)oPTqcp?#OG-+kGbX!{7zVp8C zysw950kh#bPV#&*^ZSiR)09?DzjyMG=ic|Om+?H;b$PDpTm}Vm9*+SM(Kfxg5Ulll8Oo_ZQhYvRf#}`LNYfw*hPKkCKSOUu#yc zmIzXr^3FGJArJs)t=YTpIfRtCHXyb!T4^vq3aMCqT6cdB)qz0(E>HcAk`f^V?LZW> zu&~If>64u8`p;qR{j@I06K`37l{v;$ETQF^dMSD}+VdJkEhBjb6f z9U2?Q#5Tsp7T@>z@u%^2APgg{wVeOrJj27!aPfzWm>}TpxUR>67Y`7{@f~2>(9r3X z74zDTtre8xu%@dE$5EIdpj<8y7{fs2vD-6nlp=~E1_rCCtJRn4qYvI+TdU9V*{A2I z)$8OtI#_5dQmt-72$-CjV&jHB zI`VmxRw$)WO0i}0AW4#tSc^>(vVNA(gp9p$oQ&(vtBLXPF<@-}3(u!vWcasvi{<5I z^7%YB=5Ns3(@VWpXYIOmG#U-crH3$K$mL&u5&!#%08&bpmX_%5?qz0XmcEVsT)Xxs z#bS}^>1o!l-++_?6PP=ly8-1m6pIgV_39sN+VlvQF8#*l$G0%?^8}Sjg{i4Yq?8zA z+Sk}xrSE5{ZrzR$Fg!eh6oOqlp9KU@4Lwa1nR^1~UU~K9{ea*e5keq@NJ*2=TW9|P X#d{Nnt020j00000NkvXXu0mjfGpU;B literal 0 HcmV?d00001 diff --git a/www/manager/data/ResourceStore.js b/www/manager/data/ResourceStore.js index aff8e788..78c96fa4 100644 --- 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 5ea5eb6d..2101ba6a 100644 --- 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(); + } + } } } }