etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(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.
This commit is contained in:
Jessica Wang 2012-06-21 13:48:11 -07:00
parent aac1ac555d
commit 791986268a
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ui/scripts/ui-custom/zoneWizard.js
View File

@ -560,31 +560,46 @@
.attr({ title: 'Remove this physical network' })
.append('<span>').addClass('icon').html('&nbsp;');
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.'