From 4b853ccdc74ba7f247d48a604e8fb0d7051ee528 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 10 Apr 2013 13:09:43 -0700
Subject: [PATCH 01/14] Add zone filter drop-down to header (needs styling)

---
 ui/index.jsp                       |  1 +
 ui/scripts/ui-custom/zoneFilter.js | 31 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 ui/scripts/ui-custom/zoneFilter.js

diff --git a/ui/index.jsp b/ui/index.jsp
index 3b8f37886ef..003790e1e08 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1659,6 +1659,7 @@ under the License.
     <script type="text/javascript" src="scripts/events.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/regions.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/regions.js?t=<%=now%>"></script>
+    <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/ipRules.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/securityRules.js?t=<%=now%>"></script>
diff --git a/ui/scripts/ui-custom/zoneFilter.js b/ui/scripts/ui-custom/zoneFilter.js
new file mode 100644
index 00000000000..d298e4ff78a
--- /dev/null
+++ b/ui/scripts/ui-custom/zoneFilter.js
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+(function($, cloudStack) {
+  $(window).bind('cloudStack.ready', function() {
+    var $header = $('#header .controls');
+    var $zoneFilter = $('<div>').addClass('zone-filter');
+    var $zoneTypeSelect = $('<select>').append(
+      $('<option>').attr('value', 'basic').html(_l('Basic')),
+      $('<option>').attr('value', 'advanced').html(_l('Advanced'))
+    );
+
+    $zoneTypeSelect.appendTo($zoneFilter);
+    $zoneFilter.insertAfter($header.find('#user'));
+  });
+}(jQuery, cloudStack));      
+

From aa5ed0a0fb3878bb6cf04d0770cd456dafcd9f4b Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 10 Apr 2013 13:34:25 -0700
Subject: [PATCH 02/14] Layout new project selector (only dummy data for now)

---
 ui/css/cloudstack3.css                | 27 +++++++++++++++++++----
 ui/index.jsp                          |  3 ++-
 ui/scripts/ui-custom/projectSelect.js | 31 +++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 ui/scripts/ui-custom/projectSelect.js

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7ebda9b8f36..bf3cfb52ad3 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8839,6 +8839,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
   left: 0px;
   top: -10px;
   margin-right: 9px;
+  display: none;
 }
 
 #header div.view-switcher.alt {
@@ -8905,6 +8906,25 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
   padding: 3px 0 4px;
 }
 
+/*** View switcher (drop-down)*/
+.project-switcher {
+  float: left;
+  width: 141px;
+  padding: 9px 17px 0 0;
+}
+
+.project-switcher select {
+  width: 100%;
+  font-size: 12px;
+  border: 1px solid #000000;
+  border-bottom: #FFFFFF;
+  /*+border-radius:4px;*/
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+}
+
 /*** Select project*/
 .project-selector {
   display: inline-block;
@@ -11761,12 +11781,11 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
 .updateResourceLimits:hover .icon {
   background-position: -100px -614px;
 }
- 
+
 .addVlanRange .icon {
   background-position: -168px -31px;
 }
 
-
 .addVlanRange:hover .icon {
   background-position: -168px -613px;
 }
@@ -11796,8 +11815,8 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
   background-position: -168px -31px;
 }
 
-.reset .icon ,
-.scaleUp .icon{
+.reset .icon,
+.scaleUp .icon {
   background-position: -168px -31px;
 }
 
diff --git a/ui/index.jsp b/ui/index.jsp
index 3b8f37886ef..fcc3d699923 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1678,7 +1678,8 @@ under the License.
     <script type="text/javascript" src="scripts/system.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
-    <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>  
+    <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+    <script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
 
     <!-- Plugins -->
     <script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
new file mode 100644
index 00000000000..ae3d8f9f8da
--- /dev/null
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+(function($, cloudStack) {
+  $(window).bind('cloudStack.ready', function() {
+    var $header = $('#header .controls');
+    var $projectSwitcher = $('<div>').addClass('project-switcher');
+    var $projectSelect = $('<select>').append(
+      $('<option>').attr('value', 'basic').html(_l('Project 1')),
+      $('<option>').attr('value', 'advanced').html(_l('Project 2'))
+    );
+
+    $projectSelect.appendTo($projectSwitcher);
+    $projectSwitcher.insertBefore($header.find('.region-switcher'));
+  });
+}(jQuery, cloudStack));      
+

From 50140735c7cc584b052105df1d16f861bc080475 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 10 Apr 2013 14:42:22 -0700
Subject: [PATCH 03/14] Project switcher: Add label

---
 ui/css/cloudstack3.css                | 9 ++++++++-
 ui/scripts/ui-custom/projectSelect.js | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index bf3cfb52ad3..61e5ab4d94f 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8913,6 +8913,13 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
   padding: 9px 17px 0 0;
 }
 
+.project-switcher label {
+  position: absolute;
+  top: -2px;
+  color: #FFFFFF;
+  font-size: 11px;
+}
+
 .project-switcher select {
   width: 100%;
   font-size: 12px;
@@ -11390,7 +11397,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
   border-bottom: 1px solid #FFFFFF;
   height: 28px;
   float: left;
-  margin: 4px 13px 0 0;
+  margin: 5px 13px 0 0;
   cursor: pointer;
   /*+box-shadow:inset 0px 1px 1px #000000;*/
   -moz-box-shadow: inset 0px 1px 1px #000000;
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index ae3d8f9f8da..f93fefcf167 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -23,8 +23,9 @@
       $('<option>').attr('value', 'basic').html(_l('Project 1')),
       $('<option>').attr('value', 'advanced').html(_l('Project 2'))
     );
+    var $label = $('<label>').html('Project:');
 
-    $projectSelect.appendTo($projectSwitcher);
+    $projectSwitcher.append($label, $projectSelect);
     $projectSwitcher.insertBefore($header.find('.region-switcher'));
   });
 }(jQuery, cloudStack));      

From fa8b83581bd39230f98806ed43f4103bb5454469 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 10 Apr 2013 14:43:42 -0700
Subject: [PATCH 04/14] Zone type switcher: Style, add functionality

- Add top label to zone switcher, add more styling

- Implement zone switching functionality, which on change sets
  cloudStack.context.zoneType to the relevant filter option, or null
  for 'All' zone types
---
 ui/css/cloudstack3.css             | 30 ++++++++++++++++++++++++++++++
 ui/index.jsp                       |  2 +-
 ui/scripts/ui-custom/zoneFilter.js | 16 ++++++++++++----
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 61e5ab4d94f..32111309c2e 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -2277,6 +2277,34 @@ div.detail-group.actions td {
   top: 13px;
 }
 
+/** Zone filter (mixed zone management)*/
+#header .zone-filter {
+  float: left;
+  width: 111px;
+  margin: 9px 20px 0 2px;
+}
+
+#header .zone-filter label {
+  position: absolute;
+  top: -3px;
+  color: #FFFFFF;
+  font-size: 11px;
+}
+
+#header .zone-filter select {
+  width: 100%;
+  font-size: 12px;
+  border: 1px solid #000000;
+  border-bottom: #FFFFFF;
+  /*+border-radius:4px;*/
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  background: #ECECEC;
+  margin-top: 2px;
+}
+
 /*Navigation*/
 #navigation,
 #browser {
@@ -8930,6 +8958,8 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
   -webkit-border-radius: 4px;
   -khtml-border-radius: 4px;
   border-radius: 4px;
+  background: #ECECEC;
+  margin-top: 2px;
 }
 
 /*** Select project*/
diff --git a/ui/index.jsp b/ui/index.jsp
index 5b3ef3abada..6b7d431c7fa 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1659,7 +1659,6 @@ under the License.
     <script type="text/javascript" src="scripts/events.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/regions.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/regions.js?t=<%=now%>"></script>
-    <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/ipRules.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/securityRules.js?t=<%=now%>"></script>
@@ -1681,6 +1680,7 @@ under the License.
     <script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
+    <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
 
     <!-- Plugins -->
     <script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
diff --git a/ui/scripts/ui-custom/zoneFilter.js b/ui/scripts/ui-custom/zoneFilter.js
index d298e4ff78a..9e6a4936e2b 100644
--- a/ui/scripts/ui-custom/zoneFilter.js
+++ b/ui/scripts/ui-custom/zoneFilter.js
@@ -20,12 +20,20 @@
     var $header = $('#header .controls');
     var $zoneFilter = $('<div>').addClass('zone-filter');
     var $zoneTypeSelect = $('<select>').append(
-      $('<option>').attr('value', 'basic').html(_l('Basic')),
-      $('<option>').attr('value', 'advanced').html(_l('Advanced'))
+      $('<option>').attr('value', '').html(_l('All zones')),
+      $('<option>').attr('value', 'Basic').html(_l('Basic')),
+      $('<option>').attr('value', 'Advanced').html(_l('Advanced'))
     );
+    var $label = $('<label>').html('Zone type:');
 
-    $zoneTypeSelect.appendTo($zoneFilter);
-    $zoneFilter.insertAfter($header.find('#user'));
+    $zoneFilter.append($label, $zoneTypeSelect);
+    $zoneFilter.insertAfter($header.find('.project-switcher'));
+    $zoneTypeSelect.change(function() {
+      cloudStack.context.zoneType = $zoneTypeSelect.val();
+
+      // Go to default/start page (dashboard)
+      $('#breadcrumbs .home').click();
+    });
   });
 }(jQuery, cloudStack));      
 

From c529c5a18d7f18a72cf2d2de6368526966a6ac3e Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 10 Apr 2013 14:42:22 -0700
Subject: [PATCH 05/14] Project switcher: Add label

---
 ui/css/cloudstack3.css                | 9 ++++++++-
 ui/scripts/ui-custom/projectSelect.js | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index bf3cfb52ad3..61e5ab4d94f 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8913,6 +8913,13 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
   padding: 9px 17px 0 0;
 }
 
+.project-switcher label {
+  position: absolute;
+  top: -2px;
+  color: #FFFFFF;
+  font-size: 11px;
+}
+
 .project-switcher select {
   width: 100%;
   font-size: 12px;
@@ -11390,7 +11397,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
   border-bottom: 1px solid #FFFFFF;
   height: 28px;
   float: left;
-  margin: 4px 13px 0 0;
+  margin: 5px 13px 0 0;
   cursor: pointer;
   /*+box-shadow:inset 0px 1px 1px #000000;*/
   -moz-box-shadow: inset 0px 1px 1px #000000;
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index ae3d8f9f8da..f93fefcf167 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -23,8 +23,9 @@
       $('<option>').attr('value', 'basic').html(_l('Project 1')),
       $('<option>').attr('value', 'advanced').html(_l('Project 2'))
     );
+    var $label = $('<label>').html('Project:');
 
-    $projectSelect.appendTo($projectSwitcher);
+    $projectSwitcher.append($label, $projectSelect);
     $projectSwitcher.insertBefore($header.find('.region-switcher'));
   });
 }(jQuery, cloudStack));      

From d146f3d93aef1ea0b95ad3f6b81647fe926f5d53 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 13:55:51 -0700
Subject: [PATCH 06/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - instance wizard.

---
 ui/scripts/instanceWizard.js | 37 ++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index e1aeafde67c..13828c848b6 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -70,14 +70,19 @@
     steps: [
     
 		// Step 1: Setup
-    function(args) {
-		  if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart			  
-			  //populate only one zone to the dropdown, the zone which the VPC is under.
-				zoneObjs = [{
-				  id: args.context.vpc[0].zoneid, 
-					name: args.context.vpc[0].zonename, 
-					networktype: 'Advanced'
-				}];	        		
+    function(args) {		  
+		  if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart	(VPC is only available in Advanced zone)	 
+				if(args.context.zoneType ==	'Basic'){  //Basic type
+				  zoneObjs = [];				
+        }
+        else { //Advanced type or all types          
+					//populate only one zone to the dropdown, the zone which the VPC is under. (networktype should be 'Advanced' since VPC is only available in Advanced zone)
+					zoneObjs = [{
+						id: args.context.vpc[0].zoneid, 
+						name: args.context.vpc[0].zonename, 
+						networktype: 'Advanced'
+					}];	   
+        }				
 				args.response.success({ data: {zones: zoneObjs}});
 			}
 			else { //from Instance page 			 
@@ -85,8 +90,20 @@
 					url: createURL("listZones&available=true"),
 					dataType: "json",
 					async: false,
-					success: function(json) {
-						zoneObjs = json.listzonesresponse.zone;						
+					success: function(json) {					  
+						if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+						  zoneObjs = json.listzonesresponse.zone;			
+            }
+            else { //Basic type or Advanced type
+              zoneObjs = [];
+							var items = json.listzonesresponse.zone;
+							if(items != null) {
+							  for(var i = 0; i < items.length; i++) {
+								  if(items[i].networktype == args.context.zoneType) 
+								    zoneObjs.push(items[i]);
+								}
+							}
+            }						
 						args.response.success({ data: {zones: zoneObjs}});
 					}
 				});				

From f85ab8a26b48a022b1f025ce35a9b9a12c7dac04 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 14:34:14 -0700
Subject: [PATCH 07/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - network menu - show different sections upon selected zone type on top menu.

---
 ui/scripts/network.js | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 6c311923faf..dfb9f101212 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -281,29 +281,7 @@
     id: 'network',
     sectionSelect: {
       preFilter: function(args) {
-        var havingSecurityGroupNetwork = false;
-        var havingBasicZones = false;
-        var havingAdvancedZones = true;
-
-        // Get zone types
-        $.ajax({
-          url: createURL('listZones'),
-          async: false,
-          success: function(json) {
-            var zones = json.listzonesresponse.zone ?
-                  json.listzonesresponse.zone : [];
-            var basicZones = $.grep(zones, function(zone) {
-              return zone.networktype == 'Basic';
-            });
-            var advancedZones = $.grep(zones, function(zone) {
-              return zone.networktype == 'Advanced';
-            });
-
-            
-            havingBasicZones = basicZones.length ? true : false;
-            havingAdvancedZones = advancedZones.length ? true : false;    
-      }
-        });
+        var havingSecurityGroupNetwork = false;           
         
         $.ajax({
           url: createURL('listNetworks', { ignoreProject: true }),
@@ -322,11 +300,10 @@
 
         var sectionsToShow = ['networks'];
 
-        if (havingAdvancedZones) {
+        if(args.context.zoneType != 'Basic') { //Advanced type or all types				
           sectionsToShow.push('vpc');
           sectionsToShow.push('vpnCustomerGateway');
         }
-
         
         if(havingSecurityGroupNetwork == true)
           sectionsToShow.push('securityGroups');

From 65448791ed55be8e4291223f37ed81256ffc0e1e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 14:56:36 -0700
Subject: [PATCH 08/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - network menu - guest network section - show/hide Add Guest Network action
 upon selected zone type on top menu.

---
 ui/scripts/network.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index dfb9f101212..a9a1a6b015f 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -320,21 +320,14 @@
         title: 'label.guest.networks',
         listView: {
           actions: {
-            add: {
+            add: { //add Isolated guest network (can't add Shared guest network here)
               label: 'label.add.guest.network',
 
-              preFilter: function(args) {
-                var advSgDisabledZones;
-								$.ajax({
-									url: createURL('listZones'),
-									async: false,
-									success: function(json) {									 
-										advSgDisabledZones = $.grep(json.listzonesresponse.zone, function(zone) {
-											return (zone.networktype == 'Advanced' && zone.securitygroupsenabled	!= true); //Isolated networks can only be created in Advanced SG-disabled zone (but not in Basic zone nor Advanced SG-enabled zone)
-										});										
-									}
-								});								
-								return (advSgDisabledZones != null && advSgDisabledZones.length > 0);							
+              preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone 
+                if(args.context.zoneType != 'Basic') 
+								  return true;
+								else
+								  return false;								
               },
 
               createForm: {

From ba7e49f11cd1c482ced8f814a518539ee153b040 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 15:14:42 -0700
Subject: [PATCH 09/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - storage menu - volume section - Add volume action, Upload volume action -
 populate zone dropdown upon selected zone type on top menu.

---
 ui/scripts/storage.js | 44 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 54605e266ae..9f7baf027fd 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -88,9 +88,22 @@
                         url: createURL("listZones&available=true"),
                         dataType: "json",
                         async: true,
-                        success: function(json) {
-                          var items = json.listzonesresponse.zone;
-                          args.response.success({descriptionField: 'name', data: items});
+                        success: function(json) {												 
+													var zoneObjs;
+							            if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+														zoneObjs = json.listzonesresponse.zone;			
+													}
+													else { //Basic type or Advanced type
+														zoneObjs = [];
+														var items = json.listzonesresponse.zone;
+														if(items != null) {
+															for(var i = 0; i < items.length; i++) {
+																if(items[i].networktype == args.context.zoneType) 
+																	zoneObjs.push(items[i]);
+															}
+														}
+													}						
+													args.response.success({descriptionField: 'name', data: zoneObjs});													                      
                         }
                       });
                     }
@@ -208,16 +221,29 @@
                   availabilityZone: {
                     label: 'label.availability.zone',
                     docID: 'helpUploadVolumeZone',
-                    select: function(args) {
-                      $.ajax({
+                    select: function(args) {                      
+											$.ajax({
                         url: createURL("listZones&available=true"),
                         dataType: "json",
                         async: true,
-                        success: function(json) {
-                          var items = json.listzonesresponse.zone;
-                          args.response.success({descriptionField: 'name', data: items});
+                        success: function(json) {												 
+													var zoneObjs;
+							            if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+														zoneObjs = json.listzonesresponse.zone;			
+													}
+													else { //Basic type or Advanced type
+														zoneObjs = [];
+														var items = json.listzonesresponse.zone;
+														if(items != null) {
+															for(var i = 0; i < items.length; i++) {
+																if(items[i].networktype == args.context.zoneType) 
+																	zoneObjs.push(items[i]);
+															}
+														}
+													}						
+													args.response.success({descriptionField: 'name', data: zoneObjs});													                      
                         }
-                      });
+                      });											
                     }
                   },
                   format: {

From 2431c814a8b070f55e36f9a94d08066cb81ea870 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 15:57:37 -0700
Subject: [PATCH 10/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - template menu - register template action - populate zone dropdown upon
 selected zone type on top menu.

---
 ui/scripts/templates.js | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 6268f6b29b5..f579c506511 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -115,16 +115,32 @@
                         url: createURL("listZones&available=true"),
                         dataType: "json",
                         async: true,
-                        success: function(json) {
-                          var zoneObjs = json.listzonesresponse.zone;
-                          var items = [];
-                          if (isAdmin() && !(cloudStack.context.projects &&
-                                             cloudStack.context.projects[0]))
-                            items.push({id: -1, description: "All Zones"});
-                          $(zoneObjs).each(function() {
-                            items.push({id: this.id, description: this.name});
-                          });
-                          args.response.success({data: items});
+                        success: function(json) {    
+													var zoneObjs;
+							            if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+														zoneObjs = [];
+														var items = json.listzonesresponse.zone;
+														if(items != null) {
+															for(var i = 0; i < items.length; i++) {																
+																zoneObjs.push({id: items[i].id, description: items[i].name});		
+															}
+														}
+													}
+													else { //Basic type or Advanced type
+														zoneObjs = [];
+														var items = json.listzonesresponse.zone;
+														if(items != null) {
+															for(var i = 0; i < items.length; i++) {
+																if(items[i].networktype == args.context.zoneType) {
+																  zoneObjs.push({id: items[i].id, description: items[i].name});																	
+																}
+															}
+														}
+													}		
+													if (isAdmin() && !(cloudStack.context.projects && cloudStack.context.projects[0])){
+                            zoneObjs.unshift({id: -1, description: "All Zones"});
+                          }																										
+													args.response.success({data: zoneObjs});     
                         }
                       });
                     }

From 9e392d25ba38b04f62a7f61b39ffb26676c5fd09 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 16:05:01 -0700
Subject: [PATCH 11/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - template menu - register ISO action - populate zone dropdown upon selected
 zone type on top menu.

---
 ui/scripts/templates.js | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index f579c506511..b924841cb39 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -877,16 +877,32 @@
                         url: createURL("listZones&available=true"),
                         dataType: "json",
                         async: true,
-                        success: function(json) {
-                          var zoneObjs = json.listzonesresponse.zone;
-                          var items = [];
-                          if (isAdmin() && !(cloudStack.context.projects &&
-                                              cloudStack.context.projects[0]))
-                            items.push({id: -1, description: "All Zones"});
-                          $(zoneObjs).each(function() {
-                            items.push({id: this.id, description: this.name});
-                          });
-                          args.response.success({data: items});
+                        success: function(json) {													
+													var zoneObjs;
+							            if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+														zoneObjs = [];
+														var items = json.listzonesresponse.zone;
+														if(items != null) {
+															for(var i = 0; i < items.length; i++) {																
+																zoneObjs.push({id: items[i].id, description: items[i].name});		
+															}
+														}
+													}
+													else { //Basic type or Advanced type
+														zoneObjs = [];
+														var items = json.listzonesresponse.zone;
+														if(items != null) {
+															for(var i = 0; i < items.length; i++) {
+																if(items[i].networktype == args.context.zoneType) {
+																  zoneObjs.push({id: items[i].id, description: items[i].name});																	
+																}
+															}
+														}
+													}		
+													if (isAdmin() && !(cloudStack.context.projects && cloudStack.context.projects[0])){
+                            zoneObjs.unshift({id: -1, description: "All Zones"});
+                          }																										
+													args.response.success({data: zoneObjs});  
                         }
                       });
                     }

From 6c2f2d3a9de1d255854afcce8bd2fc3519696498 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 16:35:07 -0700
Subject: [PATCH 12/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - template menu - copy template action - populate zone dropdown upon selected
 zone type on top menu.

---
 ui/scripts/templates.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index b924841cb39..c1e01c1349d 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -547,13 +547,29 @@
                           dataType: "json",
                           async: true,
                           success: function(json) {
-                            var zoneObjs = json.listzonesresponse.zone;
-                            var items = [];
-                            $(zoneObjs).each(function() {
-                              if(this.id != args.context.templates[0].zoneid)
-                                items.push({id: this.id, description: this.name});
-                            });
-                            args.response.success({data: items});
+														var zoneObjs = [];
+														var items = json.listzonesresponse.zone;														
+														if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+														  if(items != null) {
+																for(var i = 0; i < items.length; i++) {																																	
+																	if(items[i].id != args.context.templates[0].zoneid) { //destination zone must be different from source zone
+																		zoneObjs.push({id: items[i].id, description: items[i].name});
+																	}																	
+																}
+															}
+														}
+														else {	//Basic type or Advanced type													
+															if(items != null) {
+																for(var i = 0; i < items.length; i++) {
+																	if(items[i].networktype == args.context.zoneType) {	//type must be matched													
+																		if(items[i].id != args.context.templates[0].zoneid) { //destination zone must be different from source zone
+																			zoneObjs.push({id: items[i].id, description: items[i].name});
+																		}
+																	}
+																}
+															}
+														}
+                            args.response.success({data: zoneObjs});
                           }
                         });
                       }

From dd62b3de7e57fd3eeb75502e7e57564b6560b6b0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 15 Apr 2013 16:42:40 -0700
Subject: [PATCH 13/14] CLOUDSTACK-2038: cloudstack UI - mixed zone management
 - template menu - copy ISO action - populate zone dropdown upon selected zone
 type on top menu.

---
 ui/scripts/templates.js | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index c1e01c1349d..52e1135c681 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -1222,14 +1222,30 @@
                           url: createURL("listZones&available=true"),
                           dataType: "json",
                           async: true,
-                          success: function(json) {
-                            var zoneObjs = json.listzonesresponse.zone;
-                            var items = [];
-                            $(zoneObjs).each(function() {
-                              if(this.id != args.context.isos[0].zoneid)
-                                items.push({id: this.id, description: this.name});
-                            });
-                            args.response.success({data: items});
+                          success: function(json) {      
+														var zoneObjs = [];
+														var items = json.listzonesresponse.zone;														
+														if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+														  if(items != null) {
+																for(var i = 0; i < items.length; i++) {																																	
+																	if(items[i].id != args.context.isos[0].zoneid) { //destination zone must be different from source zone
+																		zoneObjs.push({id: items[i].id, description: items[i].name});
+																	}																	
+																}
+															}
+														}
+														else {	//Basic type or Advanced type													
+															if(items != null) {
+																for(var i = 0; i < items.length; i++) {
+																	if(items[i].networktype == args.context.zoneType) {	//type must be matched													
+																		if(items[i].id != args.context.isos[0].zoneid) { //destination zone must be different from source zone
+																			zoneObjs.push({id: items[i].id, description: items[i].name});
+																		}
+																	}
+																}
+															}
+														}
+                            args.response.success({data: zoneObjs});			
                           }
                         });
                       }

From d529eba941f626d458d1e08bad860e97797d90fa Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Tue, 16 Apr 2013 11:44:00 -0700
Subject: [PATCH 14/14] Project selector UI functionality

---
 ui/scripts/ui-custom/projectSelect.js | 38 +++++++++++++++++++++++++--
 ui/scripts/ui-custom/projects.js      |  6 ++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index f93fefcf167..82d02c174b7 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -20,13 +20,47 @@
     var $header = $('#header .controls');
     var $projectSwitcher = $('<div>').addClass('project-switcher');
     var $projectSelect = $('<select>').append(
-      $('<option>').attr('value', 'basic').html(_l('Project 1')),
-      $('<option>').attr('value', 'advanced').html(_l('Project 2'))
+      $('<option>').attr('value', '-1').html(_l('Default view'))
     );
     var $label = $('<label>').html('Project:');
 
+    // Get project list
+    cloudStack.projects.dataProvider({
+      context: cloudStack.context,
+      response: {
+        success: function(args) {
+          var projects = args.data;
+
+          $(projects).map(function(index, project) {
+            var $option = $('<option>').val(project.id);
+
+            $option.html(project.displaytext ? project.displaytext : project.name);
+            $option.appendTo($projectSelect);
+          });
+        },
+        error: function() {}
+      }
+    });
+
     $projectSwitcher.append($label, $projectSelect);
     $projectSwitcher.insertBefore($header.find('.region-switcher'));
+
+    // Change project event
+    $projectSelect.change(function() {
+      var projectID = $projectSelect.val();
+
+      if (projectID != -1) {
+        cloudStack.context.projects = [{
+          id: projectID
+        }];
+
+        cloudStack.uiCustom.projects({ alreadySelected: true });
+      } else {
+        cloudStack.context.projects = null;
+        $('#cloudStack3-container').removeClass('project-view');
+        $('#navigation li.dashboard').click();
+      }
+    });
   });
 }(jQuery, cloudStack));      
 
diff --git a/ui/scripts/ui-custom/projects.js b/ui/scripts/ui-custom/projects.js
index 117c4337726..82abadd7fe8 100644
--- a/ui/scripts/ui-custom/projects.js
+++ b/ui/scripts/ui-custom/projects.js
@@ -728,7 +728,11 @@
     };
     $dashboardNavItem.bind('click', event);
 
-    pageElems.selector(args);
+    if (args.alreadySelected) {
+      showDashboard();
+    } else {
+      pageElems.selector(args);
+    }
   };
 
   /**