Merge branch 'ui-multiple-nics'
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e6d46d7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e6d46d7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e6d46d7e Branch: refs/heads/Health-Check-UI Commit: e6d46d7ec570ea42619366690b5288f29b30865b Parents: 7d0db5d 4b26e9d Author: Brian Federle <brian.fede...@citrix.com> Authored: Thu Mar 14 10:45:46 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Thu Mar 14 10:45:46 2013 -0700 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages.properties | 1 + ui/css/cloudstack3.css | 50 ++- ui/dictionary.jsp | 1 + ui/scripts/instances.js | 9 + ui/scripts/network.js | 637 ++++++--------- ui/scripts/ui-custom/enableStaticNAT.js | 3 +- ui/scripts/ui/widgets/detailView.js | 29 +- ui/scripts/ui/widgets/listView.js | 58 ++- ui/scripts/ui/widgets/multiEdit.js | 12 +- 9 files changed, 388 insertions(+), 412 deletions(-) ----------------------------------------------------------------------
