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:51:06 UTC
git commit: updated refs/heads/master to 56684a5
Repository: cloudstack
Updated Branches:
refs/heads/master ecdd0e102 -> 56684a52b
UI: VM wizard: Fix specify IP field when new network is unchecked
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/56684a52
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56684a52
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56684a52
Branch: refs/heads/master
Commit: 56684a52bc8ce35483ce7ff907a1383bf54f7235
Parents: ecdd0e1
Author: Brian Federle <br...@citrix.com>
Authored: Thu Feb 27 14:49:40 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Feb 27 14:50:03 2014 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 5 +++++
ui/scripts/ui-custom/instanceWizard.js | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56684a52/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 357bae4..2d09f59 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -6170,6 +6170,7 @@ label.error {
.multi-wizard.instance-wizard .select-network .select.advanced .specify-ip input {
margin: 0px 0 0 15px;
+ width: 138px;
}
.multi-wizard.instance-wizard .select-network .select-container .select input {
@@ -6219,6 +6220,10 @@ label.error {
position: relative;
}
+.multi-wizard.instance-wizard .select-network .select.new-network.unselected .select.advanced {
+ height: auto;
+}
+
.multi-wizard.instance-wizard .select-network .select.new-network .select.advanced .specify-ip {
top: 74px;
left: 29px;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56684a52/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 274fa19..8884ebe 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -788,7 +788,7 @@
$step.find('.my-networks .select-container .select, .select.new-network .select').each(function () {
var $select = $(this);
var $advancedLink = $('<div>').addClass('advanced-options hide-if-unselected');
- var $specifyIpField = $('<div>').addClass('specify-ip').append(
+ var $specifyIpField = $('<div>').addClass('specify-ip hide-if-unselected').append(
$('<label>').html(_l('label.ip.address')),
$('<input>').attr({ type: 'text' })
);