You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/02/27 23:16:58 UTC
git commit: updated refs/heads/master to ecdd0e1
Repository: cloudstack
Updated Branches:
refs/heads/master 4dad376f9 -> ecdd0e102
UI: VM wizard: Add specify IP field to new network area
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ecdd0e10
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ecdd0e10
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ecdd0e10
Branch: refs/heads/master
Commit: ecdd0e1027ed9d50fb8777518fc566955729f5bd
Parents: 4dad376
Author: Brian Federle <br...@citrix.com>
Authored: Thu Feb 27 14:16:32 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Feb 27 14:16:32 2014 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 18 ++++++++++++++++++
ui/scripts/ui-custom/instanceWizard.js | 10 ++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ecdd0e10/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index c7e84e5..357bae4 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -6206,6 +6206,24 @@ label.error {
.multi-wizard.instance-wizard .select-network .select.new-network {
}
+.multi-wizard.instance-wizard .select-network .select.new-network .advanced-options {
+ /*+placement:shift 379px 15px;*/
+ position: relative;
+ left: 379px;
+ top: 15px;
+ position: absolute;
+}
+
+.multi-wizard.instance-wizard .select-network .select.new-network .select.advanced {
+ height: 106px;
+ position: relative;
+}
+
+.multi-wizard.instance-wizard .select-network .select.new-network .select.advanced .specify-ip {
+ top: 74px;
+ left: 29px;
+}
+
.multi-wizard.instance-wizard .select-network .select.new-network .hide-if-selected {
display: none;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ecdd0e10/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index ed044a5..274fa19 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -57,6 +57,7 @@
$input.val() : null
);
});
+ data['new-network-ip'] = $form.find('.new-network .select.advanced .specify-ip input[type=text]').val();
args.action({
// Populate data
@@ -784,14 +785,19 @@
);
// Add IP/advanced option fields
- $step.find('.my-networks .select-container .select').each(function () {
+ $step.find('.my-networks .select-container .select, .select.new-network .select').each(function () {
var $select = $(this);
- var $advancedLink = $('<div>').addClass('advanced-options');
+ var $advancedLink = $('<div>').addClass('advanced-options hide-if-unselected');
var $specifyIpField = $('<div>').addClass('specify-ip').append(
$('<label>').html(_l('label.ip.address')),
$('<input>').attr({ type: 'text' })
);
+ // Cleanup
+ if ($select.closest('.new-network').size()) {
+ $select.find('.advanced-options, .specify-ip').remove();
+ }
+
$select.append($advancedLink, $specifyIpField);
$advancedLink.click(function() {
$select.toggleClass('advanced');