\
\
\
\
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index 5ba32836de..f8219fbb58 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -76,7 +76,7 @@ var create_image_tmpl =
\
';
return html;
}
@@ -777,18 +953,21 @@ function setupCreateVNetDialog() {
// width: 475,
// height: height
//});
- dialog.addClass("reveal-modal");
+ dialog.addClass("reveal-modal large");
//Make the tabs look nice for the creation mode
//$('#vn_tabs',dialog).tabs();
$('div#ranged',dialog).hide();
- $('#fixed_check',dialog).click(function(){
+ $('input[name="fixed_ranged"]',dialog).change(function(){
+ console.log("pepe")
+ if (this.id == 'fixed_check') {
$('div#fixed',$create_vn_dialog).show();
$('div#ranged',$create_vn_dialog).hide();
- });
- $('#ranged_check',dialog).click(function(){
- $('div#fixed',$create_vn_dialog).hide();
- $('div#ranged',$create_vn_dialog).show();
+ }
+ else {
+ $('div#fixed',$create_vn_dialog).hide();
+ $('div#ranged',$create_vn_dialog).show();
+ }
});
$('#network_mode',dialog).change(function(){
@@ -797,9 +976,12 @@ function setupCreateVNetDialog() {
switch ($(this).val()) {
case "default":
$('input#bridge,label[for="bridge"]',$create_vn_dialog).show();
- $('input#phydev,label[for="phydev"]',$create_vn_dialog).show();
+ $('input#phydev,label[for="phydev"]',$create_vn_dialog).hide();
+ $('select#vlan,label[for="vlan"]',$create_vn_dialog).hide();
+ $('input#vlan_id,label[for="vlan_id"]',$create_vn_dialog).hide();
break;
case "802.1Q":
+ // TODO add warning use PHY_DEV unless... BRIDGE
$('input#bridge,label[for="bridge"]',$create_vn_dialog).show();
$('input#phydev,label[for="phydev"]',$create_vn_dialog).show();
$('select#vlan,label[for="vlan"]',$create_vn_dialog).show();
@@ -807,11 +989,18 @@ function setupCreateVNetDialog() {
break;
case "ebtables":
$('input#bridge,label[for="bridge"]',$create_vn_dialog).show();
+ $('input#phydev,label[for="phydev"]',$create_vn_dialog).show();
$('select#vlan,label[for="vlan"]',$create_vn_dialog).show();
+ $('input#vlan_id,label[for="vlan_id"]',$create_vn_dialog).hide();
break;
case "openvswitch":
+ $('input#bridge,label[for="bridge"]',$create_vn_dialog).show();
+ $('input#phydev,label[for="phydev"]',$create_vn_dialog).hide();
+ $('select#vlan,label[for="vlan"]',$create_vn_dialog).show();
+ $('input#vlan_id,label[for="vlan_id"]',$create_vn_dialog).show();
case "vmware":
$('input#bridge,label[for="bridge"]',$create_vn_dialog).show();
+ $('input#phydev,label[for="phydev"]',$create_vn_dialog).hide();
$('select#vlan,label[for="vlan"]',$create_vn_dialog).show();
$('input#vlan_id,label[for="vlan_id"]',$create_vn_dialog).show();
break;
@@ -899,9 +1088,9 @@ function setupCreateVNetDialog() {
//Handle submission of the easy mode
- $('#create_vn_form_easy',dialog).submit(function(){
+ $('#create_vn_submit_easy',dialog).click(function(){
//Fetch values
- var name = $('#name',this).val();
+ var name = $('#name',dialog).val();
if (!name.length){
notifyError(tr("Virtual Network name missing!"));
return false;
@@ -909,11 +1098,11 @@ function setupCreateVNetDialog() {
var network_json = {"name" : name};
- var network_mode = $('select#network_mode',this).val();
- var bridge = $('#bridge',this).val();
- var phydev = $('#phydev',this).val();
- var vlan = $('#vlan',this).val();
- var vlan_id = $('#vlan_id',this).val();
+ var network_mode = $('select#network_mode',dialog).val();
+ var bridge = $('#bridge',dialog).val();
+ var phydev = $('#phydev',dialog).val();
+ var vlan = $('#vlan',dialog).val();
+ var vlan_id = $('#vlan_id',dialog).val();
//Depending on network mode we include certain params in the
//template
@@ -960,17 +1149,17 @@ function setupCreateVNetDialog() {
break;
};
- var type = $('input:checked',this).val();
+ var type = $('input:checked',dialog).val();
network_json['type']=type;
//TODO: Name and bridge provided?!
if (type == "fixed") {
- var leases = $('#leases option', this);
+ var leases = $('#leases option', dialog);
var leases_obj=[];
//for each specified lease we prepare the JSON object
$.each(leases,function(){
- var lease_str = $(this).val().split(",");
+ var lease_str = $(dialog).val().split(",");
if (lease_str[1])
leases_obj.push({"ip": lease_str[0],
"mac": lease_str[1]});
@@ -983,11 +1172,11 @@ function setupCreateVNetDialog() {
}
else { //type ranged
- var network_addr = $('#net_address',this).val();
- var network_mask = $('#net_mask',this).val();
- var custom = $('#custom_pool',this).is(':checked');
- var ip_start = $('#ip_start',this).val();
- var ip_end = $('#ip_end',this).val();
+ var network_addr = $('#net_address',dialog).val();
+ var network_mask = $('#net_mask',dialog).val();
+ var custom = $('#custom_pool',dialog).is(':checked');
+ var ip_start = $('#ip_start',dialog).val();
+ var ip_end = $('#ip_end',dialog).val();
if (!(ip_start.length && ip_end.length) && !network_addr.length){
notifyError(tr("There are missing network parameters"));
@@ -1010,8 +1199,8 @@ function setupCreateVNetDialog() {
//Time to add custom attributes
$('#custom_var_vnet_box option',$create_vn_dialog).each(function(){
- var attr_name = $(this).attr('name');
- var attr_value = $(this).val();
+ var attr_name = $(dialog).attr('name');
+ var attr_value = $(dialog).val();
network_json[attr_name] = attr_value;
});
@@ -1026,8 +1215,8 @@ function setupCreateVNetDialog() {
return false;
});
- $('#create_vn_form_manual',dialog).submit(function(){
- var template=$('#template',this).val();
+ $('#create_vn_submit_manual',dialog).click(function(){
+ var template=$('#template',dialog).val();
var vnet_json = {vnet: {vnet_raw: template}};
Sunstone.runAction("Network.create",vnet_json);
$create_vn_dialog.trigger("reveal:close")
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index fe9398e869..8a3902cb49 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -66,7 +66,7 @@ var Sunstone = {
SunstoneCfg["tabs"][tab_id] = tab_obj;
if (refresh){
insertTab(tab_id);
- $(document).foundationCustomForms();
+ //$(document).foundationCustomForms();
}
},
@@ -786,16 +786,22 @@ function setupConfirmDialogs(){
//add the HTML with the standard question and buttons.
dialog.html(
- '
');
//prepare the jquery dialog
diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss
index 8fddece7aa..1ca5a0aecd 100644
--- a/src/sunstone/public/sass/app.scss
+++ b/src/sunstone/public/sass/app.scss
@@ -569,4 +569,8 @@ form.creation {
overflow-y: auto;
overflow-x: hidden;
padding: 5px;
+}
+
+#dialog input {
+ margin: 0px;
}
\ No newline at end of file
diff --git a/src/sunstone/public/vendor/4.0/foundation/app.js b/src/sunstone/public/vendor/4.0/foundation/app.js
index f547a68b4b..746ec450c2 100644
--- a/src/sunstone/public/vendor/4.0/foundation/app.js
+++ b/src/sunstone/public/vendor/4.0/foundation/app.js
@@ -10,9 +10,10 @@
$.fn.foundationAccordion ? $doc.foundationAccordion() : null;
$.fn.foundationNavigation ? $doc.foundationNavigation() : null;
$.fn.foundationTopBar ? $doc.foundationTopBar() : null;
- $.fn.foundationCustomForms ? $doc.foundationCustomForms() : null;
+ //$.fn.foundationCustomForms ? $doc.foundationCustomForms() : null;
$.fn.foundationMediaQueryViewer ? $doc.foundationMediaQueryViewer() : null;
- $.fn.foundationTabs ? $doc.foundationTabs({callback : $.foundation.customForms.appendCustomMarkup}) : null;
+ //$.fn.foundationTabs ? $doc.foundationTabs({callback : $.foundation.customForms.appendCustomMarkup}) : null;
+ $.fn.foundationTabs ? $doc.foundationTabs() : null;
$.fn.foundationTooltips ? $doc.foundationTooltips() : null;
$.fn.foundationMagellan ? $doc.foundationMagellan() : null;
$.fn.foundationClearing ? $doc.foundationClearing() : null;