From 6d7b4e3c7a5be49dac417dd33dd1ba5548ed9c6c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 7 Feb 2011 17:37:50 -0800
Subject: [PATCH] bug 8440: Add Primary Storage dialog - when PreSetup is
 selected, change "Path:" to "SR Name-Label:". When NFS is selected, change
 "SR Name-Label:" back to "Path:".

---
 client/WEB-INF/classes/resources/messages.properties |  1 +
 ui/index.jsp                                         |  4 +++-
 ui/scripts/cloud.core.pod.js                         | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 2dd49c70aaf..31b6ffbb1ab 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -18,6 +18,7 @@ label.by.account=By Account
 label.by.start.date=By Start Date
 label.by.end.date=By End Date
 message.no.network.support.configuration.not.true=direct.attach.security.groups.enabled is not set to true. Thus, no additional network features.  Please continue to step 5.
+label.SR.name = SR Name-Label
 
 #Labels
 label.account.id=Account ID
diff --git a/ui/index.jsp b/ui/index.jsp
index e7c7b004f3c..de1f15aa572 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -85,7 +85,9 @@
 		'label.by.zone': '<fmt:message key="label.by.zone"/>', 
 		'label.by.pod': '<fmt:message key="label.by.pod"/>', 
 		'label.by.domain': '<fmt:message key="label.by.domain"/>',
-		'label.by.account': '<fmt:message key="label.by.account"/>'
+		'label.by.account': '<fmt:message key="label.by.account"/>',
+		'label.path': '<fmt:message key="label.path"/>',
+		'label.SR.name': '<fmt:message key="label.SR.name"/>'
 	};	
 	</script>
 </head>
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index f6ad7438528..2d7f14528ef 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -921,12 +921,21 @@ function iscsiURL(server, iqn, lun) {
 
 function bindEventHandlerToDialogAddPool($dialogAddPool) { 
     $dialogAddPool.find("#add_pool_protocol").change(function(event) {
-    	if($(this).val() == "nfs" || $(this).val() == "PreSetup") {
+    	if($(this).val() == "nfs") {
     		$("#add_pool_server_container", $dialogAddPool).show();
     		$('li[input_group="nfs"]', $dialogAddPool).show();
     		$('li[input_group="iscsi"]', $dialogAddPool).hide();
     		$('li[input_group="vmfs"]', $dialogAddPool).hide();
     		$dialogAddPool.find("#add_pool_nfs_server").attr("disabled", false).val("");
+    		$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.path"]+":");
+    	} 
+    	if($(this).val() == "PreSetup") {
+    		$("#add_pool_server_container", $dialogAddPool).show();
+    		$('li[input_group="nfs"]', $dialogAddPool).show();
+    		$('li[input_group="iscsi"]', $dialogAddPool).hide();
+    		$('li[input_group="vmfs"]', $dialogAddPool).hide();
+    		$dialogAddPool.find("#add_pool_nfs_server").attr("disabled", false).val("");    		
+    		$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.SR.name"]+":");
     	} 
     	else if($(this).val() == "iscsi") {
     		$("#add_pool_server_container", $dialogAddPool).show();