From ac648556182cd84388947fa2576f016068d72c48 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 28 Jul 2011 18:49:33 -0700
Subject: [PATCH] cloudStack - Elastic Load Balancer - hide details tab and
 show load balancer tab.

---
 ui/jsp/ipaddress.jsp               | 14 ++++++++++----
 ui/scripts/cloud.core.ipaddress.js | 14 +++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 3a9527be276..7d270f6987b 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -32,7 +32,7 @@ dictionary = {
         </p>
     </div>
     <div class="tabbox" style="margin-top: 15px;">
-        <div class="content_tabs on" id="tab_details">
+        <div class="content_tabs on" id="tab_details" style="display: none">
             <fmt:message key="label.details"/></div>	            
         <div class="content_tabs off" id="tab_port_range" style="display: none">
             <fmt:message key="label.port.range"/></div>            	
@@ -43,7 +43,7 @@ dictionary = {
 		<!-- <div class="content_tabs off" id="tab_vpn" style="display: none">
             <fmt:message key="label.vpn"/></div> -->
     </div>  
-    <div id="tab_content_details">
+    <div id="tab_content_details" style="display: none">
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
 	        <div class="rightpanel_mainloaderbox">
 	            <div class="rightpanel_mainloader_animatedicon">
@@ -416,7 +416,10 @@ dictionary = {
 	                    <div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 15%;">
-	                    <select id="algorithm_select" class="select" style="width: 70%;">   	                      
+	                    <select id="algorithm_select" class="select" style="width: 70%;">   
+	                        <option value='roundrobin'>roundrobin</option>
+			                <option value='leastconn'>leastconn</option>                            
+			                <option value='source'>source</option>    	                      
 	                    </select>
 	                </div>	                
 	                <div class="grid_row_cell" style="width: 10%;">	  
@@ -548,7 +551,10 @@ dictionary = {
             <div class="row_celltitles" id="private_port"></div>
         </div>
         <div class="grid_row_cell" style="width: 15%; ">
-            <select id="algorithm_select" class="select" style="width: 70%;">                 
+            <select id="algorithm_select" class="select" style="width: 70%;">    
+                <option value='roundrobin'>roundrobin</option>
+                <option value='leastconn'>leastconn</option>                            
+                <option value='source'>source</option>            
             </select>
         </div>        
         <div class="grid_row_cell" style="width: 10%; ">
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 5dac343b57f..77d689d0a0a 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -74,8 +74,12 @@ function afterLoadIpJSP() {
     //***** switch between different tabs (end) **********************************************************************
         
     if(g_supportELB == "guest" || g_supportELB == "public") {
-		$("#tab_details,#tab_port_range,#tab_port_forwarding,#tab_load_balancer,#tab_vpn").hide();	
+		$("#tab_details,#tab_port_range,#tab_port_forwarding,#tab_vpn").hide();	
+		$("#tab_load_balancer").show();	
+		
 		$("#tab_content_details").hide();
+		$("#tab_content_load_balancer").show();
+		
 		$("#acquire_new_ip_button").hide();
 		$("#add_load_balancer_and_ip_button").show();
 		
@@ -205,7 +209,9 @@ function afterLoadIpJSP() {
 			return false;
 		});		
 	}
-    else {
+    else { 
+    	$("#tab_details,#tab_content_details").show();
+    	
 	    //dialogs
 	    initDialog("dialog_acquire_public_ip", 325);
 		initDialog("dialog_enable_vpn");
@@ -641,7 +647,9 @@ function ipToRightPanel($midmenuItem1) {
     copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
     
     $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
-    $("#tab_details").click();        
+    
+    if(!(g_supportELB == "guest" || g_supportELB == "public"))
+        $("#tab_details").click();        
    
     if(ipObj.isstaticnat == true) {
         $("#tab_port_range").show();