From 24665019113185ce221e6c27019a8a8f7b588da5 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 25 Oct 2010 19:35:52 -0700
Subject: [PATCH] new UI - VLAN page - fill up info dropdown.

---
 ui/new/jsp/resource.jsp                | 11 +++++--
 ui/new/scripts/cloud.core2.resource.js | 40 ++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 63664579003..be09abf799f 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -1040,9 +1040,14 @@
             	<a href="#">Close</a>
             </div>
         	<ul class="networkswitch_infodropdown_textbox">
-            	<li><div class="networkswitch_infodropdown_textbox_label">Zone</div>: NC </li>
-                <li><div class="networkswitch_infodropdown_textbox_label">Network Type</div>: Root</li>
-                <li><div class="networkswitch_infodropdown_textbox_label">Account</div>: Admin</li>
+            	<li id="vlan_container"><div class="networkswitch_infodropdown_textbox_label">VLAN ID:</div> <span id="vlan"></span></li>
+                <li id="gateway_container"><div class="networkswitch_infodropdown_textbox_label">Gateway:</div> <span id="gateway"></span></li>
+                <li id="netmask_container"><div class="networkswitch_infodropdown_textbox_label">Netmask:</div> <span id="netmask"></span></li>
+                <li id="iprange_container"><div class="networkswitch_infodropdown_textbox_label">IP Range:</div> <span id="iprange"></span></li>
+                <li id="domainid_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Domain ID:</div> <span id="domainid"></span></li>
+                <li id="domain_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Domain:</div> <span id="domain"></span></li>
+                <li id="account_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Account:</div> <span id="account"></span></li>
+                <li id="podname_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Pod:</div> <span id="podname"></span></li>
             </ul>
         </div>
         
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 3df2fd3c45c..61db8975548 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -463,8 +463,44 @@ function vlanJsonToTemplate(jsonObj, $template1) {
         var $target = $(event.target);
         var targetId = $target.attr("id");
         switch(targetId) {
-            case "info_icon":                
-                $target.siblings("#info_dropdown").show();
+            case "info_icon":   
+                var vlanName = jsonObj.id;
+		        var vlanDisplayName = vlanName;
+		        if (jsonObj.description != null) {
+			        if (jsonObj.description.indexOf("-") == -1) {
+				        vlanName = jsonObj.description;
+				        vlanDisplayName = vlanName;
+			        } else {
+				        var ranges = jsonObj.description.split("-");
+				        vlanName = ranges[0] + " -" + ranges[1];
+				        vlanDisplayName = ranges[0] + " - " + ranges[1];
+			        }
+		        }
+                
+                
+                var $infoDropdown = $target.siblings("#info_dropdown");
+               
+                $infoDropdown.find("#vlan").text(fromdb(jsonObj.vlan));
+                $infoDropdown.find("#gateway").text(fromdb(jsonObj.gateway));
+                $infoDropdown.find("#netmask").text(fromdb(jsonObj.netmask));
+                $infoDropdown.find("#iprange").text(fromdb(vlanDisplayName));
+                if(jsonObj.domainid != null) {
+                    var $container = $infoDropdown.find("#domainid_container").show();
+                    $container.find("#domainid").text(fromdb(jsonObj.domainid));               
+                }                
+                if(jsonObj.domain != null) {
+                     var $container = $infoDropdown.find("#domain_container").show();
+                    $container.find("#domain").text(fromdb(jsonObj.domain));        
+                }
+                if(jsonObj.account != null) {
+                    var $container = $infoDropdown.find("#account_container").show();
+                    $container.find("#account").text(fromdb(jsonObj.account));
+                }
+                if(jsonObj.podname != null) {
+                    var $container = $infoDropdown.find("#podname_container").show();
+                    $container.find("#podname").text(fromdb(jsonObj.podname));
+                }     
+                $infoDropdown.show();
                 break;
         }