Updated Branches: refs/heads/master aac1ac555 -> 791986268
(1) CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical network step - no isolation method dropdown if network type is Basic. (2) CS-15312 - cloudstack 3.0 UI - Add Zone Wizard - add physical network - remove "L3" option from isolation method. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/79198626 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/79198626 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/79198626 Branch: refs/heads/master Commit: 791986268ae9cabebfe9f7b7c4d5761f5c8d4fc7 Parents: aac1ac5 Author: Jessica Wang <[email protected]> Authored: Thu Jun 21 13:48:11 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu Jun 21 13:48:11 2012 -0700 ---------------------------------------------------------------------- ui/scripts/ui-custom/zoneWizard.js | 53 ++++++++++++++++++++----------- 1 files changed, 34 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/79198626/ui/scripts/ui-custom/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index 3a72714..8f1a872 100644 --- a/ui/scripts/ui-custom/zoneWizard.js +++ b/ui/scripts/ui-custom/zoneWizard.js @@ -560,31 +560,46 @@ .attr({ title: 'Remove this physical network' }) .append('<span>').addClass('icon').html(' '); var $icon = $('<div>').addClass('physical-network-icon'); - var $nameField = $('<div>').addClass('field name').append( + + var $nameField = $('<div>').addClass('field name').append( $('<div>').addClass('name').append( $('<label>').html('Physical network name') ), $('<div>').addClass('value').append( $('<input>').attr({ type: 'text' }).addClass('required') - ), - $('<div>').append( - $('<span style=\"font-size:11px\;padding-right:5px;padding-left:50px">').html('Isolation method'), - $('<select>').append( - $('<option>').attr({ - value: '' - }).html(''), - $('<option>').attr({ - value: 'VLAN' - }).html('VLAN'), - $('<option>').attr({ - value: 'L3' - }).html('L3'), - $('<option>').attr({ - value: 'GRE' - }).html('GRE') + ) + ); + if($wizard.find('.select-network-model input:radio[name=network-model]:checked').val() == 'Advanced') { + $nameField.append( + $('<div>').addClass('name').append( + $('<label>').html('Physical network name') + ), + $('<div>').addClass('value').append( + $('<input>').attr({ type: 'text' }).addClass('required') + ), + $('<div>').append( + $('<span style=\"font-size:11px\;padding-right:5px;padding-left:50px">').html('Isolation method'), + $('<select>').append( + $('<option>').attr({ + value: '' + }).html(''), + $('<option>').attr({ + value: 'VLAN' + }).html('VLAN'), + //User should not be given the option to create a physical network with "L3" isolation method. (CS-15312) + /* + $('<option>').attr({ + value: 'L3' + }).html('L3'), + */ + $('<option>').attr({ + value: 'GRE' + }).html('GRE') + ) ) - ) - ); + ); + } + var $dropContainer = $('<div>').addClass('drop-container').append( $('<span>').addClass('empty-message').html( 'Drag and drop traffic types you would like to add here.'
