Merge branch 'ui-mixed-zone-management'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc08c237 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc08c237 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc08c237 Branch: refs/heads/master Commit: fc08c2372ca80c6a1f8e4ecfcc2e2a77e64589a9 Parents: 4a3a9df 355b910 Author: Brian Federle <[email protected]> Authored: Fri Apr 19 10:25:39 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri Apr 19 10:25:39 2013 -0700 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 59 ++++++++++++- ui/index.jsp | 4 +- ui/scripts/instanceWizard.js | 37 ++++++-- ui/scripts/network.js | 46 ++-------- ui/scripts/storage.js | 44 +++++++-- ui/scripts/templates.js | 134 ++++++++++++++++++++------- ui/scripts/ui-custom/projectSelect.js | 66 ++++++++++++++ ui/scripts/ui-custom/projects.js | 6 +- ui/scripts/ui-custom/zoneFilter.js | 39 ++++++++ 9 files changed, 340 insertions(+), 95 deletions(-) ----------------------------------------------------------------------
