From 4c2bc40ed1ef440f6bc8acc4dae8a6fc32967079 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 14 Dec 2010 10:27:48 -0800
Subject: [PATCH] old 2.1 UI -  response of createNetworkGroup API has been
 changed. This is related UI change.

---
 ui/2.1/jsp/tab_accounts.jsp          | 1 -
 ui/2.1/jsp/tab_configuration.jsp     | 1 -
 ui/2.1/jsp/tab_domains.jsp           | 1 -
 ui/2.1/jsp/tab_events.jsp            | 1 -
 ui/2.1/jsp/tab_hosts.jsp             | 1 -
 ui/2.1/jsp/tab_instances.jsp         | 1 -
 ui/2.1/jsp/tab_networking.jsp        | 1 -
 ui/2.1/jsp/tab_storage.jsp           | 1 -
 ui/2.1/jsp/tab_templates.jsp         | 3 +--
 ui/2.1/scripts/cloud.core.network.js | 6 +++---
 10 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/ui/2.1/jsp/tab_accounts.jsp b/ui/2.1/jsp/tab_accounts.jsp
index df4da1544c5..8bd1bb882b8 100755
--- a/ui/2.1/jsp/tab_accounts.jsp
+++ b/ui/2.1/jsp/tab_accounts.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.accounts.js?t=<%=milliseconds%>"></script>
 	
 <!-- Accounts -->
 <div class="maincontent" style="display:block;" id="submenu_content_account">
diff --git a/ui/2.1/jsp/tab_configuration.jsp b/ui/2.1/jsp/tab_configuration.jsp
index 1d1df5ca070..c9f574702fc 100755
--- a/ui/2.1/jsp/tab_configuration.jsp
+++ b/ui/2.1/jsp/tab_configuration.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
 	
 <!-- Content Panel -->
 <!-- Submenu -->
diff --git a/ui/2.1/jsp/tab_domains.jsp b/ui/2.1/jsp/tab_domains.jsp
index dbe56fb321d..5a9ceb6bfa3 100755
--- a/ui/2.1/jsp/tab_domains.jsp
+++ b/ui/2.1/jsp/tab_domains.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.domains.js?t=<%=milliseconds%>"></script>
 	
 <!-- Content Panel -->
 <div class="maincontent" style="display:block;" id="submenu_content_domains">
diff --git a/ui/2.1/jsp/tab_events.jsp b/ui/2.1/jsp/tab_events.jsp
index f5c4ac48e88..e83a0bed7ac 100755
--- a/ui/2.1/jsp/tab_events.jsp
+++ b/ui/2.1/jsp/tab_events.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.events.js?t=<%=milliseconds%>"></script>
 
 <!-- Content Panel -->
 <!-- Submenus -->
diff --git a/ui/2.1/jsp/tab_hosts.jsp b/ui/2.1/jsp/tab_hosts.jsp
index 438efabae1e..3e0eb71ae30 100755
--- a/ui/2.1/jsp/tab_hosts.jsp
+++ b/ui/2.1/jsp/tab_hosts.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.hosts.js?t=<%=milliseconds%>"></script>
 	
 <div class="maincontent" id="submenu_content_routing" style="display:block">
 	<div id="maincontent_title">
diff --git a/ui/2.1/jsp/tab_instances.jsp b/ui/2.1/jsp/tab_instances.jsp
index c6f8852b639..08ab3d572eb 100755
--- a/ui/2.1/jsp/tab_instances.jsp
+++ b/ui/2.1/jsp/tab_instances.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.instances.js?t=<%=milliseconds%>"></script>
 
 <!-- Content Panel -->
 <!-- Submenu -->
diff --git a/ui/2.1/jsp/tab_networking.jsp b/ui/2.1/jsp/tab_networking.jsp
index ea0b1f27a9a..ae81f2d107e 100755
--- a/ui/2.1/jsp/tab_networking.jsp
+++ b/ui/2.1/jsp/tab_networking.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.network.js?t=<%=milliseconds%>"></script>
 
 <!-- Content Panel -->
 <!-- Submenus -->
diff --git a/ui/2.1/jsp/tab_storage.jsp b/ui/2.1/jsp/tab_storage.jsp
index aaab49adb19..f84a9405cde 100755
--- a/ui/2.1/jsp/tab_storage.jsp
+++ b/ui/2.1/jsp/tab_storage.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.storage.js?t=<%=milliseconds%>"></script>
 	
 <div class="submenu_links">
     <div class="submenu_links_on" id="submenu_pool">
diff --git a/ui/2.1/jsp/tab_templates.jsp b/ui/2.1/jsp/tab_templates.jsp
index e861adc1182..6582623dc18 100755
--- a/ui/2.1/jsp/tab_templates.jsp
+++ b/ui/2.1/jsp/tab_templates.jsp
@@ -2,8 +2,7 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.templates.js?t=<%=milliseconds%>"></script>
-	
+
 <div class="submenu_links">		
     <div class="submenu_links_on" id="submenu_template">Template</div>
     <div class="submenu_links_off" id="submenu_iso">ISO</div>       
diff --git a/ui/2.1/scripts/cloud.core.network.js b/ui/2.1/scripts/cloud.core.network.js
index 5b5d84e4b1d..4cacc704c37 100644
--- a/ui/2.1/scripts/cloud.core.network.js
+++ b/ui/2.1/scripts/cloud.core.network.js
@@ -1726,11 +1726,11 @@ function showNetworkingTab(p_domainId, p_account) {
 				thisDialog.dialog("close");
 							
 				$.ajax({						
-				       data: createURL("command=createNetworkGroup&name="+todb(name)+"&description="+todb(desc)+"&response=json"),
+				    data: createURL("command=createNetworkGroup&name="+todb(name)+"&description="+todb(desc)+"&response=json"),
 					dataType: "json",
 					success: function(json) {						   
-						var items = json.createnetworkgroupresponse.networkgroup;													
-						networkGroupJSONToTemplate(items[0], template);							
+						var item = json.createsecuritygroupresponse.securitygroup;													
+						networkGroupJSONToTemplate(item, template);							
 						changeGridRowsTotal(submenuContent.find("#grid_rows_total"), 1);	
 						loadingImg.hide();  
                         rowContainer.show();