From 33fc23d90306da304c3553e37ff4b9448bb6ec69 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Tue, 2 Nov 2010 17:06:09 -0700
Subject: [PATCH] Adding Dialog to allow admins to upload SSL certificates into
 the console proxy.

---
 ui/jsp/resource.jsp               | 32 ++++++++++++++++++++++++++++++-
 ui/scripts/cloud.core.resource.js | 28 ++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 4b8dda1a021..f6b0a527137 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -84,4 +84,34 @@
        <div id="info" class="ui_dialog_messagebox_text error">(info)</div>
    </div>
 </div>
-<!-- END Add Zone Dialog -->
\ No newline at end of file
+<!-- END Add Zone Dialog -->
+
+<!-- Update Certificate Dialog -->
+<div id="dialog_update_cert" title="Update Console Proxy SSL Certificate" style="display:none">
+	<p>Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance:</p>
+
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form_acquire">
+			<ol>
+				<li>
+					<label>Certificate:</label>
+					<textarea class="text" name="update_cert" id="update_cert" style="height: 300px; width: 400px" />
+					<div id="update_cert_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+			</ol>
+		</form>
+	</div>
+   <!--Loading box-->
+   <div id="spinning_wheel" class="ui_dialog_loaderbox" style="display:none;">
+   	<div class="ui_dialog_loader"></div>
+       <p>Updating....</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 id="info_container" class="ui_dialog_messagebox error" style="display:none;">
+		<div id="icon" class="ui_dialog_msgicon error"></div>
+        <div id="info" class="ui_dialog_messagebox_text error">(info)</div>
+   </div>
+</div>
+<!-- End Update Certificate Dialog -->
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 730c316d41e..4417dec17a5 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -293,7 +293,33 @@ function resourceLoadPage(pageToShow, $midmenuItem1) {   //$midmenuItem1 is eith
 function afterLoadResourceJSP($midmenuItem1) {
     hideMiddleMenu();        
     initAddZoneButton($("#midmenu_add_link")); 
-    initDialog("dialog_add_zone");       
+	initUpdateConsoleCertButton($("#midmenu_add2_link"));
+    initDialog("dialog_add_zone");
+	initDialog("dialog_update_cert", 550);
+}
+
+function initUpdateConsoleCertButton($midMenuAddLink2) {
+	$midMenuAddLink2.find("#label").text("Update SSL Certificate");
+	$midMenuAddLink2.show();   
+	$midMenuAddLink2.unbind("click").bind("click", function(event) { 
+		var $certDialog = $("#dialog_update_cert");
+		$certDialog.find("#info_container").hide();
+		$certDialog
+		.dialog('option', 'buttons', {
+			"Add": function() {
+				var $thisDialog = $(this);
+				
+				$thisDialog.dialog("close");  
+			},
+			"Cancel": function() { 
+				var $thisDialog = $(this);
+				
+				$thisDialog.dialog("close"); 
+			}
+		
+		}).dialog("open"); 
+		return false;
+	});
 }
 
 function initAddZoneButton($midmenuAddLink1) {