From d4a80aeab098ba1e4ef461fe719382b30132566b Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Thu, 4 Nov 2010 15:22:21 -0700
Subject: [PATCH] Ui modified for Resource main page

---
 ui/css/main.css                              |  69 +++++++++++-------
 ui/images/add_button.png                     | Bin 0 -> 966 bytes
 ui/images/add_button_hover.png               | Bin 0 -> 841 bytes
 ui/images/add_hostbutton.png                 | Bin 1326 -> 0 bytes
 ui/images/add_hostbutton_hover.png           | Bin 1186 -> 0 bytes
 ui/images/add_primarystoragebutton.png       | Bin 2338 -> 0 bytes
 ui/images/add_primarystoragebutton_hover.png | Bin 1918 -> 0 bytes
 ui/images/add_vlanbutton_hover.png           | Bin 3211 -> 0 bytes
 ui/jsp/resource.jsp                          |  72 ++++++++++---------
 9 files changed, 82 insertions(+), 59 deletions(-)
 create mode 100644 ui/images/add_button.png
 create mode 100644 ui/images/add_button_hover.png
 delete mode 100644 ui/images/add_hostbutton.png
 delete mode 100644 ui/images/add_hostbutton_hover.png
 delete mode 100644 ui/images/add_primarystoragebutton.png
 delete mode 100644 ui/images/add_primarystoragebutton_hover.png
 delete mode 100644 ui/images/add_vlanbutton_hover.png

diff --git a/ui/css/main.css b/ui/css/main.css
index 43d3d896498..1d2e18f031c 100644
--- a/ui/css/main.css
+++ b/ui/css/main.css
@@ -3299,6 +3299,10 @@ a:hover.search_button {
 	padding:0;
 }
 
+
+
+
+
 .dbgraph_title_usedbox {
 	width:187px;
 	height:16px;
@@ -3932,13 +3936,45 @@ a:hover.search_button {
 	padding:0;
 }
 
+.resource_titlebox {
+	width:95%;
+	height:auto;
+	float:left;
+	margin:5px 0 0 10px;
+	padding:0;
+}
+
+.resource_titlebox h2{
+	width:90%;
+	height:auto;
+	float:left;
+	color:#333;
+	font-size:15px;
+	font-weight:bold;
+	text-align:left;
+	margin:4px 0 0 0;
+	padding:0;
+}
+
+.resource_titlebox span{
+	width:auto;
+	height:auto;
+	float:left;
+	color:#999;
+	font-size:11px;
+	font-weight:bold;
+	text-align:left;
+	margin:3px 5px 0 0;
+	padding:0;
+}
 
 .resources_totalbg {
 	width:58px;
 	height:32px;
-	float:right;
+	float:left;
 	background:url(../images/resources_totalbg.png) no-repeat top left;
-	margin:6px 10px 0 0;
+	margin:6px 0 0 30px;
+	display:inline;
 	padding:0;
 }
 
@@ -3955,34 +3991,19 @@ a:hover.search_button {
 	display:inline;
 }
 
-.add_hostbutton {
-	width:60px;
-	height:15px;
+.resadd_button {
+	width:17px;
+	height:17px;
 	float:left;
-	background:url(../images/add_hostbutton.png) no-repeat top left;
-	margin:0 0 0 10px;
+	background:url(../images/add_button.png) no-repeat top left;
+	margin:13px 0 0 20px;
 	padding:0;
 	cursor:pointer;
 	cursor:hand;
 }
 
-.add_hostbutton:hover {
-	background:url(../images/add_hostbutton_hover.png) no-repeat top left;
-}
-
-.add_primarystoragebutton {
-	width:116px;
-	height:15px;
-	float:left;
-	background:url(../images/add_primarystoragebutton.png) no-repeat top left;
-	margin:0 0 0 10px;
-	padding:0;
-	cursor:pointer;
-	cursor:hand;
-}
-
-.add_primarystoragebutton:hover {
-	background:url(../images/add_primarystoragebutton_hover.png) no-repeat top left;
+.resadd_button:hover {
+	background:url(../images/add_button_hover.png) no-repeat top left;
 }
 
 /* 2010-10-10 */
diff --git a/ui/images/add_button.png b/ui/images/add_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2f7815423e4abfc1f0293956644fc54c508a7b0
GIT binary patch
literal 966
zcmV;%13CPOP)<h;3K|Lk000e1NJLTq000pH000pP1^@s7Olo&*0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Xh}ptRCwBA`2YVu!>JD*e?T-t)qDmJ
z<A2L4=06M|5&u%K00Te(F;3XUpuxz<z`!E-Kj}IHP$|pW-SadVfB+zX7;Bd>X#Due
zaGe3nV_@LsWYA=}evN?vWa65({|q5jj0_;X00G3f`Jy8OBloinjEqbSe?LnEu$;NR
z|NpmdKy5&k+}zjyGd+38z>w&)iy_f@7sDeUn=zyc><%zsVg#uK^888|Hh?gQ4G=(#
z`>!W3+<mv8_U&7SrmtTiP5_z5!^6NJD#BhTFBsL#*tU*g!_#LB{tQr~rsVu*$eGFr
z;Q+-H6__@%+`Y}f@clajgP5Qg5Nm+tr1|U^UcJ8o#IG3s{{F|n2(mMvl(7~_H8DU9
z0DBz5uG`S{zZoEa7;nE?#c=X|E-;kd6v;|k<bh<LJUKb({~w_~bHzyvjGHewF}(kM
z?(dyDAD9@BfV!I4KR#w1X2y9(Mb2Hn@y3t=9RRH{&{H_iST>L0|5s?xxf+*%8N1K+
zf}O<62ekR^Yp@(cN%$@X5dmdzbf`(WGxV%<V*rIY%dcMy41fPJFl;!~%3!V?0aktT
z+H!^;z#w2}2Pyc;aQ@F<2E()04>HJ#nF5VwWH@{M5G2h0Gn|KnMH%B?Acf)!pl|;H
z!+{wr2x0)KVxZtd5C*ZKVhjKQ#(3}b28JuoCNTW|^OoVmkINa75_)MLK0G%3@bNvv
z7hq)m`~`6fFE;~&0KXuEkdWf}r_avK;$zpH!NwxYpet3tz_{~j2*ZshYce=F*{9xr
z@RR93G!ekUivd~SKSE4ZS>WH-Zy&PNq(WveYdBsjV)(}}>E46CjDLOuLk5U{12Kqg
zs+!2)Zqx;gd{&10&(DL!{``T+y?p(Hk(Y<T=jrQfpPBysW5{~|^x=1))4v157!=Om
zp_r9Xm_c3I6-W!g<&o)ocNrL%nK|+pb0;%A`22-I9%vXCcw3e*ggJII-~y}ml`?ES
z(F0~P1A|pW7#Prz4GcxV(C!5}6CL>5mM}!Qb~7y7UCOZWa1Vw&D8PYHTFm(8?{|jK
zD$Wd`*i`g578jCWkPud9c=7fo!^^iX5P=QKs7wqXw`Z?v{XT;co_&D;m{>rDr2(-a
ok}zr}0;Vh=Icr1r{~0iG0QJ6c;l&@mQ2+n{07*qoM6N<$f@aXcYybcN

literal 0
HcmV?d00001

diff --git a/ui/images/add_button_hover.png b/ui/images/add_button_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..dad5d9668a64c7d53e33a8494c53bd5ef683afeb
GIT binary patch
literal 841
zcmV-P1GfB$P)<h;3K|Lk000e1NJLTq000pH000pP1^@s7Olo&*0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!>q$gGRCwBAh>eY9xOeZ~9}vxCY;62T
zQBjfE*4Fk9BS?gik@3&}|NmJ40*G<PjvX2dK)~|j$B*k^#@e-OH9-u30Aidwcdo{-
zU%$YjAi%-Fp~-Uc<VgmgMuu6lW-+9trGX4$00_X+7#jf)f<O>{OsIu6B)3U&yPyIh
z?1NCz`Rsz*T~t+I=6PT4K3ZYh%pOKW`&(;4?;S)0A_B13eLb&Kj+U8Nd;YO;1P~+0
z2B4d3KYjYt1autC6(I8%`1$$k?%uuI%)-XTw&C2lbN(>Nva&LUuC6W^w@Fr3)|ln`
z_3I2E6NH6@!59R1cz77zzI_YEKpPlfp;8NUR1*Ud067i_>VV?S00FolcN_*`7!11*
z4uF&a33gVPI8QFX(C!?eLodKNI0TO?R45VyW0WnZzb#s|wG`R;{gC}#x~?OzB(3!o
zlUmMT!eig}`#6pyB=S5D*4pTM3ideGb&VCeChYT*Jh4S(SxyRcYVW;>P1A^H=xk`L
z)wXT&F~(4urV<xLL4DuLB}|e+2s8`>RaGSg%d(Jjj*=uHh4C{AY8JCB`xLMN==^38
zaC7v>;(!*5$N}69;*%f8r$#RU>ZW!T2Z1O$K0pv`>}>2T1e^SUAXr%W6(O*aBHQ{4
z*)FW4@EfcwtgLL)_yJaeSX&4pIrox45_c~gW|%v3=gv82q%=*1>$+4<n5KCE_R}=&
z0G0v<;T(yn>$)%u;|3zHKt?%|Ov>||55stuzVA1j{TC2mo#*)rs${Ax%O~7=?z(QX
z(epgvI1W3qZQHjTsFW?s`bC#I`S}P*nbyC;wrws#{C@_C34M<0Fbu50x~`n?eP2XT
z^tL$&0tQ7{mZGj}o-2wXNO&npk`vfIFUzvIDGWmq$FV4iLR3|?$!nTMs(q{I;s-^@
zWS38ko2KEXjN>TCNv{DenOM9aQy*Mp1Qa`9+yguM)zs?Kr!SxA23&D2d#>LBYK&<1
TBonE300000NkvXXu0mjfd9-}2

literal 0
HcmV?d00001

diff --git a/ui/images/add_hostbutton.png b/ui/images/add_hostbutton.png
deleted file mode 100644
index 1dec616fff7287fac9da7ca4e2fd320c5f2b8be6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1326
zcmV+}1=0G6P)<h;3K|Lk000e1NJLTq002Ay000jN1^@s7&lQ~K0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$&`Cr=RCwBA^eyLR2zBN8&wvG7zyGU^
zNnDuuzlZS&hC}DRqhNWF4u;q7|5gD65aYDXqIY>XnUt`Zz;y2VPbE8@9dKPHDl6b@
zfB<4_TqyL8nVC_L0S}0BUdym-Z!m^9BhcY&K>8;G82})F82u}`*@B&UNY=c1_ZLPc
zQ*Dl)k6!#?(2?(A0MX10)?gZ)4Z}9tE5Wq6F2{eC2hV<kO}h8&E(0g4HN%Uye;8n5
zoU9P`?9z{5{@O$J3_pJUhs%Tf{GWk5a2X(gz<zeM;QGlxNATzG{|`*6a;!f=UV!00
zzqP@%qIfo#W@WNwu+^Rg7lVnz<lKx_!7)r7h>fh@-*OiNvK>!e{t*C%^`GNRObnJV
z*RU}C1xLif?L7?Qf(i`&*8L2Z@9hVR$%@(m<KzOE4FddJe;I1#_=4Frahn*H@9ksg
z&UnvIIm?cL0T>A|_Su{J8GinhVR-re0ZQ5g(V+CX7l>`>5Yh!eJP{y(z!vMMu(fI`
zvQ^RA#xLLh-P?KWo94fN48IsBtP^?9!ptZ@&&0L+#5Z=PFW>$PeE9s20frUDV;HQo
zdKi$!yv$a^+1Y-tFvJD9ZBf*tV{~~V4fYpIA3pzOK*lm6b_~zo-UqXbLhdm9{Kd=g
z=g)rzUyC_lF%W>Ml@Qct2(w?qV5e6L<{PTyf-#6~rBwsQ%#5-O0z7&sc6|Q!Pml%V
z0vO=p5Ma3d^gNg?DP+g+;Kc=o=WpHt^Bn_&o^k-ghjsB#iy?YI@_noP88qb`z+&qU
z^&x`u%zTEz(2Wes_S7@5v7BQ-wg;ShK7B<9w4@wl$eXAOX3r~s%+Rvfk6}X2Lxy|L
z&od--$^yk8McAh=Ks}7$f`9>}|Jx4;4a!nra~Aml&DzND516Gu;zeN_8NwTQ;r0L%
z*Kts)z650JGSC;WGXV)bXx^d+I0CX1h<^bD7&squaxlu-8*`pwXJr&;7>3~I@Bc3k
zp8an2{m1`DOltD1GtG239)AD%U;G0w&0xbne(^CxJKY2p&9)4<)PUq%fOP{lxnz%*
zM5)JT1|cja;KRVqs*6<)<TsEXL4IZ7WM@o8&td2w({Bw!-)duq1dnwLw;rEo`2Ony
zSX@WJpTW(fj)8++fZ^)>jlg0ClEbBh^?~B`49ZgW42LgGM9KLuAk6y@t{$5hvKe=u
z9c0*brjg;<+lvgGYyu47j`P6cApVN|Nno~%Q60nk&kq@<Z*s!v50GC$#TFwz&qg>;
zV0iiNKG1WqKu_&wNb}jt(73>WL0!&)!9Y2Vp>Cc5SRIJ(YFxnZ;nQD+=EQvrxf2nU
zj;&rkSRAFA68Hx!&iEO`1#IDBLcnqrR5oKXV{-lnFkf6w7wp0Fw>L1{d~|@}{?of)
ztRdsau>0%;413U<m>>^-0Tz8c*kpYy3xT2bo?*tuJh<46N9P%0-R3h)2A0{0o(mYH
zMeP|L0E<&Ijd*bJ2}(kzuCHgX(amSra=agG1~`Vl{6njkK}GC)hLhL!p@@MzgUt+3
zV1vXJB<vYh?yHB3!`uS08>AoI9uxpn0%~C9GchtwU>E`5-~aywEWpZX;y;G}Yk>Ui
k15iKF3tR?bPau8@0Htp%-?={H^8f$<07*qoM6N<$f(|l+QUCw|

diff --git a/ui/images/add_hostbutton_hover.png b/ui/images/add_hostbutton_hover.png
deleted file mode 100644
index e5832c495fcd6016d7cd50cc5c5e6f433eddca2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1186
zcmV;T1YP@yP)<h;3K|Lk000e1NJLTq002Ay000jN1^@s7&lQ~K0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$L`g(JRCwBAEGsKxFf%jz&wvFyd-kl2
ziJzbUzq7M5!_AvFQLvJd62s@upQ``@h;ixCrFYrc*_E)F!1Un310`!~Yq%~WBO^E)
zAb=RBPoMsdiHS*&0T1x@_GZ|+bt{HA%l-TJC4lr#e3~asnuJvxAb=Rl%gfnJO-=D?
z#s*HEI>pEY^!d-XZ{IR#X=yQlXbuhzFpbWJVG9cjFs-bt{Ga8`n>S#SUc7k0z{|_a
z@afYh2ACL#4`NqURe|~Y_wQ%;_3Ia0o)H*X{~5>wmjMC@>}MSvou3SJ1pog1`@ke2
zA@LLB1sDcKIha;ZPyo|hTwDz1=H_rQm^e(%&dv^wVd_9^Wc_Y#ZVbqFynFXffa&$?
z*T<0~;^W7UV0!1yogkMnI66AQ#Uv#q8UFwO4_6C{m)WytgYoa*zZv%I*~3s!PykMg
zmoHxivtPb^2~Nl$vyklp#S_T)Y(Tshh;8T)(gi>~5g-6BRj*nh6oZ3Yx$6}KL4=D1
zha&CbOE|iT7eRak*Y5RId<AiEkV1EH?&Q$T$-fIilW<Q_JJ-PHi8&!3n&e|*!!X`;
zU4Q#;#(AE<>bic$zji;_w%uW0FXK2KF;`DC$W7CnrD>Wj!!Urr^?C)zabO*zJ_|n#
z!#{CFQ8xK|?C){#zNLK<PB}N9{3wcGSr&#MArrZ(s)FmffD**-q$C9LNg)ZcECXuq
zh66uVIf-IqBsXo_vae|xDK>On$HbOpZHOO=4q29gX__3Xs%oumaJ${0C<?B-=3y<T
z-U`HV3}sm|JkNtX&ml<?UWGJGe<e)hQ=Cp58a{pBXOJHR0k59$*F1gSf6`RfSnCCj
zwX=ke*T-%hVIM?_xc>-HZWXg83<co}4NeX&QmCYp1Xq`Wzd#D2gW^Bv+;+&X$YRH=
z(n&kG^%sa(!KIL75Wz@??in-m`wk46M%`Ly4<7jLo%i0CyZi36jthmtb*)x=GfneS
z{-7jD@)?HV4LV$O(d~9UQ1CMnw@A9pTZUl>?6h@)-*aus<+4^49Dh4w=`R+Gv-YQa
zoLiMjMRT3)BYQ?{ppr)f^vXnZ@3Iw^l~$`I!{JamosMj`TP+?+wOW-%qam2OWVKpp
zwbK_LPQ7JWvRp0?Du0i)Q~NyKz7O6xo6Q7$RPSmwo2uuY1<&8KCD_qubQA}%lD3Rf
zVA;VLRok{@y<SVN*VE=pLPr^h=Xq+!J*NOZw%_lI>$<5A@@5t=IFk=hU^^+5N*bj+
zACBYbp7sRD2EW;CH0!uXo%8uz&IHdeL0vIYwwQOykvNWHnM@|BE{Y<ZcE{tfwA*cM
zDCBFjx->ez?@PU2m+5q>K8{5gcS{fi2Rh6Jxjy)@sb}hP%Gv36Z{gki|0%$r@0bJT
zJ!XJ``~yMuJeWZJgs=00{p&CEr=OB{tXr&)FD#C1yB^^nS^xk507*qoM6N<$f}EE#
Ac>n+a

diff --git a/ui/images/add_primarystoragebutton.png b/ui/images/add_primarystoragebutton.png
deleted file mode 100644
index 924a9b19cc7749d833b7ced9b3ff22fb0fc4b552..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2338
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
IM6N<$f;&)vM*si-

diff --git a/ui/images/add_primarystoragebutton_hover.png b/ui/images/add_primarystoragebutton_hover.png
deleted file mode 100644
index b0b234ba6c6f67f5db68264b524bba5e8c29bc89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1918
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
Ef>al|a{vGU

diff --git a/ui/images/add_vlanbutton_hover.png b/ui/images/add_vlanbutton_hover.png
deleted file mode 100644
index 4c06e2a79e695547a6de26d5205b162c307e547e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3211
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

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index b09e81fad4b..2a644f6b7f5 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -20,66 +20,68 @@
         </p>
     </div>
     <div id="resource_page" style="display: block">
-    	<div class="grid_container" style="width:700px">
-            <div class="grid_header">
-                <div class="grid_header_cell" style="width: 60%; border: none;">
-                    <div class="grid_header_title">
-                        Resources</div>
+    	<div class="grid_container" style="width:480px; border:none;">
+            
+            <div class="dbrow even" style="border:1px solid #CCC;">
+                <div class="dbrow_cell" style="width: 64%; border: none;">
+                    <div class="resource_titlebox">
+                        <h2><span> # of </span> Zone</h2>
+					</div>
                 </div>
-                <div class="grid_header_cell" style="width: 40%; border: none;">
-                </div>
-            </div>
-            <div class="dbrow even" id="public_ip_address">
-                <div class="dbrow_cell" style="width: 50%;">
-                    <div class="dbgraph_titlebox">
-                        <h2><strong>Zone</strong></h2>
-                        
-                    </div>
-                </div>
-                <div class="dbrow_cell" style="width: 49%; border: none;">
+                <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
                     <div class="resources_totalbg">
                     	<p>10</p>
                     </div>
                 </div>
-            </div>
-            <div class="dbrow odd" id="private_ip_address">
-                <div class="dbrow_cell" style="width: 50%;">
-                    <div class="dbgraph_titlebox">
-                        <h2><strong>Pods</strong></h2>
-                    </div>
+                <div class="dbrow_cell" style="width: 10%; border: none;">
                 </div>
-                <div class="dbrow_cell" style="width: 49%; border: none;">
+            </div>
+            <div class="dbrow odd" style="margin-top:10px; border:1px solid #CCC;">
+                <div class="dbrow_cell" style="width: 64%; border: none; ">
+                    <div class="resource_titlebox">
+                        <h2><span> # of </span> Pod</h2>
+					</div>
+                </div>
+                <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
                      <div class="resources_totalbg">
                     	<p>120</p>
                     </div>
                 </div>
+                <div class="dbrow_cell" style="width: 10%; border: none;">
+                </div>
             </div>
-            <div class="dbrow even" id="memory_allocated">
-                <div class="dbrow_cell" style="width: 50%;">
-                    <div class="dbgraph_titlebox">
-                        <h2 style="width:auto;"> Cluster - <strong>Host</strong></h2>
-                         <div class="add_hostbutton"></div>
+            <div class="dbrow even" style="margin-top:10px; border:1px solid #CCC;">
+                <div class="dbrow_cell" style="width: 64%; border: none;">
+                     <div class="resource_titlebox">
+                        <h2><span> # of </span> Cluster - Host</h2>
+                         
                     </div>
                 </div>
-                <div class="dbrow_cell" style="width: 49%; border: none;">
+                <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
                      <div class="resources_totalbg">
                     	<p>15</p>
                     </div>
                 </div>
+                <div class="dbrow_cell" style="width: 10%; border: none;">
+                	<div class="resadd_button"></div>
+                </div>
             </div>
             
-            <div class="dbrow odd" id="memory_allocated">
-                <div class="dbrow_cell" style="width: 50%;">
-                    <div class="dbgraph_titlebox">
-                        <h2 style="width:auto;"> Cluster - <strong> Primary Storage</strong></h2>
-                         <div class="add_primarystoragebutton"></div>
+            <div class="dbrow odd" style="margin-top:10px; border:1px solid #CCC;">
+                <div class="dbrow_cell" style="width: 64%; border: none;">
+                     <div class="resource_titlebox">
+                        <h2><span> # of </span> Cluster - Primary Storage</h2>
+                      
                     </div>
                 </div>
-                 <div class="dbrow_cell" style="width: 49%; border: none;">
+                 <div class="dbrow_cell" style="width: 25%; border: none; background:#cacaca repeat top left; ">
                      <div class="resources_totalbg">
                     	<p>12</p>
                     </div>
                 </div>
+                <div class="dbrow_cell" style="width: 10%; border: none;">
+                	<div class="resadd_button"></div>
+                </div>
             </div>