From eccab6880f0ff593be661ae7b2bb633ef1969e2b Mon Sep 17 00:00:00 2001 From: NIKITA Date: Fri, 22 Oct 2010 16:30:28 -0700 Subject: [PATCH 1/2] Loading added for Dialog boxes --- ui/new/css/main.css | 75 +++++++++++++++++++++++++++++++++ ui/new/images/cross_review.png | Bin 0 -> 1099 bytes ui/new/jsp/resource.jsp | 13 ++++++ 3 files changed, 88 insertions(+) create mode 100644 ui/new/images/cross_review.png diff --git a/ui/new/css/main.css b/ui/new/css/main.css index b1c2a5547f9..e202725cc32 100644 --- a/ui/new/css/main.css +++ b/ui/new/css/main.css @@ -3909,3 +3909,78 @@ a:hover.search_button { .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: -0.2em 1em .5em .4em; } .ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: -0.2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } + + +.ui_dialog_loaderbox{ + width:250px; + height:auto; + float:left; + background:#FFF repeat top left; + border:1px solid #CCC; + margin:10px 0 0 0; + padding:0 10px 5px 0; +} + +.ui_dialog_loader { + width:16px; + height:16px; + float:left; + background:url(../images/mid_default.gif) no-repeat top left; + margin:5px 0 0 7px; + display:inline; + padding:0; +} + +.ui_dialog_loaderbox p{ + width:auto; + height:auto; + float:left; + color:#333; + font-size:12px; + font-weight:normal; + margin:7px 0 0 10px; + padding:0; +} + +.ui_dialog_messagebox{ + width:250px; + height:auto; + float:left; + background:#fff7e3 repeat top left; + border:1px solid #CCC; + margin:10px 0 0 0; + padding:0 10px 5px 0; +} + +.ui_dialog_messagebox.error{ + background:#ffe5e5 repeat top left; +} + +.ui_dialog_msgicon { + width:18px; + height:20px; + float:left; + background:url(../images/tick_review.png) no-repeat top left; + margin:5px 0 0 7px; + display:inline; + padding:0; +} + +.ui_dialog_msgicon.error { + background:url(../images/cross_review.png) no-repeat top left; +} +.ui_dialog_messagebox_text{ + width:auto; + height:auto; + float:left; + color:#333; + font-size:11px; + font-weight:normal; + margin:10px 0 0 10px; + padding:0; +} + +.ui_dialog_messagebox_text.error{ + + color:#ae0000; +} \ No newline at end of file diff --git a/ui/new/images/cross_review.png b/ui/new/images/cross_review.png new file mode 100644 index 0000000000000000000000000000000000000000..ba95024d76a9f4fe1100ec8750a7f2e82533c12e GIT binary patch literal 1099 zcmV-R1ho5!P)Mh#wOQ{=+%n z-*Ym8Xn+7>gehbBGPnI5`;YhhEMHGtJO1_khsOW`1eW@9YRiAd=l2-@ODOzjG52Ex z3x2UN{LdsJ%)oU20RzXyJB$DU#E5Jc*swoW4+$~;`J2x0|KFwm%&aVozqTx3_;>BZ ze`aQ8kOE$ocU$)7^B+CT@aNw@hF>0DYZ#wQ>|kL2{fB`W=&nDPFE9WE5Qd@H01Jrt zwX*yE@85qEIDY+LU=R@4&G7A;>)#LW8JPG57+7L!7{Q9({}oYWzkI%%>EQknMrk2e zMn*=4-;O?KIbJ_7fd|BAXNy%FFJFf;{Q1T3mxYCqk(uQUvC>aGts02v#(I z{(Ndi4L)W&fCkc$pY^I2itX`@`^U z)uuXu#cc?OGtQm-pOuA$>HC-O4F8|LWng;!mVw3E^!Z0MS1Gt6-s5K&IDh_PVAe4x z|7quJ&hqyk11~cR1LL7RTyX22W@hm*Ub&LasifS)`0qc%3vWNi|1Y1M=j7q}2)1e7 zym`VvS_6tjf%r8L-vD7?Xukz10tiq^)q}JZMd9z>`+UBbSAWtUixn!EA|leHY10la zf{0x@b?M};n}UdfMI3^&5hs@lrI4XRsjEXrccDWObSSM7HOb3M-n%!~bB!Vo9O8uo zhs!zNJ?FdMIV~~XGU4XPgI_=_-l6T-0$2J3rQ#+|kAVw%Jl;j0&=1zrI}Y34;M`hQ zm5UutisFMQL@JVd-@c++`ouVcrT|hDAlh=Mo-MIh*GG!lK~Q&?455`I)_Qy-o=%JO zL?HrH|GxDm;Py{_^!u?>uYhwRnE)FKXlMmXa7e~+HD0=*x$7?LN+oB_<)ebr5Bv75 z=fh9hhTcxr{>!i)*pPl`u$svx=ClNzNN&=VYe4Sg=@&CIGpu*`(Af0ex4FP^5-}Cx2=sPsr3+?5;;iZ(6m7myyS~5aq{njQz}2x zqS=6;6iE+xuhJ`z3cG8O)`~AjoZx}GYgc_3LW4|pUR#2(Om?Q-^ZLtE@5h*B6>Z-~ z;JSO~@3P%Gm062aMB{CfZzLKwD!%p|H0e=hlaf`*%4FWPFG-AzdrfyM=MsK(pmPt3 R58eO(002ovPDHLkV1j90Ar$}s literal 0 HcmV?d00001 diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp index 12394990de3..3273c39625a 100644 --- a/ui/new/jsp/resource.jsp +++ b/ui/new/jsp/resource.jsp @@ -705,6 +705,7 @@ From a5dd8a5bc7e8c34c2e2e0f490e35698a05ba9349 Mon Sep 17 00:00:00 2001 From: Kris McQueen Date: Fri, 22 Oct 2010 16:53:49 -0700 Subject: [PATCH 2/2] bug 6684: return 'attached' parameter as part of listVolumes response. For the diskOffering information looking like service offering information, this is because the diskOffering on the root volume is set to be the service offering of the VM. If this is a change from 2.1.x please re-open this bug, but for the time being I'm going to assume this is working as expected. status 6684: resolved fixed --- server/src/com/cloud/api/commands/ListVolumesCmd.java | 1 + server/src/com/cloud/api/response/VolumeResponse.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java index 12f6bbb2493..44f55c1c21f 100755 --- a/server/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java @@ -206,6 +206,7 @@ public class ListVolumesCmd extends BaseListCmd { volResponse.setSourceType(volume.getSourceType().toString()); } volResponse.setHypervisor(ApiDBUtils.getVolumeHyperType(volume.getId()).toString()); + volResponse.setAttached(volume.getAttached()); volResponse.setResponseName("volume"); volResponses.add(volResponse); diff --git a/server/src/com/cloud/api/response/VolumeResponse.java b/server/src/com/cloud/api/response/VolumeResponse.java index 8d5b643da63..36ffd97513a 100644 --- a/server/src/com/cloud/api/response/VolumeResponse.java +++ b/server/src/com/cloud/api/response/VolumeResponse.java @@ -104,6 +104,9 @@ public class VolumeResponse extends BaseResponse { @SerializedName("snapshotid") @Param(description="ID of the snapshot from which this volume was created") private Long snapshotId; + @SerializedName("attached") @Param(description="the date the volume was attached to a VM instance") + private Date attached; + public Long getId() { return id; } @@ -319,4 +322,12 @@ public class VolumeResponse extends BaseResponse { public void setSnapshotId(Long snapshotId) { this.snapshotId = snapshotId; } + + public Date getAttached() { + return attached; + } + + public void setAttached(Date attached) { + this.attached = attached; + } }