Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

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);

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;
+    }
 }

ui/new/css/main.css

@@ -3912,3 +3912,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;
+}

ui/new/jsp/resource.jsp

@@ -705,6 +705,7 @@
 <!-- Add Zone Dialog -->
 <div id="dialog_add_zone" title="Add Zone" style="display:none">
 	<p>Please enter the following info to add a new zone:</p>
+
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form_acquire">
 			<ol>
@@ -748,6 +749,18 @@
 			</ol>
 		</form>
 	</div>
+    <!--Loading box-->
+    <div class="ui_dialog_loaderbox" style="display:none;">
+    	<div class="ui_dialog_loader"></div>
+        <p>Loading</p>
+    </div>
+    
+    <!--Confirmation msg box-->
+    <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->
+	<div class="ui_dialog_messagebox error" style="display:none;">
+    	<div class="ui_dialog_msgicon error"></div>
+        <div class="ui_dialog_messagebox_text error">Confirmation message will appear here</div>
+    </div>
 </div>
 <!-- END Add Zone Dialog -->
 <!-- Add Pod Dialog -->