Merge branch 'ui-new-project-switcher' into ui-mixed-zone-management

Conflicts:
	ui/scripts/ui-custom/projectSelect.js

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));      
 

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);
+    }
   };
 
   /**