Merge branch 'ui-vm-affinity'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ce28903 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ce28903 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ce28903 Branch: refs/heads/master Commit: 5ce289034d398290b10adf6b2345bcddbf3731e7 Parents: b5979ba f1bdae0 Author: Brian Federle <[email protected]> Authored: Thu Apr 25 11:04:35 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Thu Apr 25 11:04:35 2013 -0700 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages.properties | 11 +- ui/css/cloudstack3.css | 67 +- ui/dictionary.jsp | 10 + ui/images/sprites.png | Bin 188552 -> 192407 bytes ui/index.jsp | 19 +- ui/scripts/affinity.js | 183 +++ ui/scripts/cloudStack.js | 9 +- ui/scripts/instanceWizard.js | 941 ++++++++------- ui/scripts/instances.js | 151 +++- ui/scripts/ui-custom/affinity.js | 173 +++ ui/scripts/ui-custom/instanceWizard.js | 19 + ui/scripts/ui/widgets/detailView.js | 29 +- ui/scripts/ui/widgets/listView.js | 10 +- 13 files changed, 1109 insertions(+), 513 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ce28903/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ce28903/ui/index.jsp ----------------------------------------------------------------------
