From 43f66174c2ef4b757dc56b1d2a5b8401ed7db0f9 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 7 Nov 2014 13:27:52 +0100 Subject: [PATCH 01/56] bug #3300: Fix oneuser login for ruby 1.8.7 --- src/cli/one_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index cc3eaa22d2..5935c3f1e7 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -411,8 +411,8 @@ EOT def self.get_password print "Password: " system("stty", "-echo") - @@password=gets.chop begin + @@password = STDIN.gets.chop return @@password ensure system("stty", "echo") From d3bd5f7fab520480ee8b64c3c1d5fc3dec688320 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 10 Nov 2014 00:03:59 +0100 Subject: [PATCH 02/56] bug #3321: Update references to EC2_INSTANCE_TYPE --- src/cloud/ec2/etc/templates/m1.small.erb | 2 +- src/cloud/ec2/lib/views/describe_instances.erb | 2 +- src/cloud/ec2/lib/views/run_instances.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cloud/ec2/etc/templates/m1.small.erb b/src/cloud/ec2/etc/templates/m1.small.erb index cbd2622364..382cbbcdba 100644 --- a/src/cloud/ec2/etc/templates/m1.small.erb +++ b/src/cloud/ec2/etc/templates/m1.small.erb @@ -17,7 +17,7 @@ DISK = [ IMAGE_ID = <%= erb_vm_info[:img_id] %> ] NIC=[NETWORK_ID=] IMAGE_ID = <%= erb_vm_info[:ec2_img_id] %> -INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%> +EC2_INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%> <% if erb_vm_info[:user_data] && erb_vm_info[:public_key] %> CONTEXT = [ EC2_USER_DATA="<%= erb_vm_info[:user_data] %>", EC2_PUBLIC_KEY="<%= erb_vm_info[:public_key] %>", EC2_KEYNAME ="<%= erb_vm_info[:key_name] %>" ] diff --git a/src/cloud/ec2/lib/views/describe_instances.erb b/src/cloud/ec2/lib/views/describe_instances.erb index c4a5ebe63d..cb3453fa3b 100644 --- a/src/cloud/ec2/lib/views/describe_instances.erb +++ b/src/cloud/ec2/lib/views/describe_instances.erb @@ -31,7 +31,7 @@ <%= vm['TEMPLATE/CONTEXT/EC2_KEYNAME'] %> <% end %> - <%= vm['USER_TEMPLATE/INSTANCE_TYPE'] %> + <%= vm['USER_TEMPLATE/EC2_INSTANCE_TYPE'] %> <%= render_launch_time(vm) %> default diff --git a/src/cloud/ec2/lib/views/run_instances.erb b/src/cloud/ec2/lib/views/run_instances.erb index 0b4875415d..74ff40b444 100644 --- a/src/cloud/ec2/lib/views/run_instances.erb +++ b/src/cloud/ec2/lib/views/run_instances.erb @@ -24,7 +24,7 @@ <% else %> <%= vm['TEMPLATE/CONTEXT/EC2_KEYNAME'] %> <% end %> - <%= vm['USER_TEMPLATE/INSTANCE_TYPE'] %> + <%= vm['USER_TEMPLATE/EC2_INSTANCE_TYPE'] %> <%= render_launch_time(vm) %> default From 21eb1ed893825c0e3b2cd4c2baa6f75d6a444983 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 12:39:08 +0100 Subject: [PATCH 03/56] bug #3309: OpenNebula.systems support does not work with an empty issue list (cherry picked from commit f495cdf488a9cc5cfb2e717af107fedd1d95146c) --- src/sunstone/routes/support.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 0dc01bb072..0753987ba0 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -122,10 +122,13 @@ get '/support/request' do pending_requests = 0 one_zrequests = { "REQUEST_POOL" => { - "REQUEST" => [] } } + if zrequests.size > 0 + one_zrequests["REQUEST_POOL"]["REQUEST"] = [] + end + zrequests.each { |zrequest| if zrequest.status == "pending" pending_requests += 1 From 25d6aa515f7517dcab792e15c1c655445b9a0d7e Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 12:50:39 +0100 Subject: [PATCH 04/56] bug #3318: Ebtables Vnet driver does not use PHYDEV (cherry picked from commit e141bd27fc148bb1ccec6d24f44925d31d42c813) --- src/sunstone/public/js/plugins/vnets-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index bc21f94f54..2e8ae906f8 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1221,7 +1221,7 @@ function setupCreateVNetDialog() { break; case "ebtables": $('input#bridge,label[for="bridge"]',$create_vn_dialog).show().prop('wizard_field_disabled', false); - $('input#phydev,label[for="phydev"]',$create_vn_dialog).show().prop('wizard_field_disabled', false); + $('input#phydev,label[for="phydev"]',$create_vn_dialog).hide().prop('wizard_field_disabled', true); $('select#vlan,label[for="vlan"]',$create_vn_dialog).show().prop('wizard_field_disabled', false); $('input#vlan_id,label[for="vlan_id"]',$create_vn_dialog).hide().prop('wizard_field_disabled', true); From 4ad51bc8842b73fe9d918e459624922779785bf0 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 15:29:07 +0100 Subject: [PATCH 05/56] bug #3314: Creating a vnet reservation with spaces in the name gives error (cherry picked from commit f9299ea90004190dd98184092976848268563e39) --- src/oca/ruby/opennebula/virtual_network.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oca/ruby/opennebula/virtual_network.rb b/src/oca/ruby/opennebula/virtual_network.rb index e0eb2ab6a2..3b9bc8145e 100644 --- a/src/oca/ruby/opennebula/virtual_network.rb +++ b/src/oca/ruby/opennebula/virtual_network.rb @@ -236,7 +236,7 @@ module OpenNebula return Error.new('ID not defined') if !@pe_id rtmpl = "SIZE = #{rsize}\n" - rtmpl << "NAME = #{rname}\n" if !rname.nil? + rtmpl << "NAME = \"#{rname}\"\n" if !rname.nil? rtmpl << "AR_ID = #{ar_id}\n" if !ar_id.nil? rtmpl << "NETWORK_ID = #{vnet}\n" if !vnet.nil? From cbf503a35616e5b003ed1c1273a86fbe26da68c4 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 15:42:14 +0100 Subject: [PATCH 06/56] bug #3296: VNet wizard for 802.1Q driver always asks for PHYDEV (cherry picked from commit 28714d0ecfcc4cebe627bebd85d167eca6a1c893) --- src/sunstone/public/js/plugins/vnets-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 2e8ae906f8..486c0c4ffa 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1216,7 +1216,7 @@ function setupCreateVNetDialog() { $('select#vlan,label[for="vlan"]',$create_vn_dialog).show().prop('wizard_field_disabled', false); $('input#vlan_id,label[for="vlan_id"]',$create_vn_dialog).show().prop('wizard_field_disabled', false); - $('input#phydev',$create_vn_dialog).attr('required', ''); + $('input#phydev',$create_vn_dialog).removeAttr('required'); $('input#bridge',$create_vn_dialog).removeAttr('required'); break; case "ebtables": From 28960ad2ef31fb770aca42338b670ee59b33dfa2 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 16:07:07 +0100 Subject: [PATCH 07/56] bug #3316: In cloud view the button to create a new VM does not work after creating one VM (cherry picked from commit 34b4d8836d9a20abd0d641d091a3727fc47cfa76) --- .../public/js/plugins/provision-tab.js | 201 +++++------------- 1 file changed, 59 insertions(+), 142 deletions(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 315695c079..a8f9e3489b 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -5873,6 +5873,59 @@ $(document).ready(function(){ // Create VM // + function appendTemplateCard(aData, tableID) { + var data = aData.VMTEMPLATE; + var logo; + + if (data.TEMPLATE.LOGO) { + logo = ''; + } else { + logo = ''+ + ''+ + ''; + } + + var li = $('
  • '+ + '
      '+ + '
    • '+ + data.NAME+ + '
      • '+ + '
    • '+ + logo + + '
      • '+ + '
    • '+ + (data.TEMPLATE.DESCRIPTION || '...')+ + '
      • '+ + '
    '+ + '
    • ').appendTo($("#"+tableID+'_ul')); + + $(".provision-pricing-table", li).data("opennebula", aData); + } + + function initializeTemplateCards(context, tableID) { + // create a thumbs container if it doesn't exist. put it in the dataTables_scrollbody div + if (context.$('tr', {"filter": "applied"} ).length == 0) { + context.html('
    '+ + ''+ + ''+ + ''+ + ''+ + '
    '+ + '
    '+ + ''+ + tr("There are no templates available")+ + ''+ + '
    '); + } else { + $('#'+tableID+'_table').html( + '
      '); + } + + return true; + } + provision_system_templates_datatable = $('#provision_system_templates_table').dataTable({ "iDisplayLength": 6, "sDom" : '<"H">t<"F"lp>', @@ -5886,55 +5939,10 @@ $(document).ready(function(){ { "mDataProp": "VMTEMPLATE.TEMPLATE.SAVED_TEMPLATE_ID", "sDefaultContent" : "-" } ], "fnPreDrawCallback": function (oSettings) { - // create a thumbs container if it doesn't exist. put it in the dataTables_scrollbody div - if (this.$('tr', {"filter": "applied"} ).length == 0) { - this.html('
      '+ - ''+ - ''+ - ''+ - ''+ - '
      '+ - '
      '+ - ''+ - tr("There are no templates available")+ - ''+ - '
      '); - } else { - $("#provision_system_templates_table").html('
        '); - } - - return true; + initializeTemplateCards(this, "provision_system_templates") }, "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { - var data = aData.VMTEMPLATE; - var logo; - - if (data.TEMPLATE.LOGO) { - logo = ''; - } else { - logo = ''+ - ''+ - ''; - } - - var li = $('
      • '+ - '
          '+ - '
        • '+ - data.NAME+ - '
          • '+ - '
        • '+ - logo + - '
          • '+ - '
        • '+ - (data.TEMPLATE.DESCRIPTION || '...')+ - '
          • '+ - '
        '+ - '
        • ').appendTo($("#provision_system_templates_ul")); - - $(".provision-pricing-table", li).data("opennebula", aData); - + appendTemplateCard(aData, "provision_system_templates"); return nRow; } }); @@ -5954,55 +5962,10 @@ $(document).ready(function(){ { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" } ], "fnPreDrawCallback": function (oSettings) { - // create a thumbs container if it doesn't exist. put it in the dataTables_scrollbody div - if (this.$('tr', {"filter": "applied"} ).length == 0) { - this.html('
        '+ - ''+ - ''+ - ''+ - ''+ - '
        '+ - '
        '+ - ''+ - tr("There are no templates available. Please contact your cloud administrator")+ - ''+ - '
        '); - } else { - $("#provision_vdc_templates_table").html('
          '); - } - - return true; + initializeTemplateCards(this, "provision_vdc_templates") }, "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { - var data = aData.VMTEMPLATE; - var logo; - - if (data.TEMPLATE.LOGO) { - logo = ''; - } else { - logo = ''+ - ''+ - ''; - } - - var li = ('
        • '+ - '
            '+ - '
          • '+ - data.NAME+ - '
            • '+ - '
          • '+ - logo + - '
            • '+ - '
          • '+ - (data.TEMPLATE.DESCRIPTION || '...')+ - '
            • '+ - '
          '+ - '
          • ').appendTo($("#provision_vdc_templates_ul")); - - $(".provision-pricing-table", li).data("opennebula", aData); - + appendTemplateCard(aData, "provision_vdc_templates"); return nRow; } }); @@ -6022,56 +5985,10 @@ $(document).ready(function(){ { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" } ], "fnPreDrawCallback": function (oSettings) { - // create a thumbs container if it doesn't exist. put it in the dataTables_scrollbody div - if (this.$('tr', {"filter": "applied"} ).length == 0) { - this.html('
          '+ - ''+ - ''+ - ''+ - ''+ - '
          '+ - '
          '+ - ''+ - tr("There are no templates available. Please contact your cloud administrator")+ - ''+ - '
          '); - } else { - $("#provision_saved_templates_table").html('
            '); - } - - return true; + initializeTemplateCards(this, "provision_saved_templates") }, "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { - var data = aData.VMTEMPLATE; - - var logo; - - if (data.TEMPLATE.LOGO) { - logo = ''; - } else { - logo = ''+ - ''+ - ''; - } - - var li = $('
          • '+ - '
              '+ - '
            • '+ - data.NAME+ - '
              • '+ - '
            • '+ - logo + - '
              • '+ - '
            • '+ - (data.TEMPLATE.DESCRIPTION || '...')+ - '
              • '+ - '
            '+ - '
            • ').appendTo($("#provision_saved_templates_ul")); - - $(".provision-pricing-table", li).data("opennebula", aData); - + appendTemplateCard(aData, "provision_saved_templates"); return nRow; } }); From ecbc6da2b6bdd08d3c53bdbce1b8b147300b8c9c Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 16:44:05 +0100 Subject: [PATCH 08/56] bug #3294: hybrid tab not available in vcenter view in the template creation dialog (cherry picked from commit 667faf9668a741a1ae94af8a185a4124f72234b7) --- src/sunstone/etc/sunstone-views/vcenter.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sunstone/etc/sunstone-views/vcenter.yaml b/src/sunstone/etc/sunstone-views/vcenter.yaml index 207bdb1ef6..90c93f928d 100644 --- a/src/sunstone/etc/sunstone-views/vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter.yaml @@ -33,15 +33,15 @@ tabs: Dashboard.refresh: false Sunstone.toggle_top: false widgets_three_per_row: - - storage - - users - - network +# - storage +# - network widgets_two_per_row: # - user_quotas # - group_quotas widgets_one_per_row: - vms - hosts + - users widgets_one_footer: # - accounting system-tab: @@ -197,6 +197,7 @@ tabs: input_output: true context: true scheduling: true + hybrid: true other: true images-tab: panel_tabs: From 28fc8334397b7a317343ca54b03ccdd4954363d0 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Nov 2014 17:26:06 +0100 Subject: [PATCH 09/56] bug #3282: VM refresh hides the graphs (cherry picked from commit e4d34aa8492e5449045d6ce6b74e96c45aeaddbe) --- src/sunstone/public/js/plugins/vms-tab.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index e363c414a7..2d3ceff0bc 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -237,6 +237,7 @@ var vm_actions = { if (Sunstone.rightInfoVisible(tab)) { // individual view updateVMInfo(request, response); + $(".right-info-tabs > dd.active > a", "#vms-tab").trigger("click"); } // datatable row From 338a09104a07fe909e66a7488dc2cad0e9877ae2 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 12 Nov 2014 11:46:38 +0100 Subject: [PATCH 10/56] bug #3138: Role VMs fails if the role is in pending --- src/sunstone/public/js/plugins/provision-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index a8f9e3489b..737a5c35af 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -4559,7 +4559,7 @@ function setup_info_flow(context) { var role = $(this).closest(".provision_role_ul").data('role'); var vms = [] - if (role.nodes.length > 0) { + if (role.nodes && role.nodes.length > 0) { $.each(role.nodes, function(index, node){ vms.push(node.vm_info); }) From 4fee4df7817d2325f80f753cf3f9a591dd00314f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 12 Nov 2014 12:16:44 +0100 Subject: [PATCH 11/56] bug #3136: Service VMs table refresh does not work --- src/sunstone/public/js/plugins/provision-tab.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 737a5c35af..5aeeb04845 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -4414,7 +4414,7 @@ function generate_provision_templates_list(context, opts) { } function setup_info_flow(context) { - function update_provision_flow_info(flow_id, context) { + function update_provision_flow_info(flow_id, context, role_id) { $(".provision_info_flow_name", context).text(""); $(".provision_info_flow", context).css('visibility', 'hidden'); $(".provision_info_flow_loading", context).fadeIn(); @@ -4531,6 +4531,9 @@ function setup_info_flow(context) { '').appendTo($(".provision_roles_ul", context)); $(".provision_role_ul", li).data("role", role); + if (role_id && role_id == role.name) { + $(".provision_role_vms_button", li).trigger("click"); + } }); } @@ -4557,6 +4560,7 @@ function setup_info_flow(context) { ''); var role = $(this).closest(".provision_role_ul").data('role'); + $(".provision_info_flow", context).data("role_id", role.name); var vms = [] if (role.nodes && role.nodes.length > 0) { @@ -4570,9 +4574,9 @@ function setup_info_flow(context) { { title: role.name + ' ' + tr("VMs"), active: true, - refresh: true, + refresh: false, create: false, - filter: true, + filter: false, data: vms }); }) @@ -4754,7 +4758,8 @@ function setup_info_flow(context) { context.on("click", ".provision_refresh_info", function(){ var flow_id = $(".provision_info_flow", context).attr("flow_id"); - update_provision_flow_info(flow_id, context); + var role_id = $(".provision_info_flow", context).data("role_id"); + update_provision_flow_info(flow_id, context, role_id); //$(".provision_flows_list_refresh_button", $(".provision_flows_list_section")).trigger("click"); return false; }); From d7d7e173aad4f3d4a190c380e8094fa2090c0111 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 12 Nov 2014 12:36:17 +0100 Subject: [PATCH 12/56] bug #3135: Service 'change cardinality' button does not disappear after it's clicked --- src/sunstone/public/js/opennebula.js | 20 +++++++++---------- .../public/js/plugins/provision-tab.js | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 559acfb699..42d4e9b931 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -1779,7 +1779,7 @@ var OpenNebula = { OpenNebula.Role.path); }, "update" : function(params){ - request = OpenNebula.Helper.request(OpenNebula.Role.resource, "update", params.data.id); + var request = OpenNebula.Helper.request(OpenNebula.Role.resource, "update", params.data.id); $.ajax({ url: OpenNebula.Role.path + "/" + params.data.id, @@ -1787,10 +1787,10 @@ var OpenNebula = { dataType: "json", data: JSON.stringify(params.data.extra_param), success: function(response){ - return roleCallback(request, response); + return params.success ? params.success(request, response) : null; }, error: function(response){ - return onError(request, OpenNebula.Error(response)); + return params.error ? params.error(request, OpenNebula.Error(res)) : null; } }); } @@ -1859,8 +1859,8 @@ var OpenNebula = { "path" : 'support/request', "create": function(params){ OpenNebula.Action.create( - params, - OpenNebula.Support.resource, + params, + OpenNebula.Support.resource, OpenNebula.Support.path); }, "update": function(params){ @@ -1875,15 +1875,15 @@ var OpenNebula = { params.cache_name = "REQUEST"; OpenNebula.Helper.clear_cache(params.cache_name); OpenNebula.Action.list( - params, - OpenNebula.Support.resource, + params, + OpenNebula.Support.resource, OpenNebula.Support.path) }, "show" : function(params){ OpenNebula.Action.show( - params, - OpenNebula.Support.resource, - false, + params, + OpenNebula.Support.resource, + false, OpenNebula.Support.path) } } diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 5aeeb04845..bb5b0422ac 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -4663,7 +4663,7 @@ function setup_info_flow(context) { }, success: function(request, response){ OpenNebula.Helper.clear_cache("SERVICE"); - update_provision_flow_info(flow_id, context); + $(".provision_refresh_info", context).trigger("click"); }, error: onError }) From d719a1518a236d8c93796831205d15a5eeca3e93 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 12 Nov 2014 12:41:59 +0100 Subject: [PATCH 13/56] bug #3285: VM/Service Templates are not refreshed --- src/sunstone/public/js/plugins/provision-tab.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index bb5b0422ac..f8f72b9dc1 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -2769,6 +2769,7 @@ function show_provision_group_info_callback(request, response) { } function show_provision_create_vm() { + OpenNebula.Helper.clear_cache("VMTEMPLATE"); update_provision_templates_datatable(provision_system_templates_datatable); provision_system_templates_datatable.fnFilter("^-$", 2, true, false) From ebc431bc91e198d57c2fddbe7f8de66074d9259f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 12 Nov 2014 12:57:20 +0100 Subject: [PATCH 14/56] Bug #3297: Remove debug output (cherry picked from commit 215079a8eacde1d27411bf91fcf0d8b4d469b29d) --- src/cli/one_helper/oneacct_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb index 55187c696d..6b3b0f756e 100644 --- a/src/cli/one_helper/oneacct_helper.rb +++ b/src/cli/one_helper/oneacct_helper.rb @@ -52,7 +52,6 @@ class AcctHelper < OpenNebulaHelper::OneHelper :description => "Group name or id to filter the results", :format => String, :proc => lambda { |o, options| - puts o OpenNebulaHelper.rname_to_id(o, "GROUP") } } From 62d58423b2e903b270c369447e762eb472fa029f Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 12 Nov 2014 13:44:37 +0100 Subject: [PATCH 15/56] bug #3295: install net-ldap < 0.9 with ruby 1.8.7 (cherry picked from commit 1355c28734bcab3d67a70df093bf68473d52c78a) --- share/install_gems/install_gems | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems index da10fb67ed..b42cef33f7 100755 --- a/share/install_gems/install_gems +++ b/share/install_gems/install_gems @@ -12,9 +12,11 @@ end if !defined?(RUBY_VERSION) || RUBY_VERSION < '1.9.0' $nokogiri='nokogiri --version "< 1.6.0"' + LDAP='net-ldap --version "< 0.9"' else $nokogiri='nokogiri' DEFAULT = DEFAULT_PRE + %w{hybrid} + LDAP='net-ldap' end DEFAULT = DEFAULT_PRE if !defined?(DEFAULT) @@ -24,7 +26,7 @@ GROUPS={ :sunstone => ['json', 'rack', 'sinatra', 'thin', 'zendesk_api', SQLITE], :cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb json}, :hybrid => %w{softlayer_api configparser azure}, - :auth_ldap => 'net-ldap', + :auth_ldap => LDAP, :vmware => %w{builder trollop}, :oneflow => %w{sinatra json treetop parse-cron}, :ec2_hybrid => 'aws-sdk --version "= 1.33"', @@ -35,7 +37,7 @@ GROUPS={ PACKAGES=GROUPS.keys GEM_TEST={ - 'net-ldap' => 'net/ldap' + LDAP => 'net/ldap' } DISTRIBUTIONS={ From aa84acd1d14e8358535c1890b52ede17d84abfdf Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 13 Nov 2014 16:45:04 +0100 Subject: [PATCH 16/56] bug #3342: Quotas are not applied to users created through vdcadmin view (cherry picked from commit 7c0e5b3a423850e2d61a37db2c9d2c97a4820775) --- src/sunstone/public/js/plugins/provision-tab.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index f8f72b9dc1..e93b37b738 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -1763,9 +1763,9 @@ var povision_actions = { Sunstone.runAction("Provision.User.set_quota", [response.USER.ID], { "VM" : { "VOLATILE_SIZE":"-1", - "VMS": $("#provision_rvms_quota_input").val()||QUOTA_LIMIT_UNLIMITED, - "MEMORY": $("#provision_memory_quota_input").val()||QUOTA_LIMIT_UNLIMITED, - "CPU": $("#provision_cpu_quota_input").val()||QUOTA_LIMIT_UNLIMITED} + "VMS": $(".provision_rvms_quota_input").val()||QUOTA_LIMIT_UNLIMITED, + "MEMORY": $(".provision_memory_quota_input").val()||QUOTA_LIMIT_UNLIMITED, + "CPU": $(".provision_cpu_quota_input").val()||QUOTA_LIMIT_UNLIMITED} }); }, error: onError From a063c4b3afe281fb684738859715cb61aaef878c Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 13 Nov 2014 17:50:24 +0100 Subject: [PATCH 17/56] Bug #3348: Set hover_delay to 0 (cherry picked from commit 698907822fbd1ea90057669b57e6da1c4068104f) --- .../public/bower_components/foundation/js/foundation.min.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/bower_components/foundation/js/foundation.min.js b/src/sunstone/public/bower_components/foundation/js/foundation.min.js index 9c59e36abc..66c9b6ddf1 100644 --- a/src/sunstone/public/bower_components/foundation/js/foundation.min.js +++ b/src/sunstone/public/bower_components/foundation/js/foundation.min.js @@ -1,4 +1,4 @@ !function(a,b,c,d){"use strict";function e(a){return("string"==typeof a||a instanceof String)&&(a=a.replace(/^['\\/"]+|(;\s?})+|['\\/"]+$/g,"")),a}var f=function(b){for(var c=b.length,d=a("head");c--;)0===d.has("."+b[c]).length&&d.append('')};f(["foundation-mq-small","foundation-mq-medium","foundation-mq-large","foundation-mq-xlarge","foundation-mq-xxlarge","foundation-data-attribute-namespace"]),a(function(){"undefined"!=typeof FastClick&&"undefined"!=typeof c.body&&FastClick.attach(c.body)});var g=function(b,d){if("string"==typeof b){if(d){var e;if(d.jquery){if(e=d[0],!e)return d}else e=d;return a(e.querySelectorAll(b))}return a(c.querySelectorAll(b))}return a(b,d)},h=function(a){var b=[];return a||b.push("data"),this.namespace.length>0&&b.push(this.namespace),b.push(this.name),b.join("-")},i=function(a){for(var b=a.split("-"),c=b.length,d=[];c--;)0!==c?d.push(b[c]):this.namespace.length>0?d.push(this.namespace,b[c]):d.push(b[c]);return d.reverse().join("-")},j=function(b,c){var d=this,e=!g(this).data(this.attr_name(!0));return g(this.scope).is("["+this.attr_name()+"]")?(g(this.scope).data(this.attr_name(!0)+"-init",a.extend({},this.settings,c||b,this.data_options(g(this.scope)))),e&&this.events(this.scope)):g("["+this.attr_name()+"]",this.scope).each(function(){var e=!g(this).data(d.attr_name(!0)+"-init");g(this).data(d.attr_name(!0)+"-init",a.extend({},d.settings,c||b,d.data_options(g(this)))),e&&d.events(this)}),"string"==typeof b?this[b].call(this,c):void 0},k=function(a,b){function c(){b(a[0])}function d(){if(this.one("load",c),/MSIE (\d+\.\d+);/.test(navigator.userAgent)){var a=this.attr("src"),b=a.match(/\?/)?"&":"?";b+="random="+(new Date).getTime(),this.attr("src",a+b)}}return a.attr("src")?void(a[0].complete||4===a[0].readyState?c():d.call(a)):void c()};b.matchMedia=b.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='­',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(c),function(){function a(){c&&(f(a),h&&jQuery.fx.tick())}for(var c,d=0,e=["webkit","moz"],f=b.requestAnimationFrame,g=b.cancelAnimationFrame,h="undefined"!=typeof jQuery.fx;d").appendTo("head")[0].sheet,global:{namespace:d},init:function(a,c,d,e,f){var h=[a,d,e,f],i=[];if(this.rtl=/rtl/i.test(g("html").attr("dir")),this.scope=a||this.scope,this.set_namespace(),c&&"string"==typeof c&&!/reflow/i.test(c))this.libs.hasOwnProperty(c)&&i.push(this.init_lib(c,h));else for(var j in this.libs)i.push(this.init_lib(j,c));return g(b).load(function(){g(b).trigger("resize.fndtn.clearing").trigger("resize.fndtn.dropdown").trigger("resize.fndtn.equalizer").trigger("resize.fndtn.interchange").trigger("resize.fndtn.joyride").trigger("resize.fndtn.magellan").trigger("resize.fndtn.topbar").trigger("resize.fndtn.slider")}),a},init_lib:function(b,c){return this.libs.hasOwnProperty(b)?(this.patch(this.libs[b]),c&&c.hasOwnProperty(b)?("undefined"!=typeof this.libs[b].settings?a.extend(!0,this.libs[b].settings,c[b]):"undefined"!=typeof this.libs[b].defaults&&a.extend(!0,this.libs[b].defaults,c[b]),this.libs[b].init.apply(this.libs[b],[this.scope,c[b]])):(c=c instanceof Array?c:new Array(c),this.libs[b].init.apply(this.libs[b],c))):function(){}},patch:function(a){a.scope=this.scope,a.namespace=this.global.namespace,a.rtl=this.rtl,a.data_options=this.utils.data_options,a.attr_name=h,a.add_namespace=i,a.bindings=j,a.S=this.utils.S},inherit:function(a,b){for(var c=b.split(" "),d=c.length;d--;)this.utils.hasOwnProperty(c[d])&&(a[c[d]]=this.utils[c[d]])},set_namespace:function(){var b=this.global.namespace===d?a(".foundation-data-attribute-namespace").css("font-family"):this.global.namespace;this.global.namespace=b===d||/false/i.test(b)?"":b},libs:{},utils:{S:g,throttle:function(a,b){var c=null;return function(){var d=this,e=arguments;null==c&&(c=setTimeout(function(){a.apply(d,e),c=null},b))}},debounce:function(a,b,c){var d,e;return function(){var f=this,g=arguments,h=function(){d=null,c||(e=a.apply(f,g))},i=c&&!d;return clearTimeout(d),d=setTimeout(h,b),i&&(e=a.apply(f,g)),e}},data_options:function(b,c){function d(a){return!isNaN(a-0)&&null!==a&&""!==a&&a!==!1&&a!==!0}function e(b){return"string"==typeof b?a.trim(b):b}c=c||"options";var f,g,h,i={},j=function(a){var b=Foundation.global.namespace;return a.data(b.length>0?b+"-"+c:c)},k=j(b);if("object"==typeof k)return k;for(h=(k||":").split(";"),f=h.length;f--;)g=h[f].split(":"),g=[g[0],g.slice(1).join(":")],/true/i.test(g[1])&&(g[1]=!0),/false/i.test(g[1])&&(g[1]=!1),d(g[1])&&(g[1]=-1===g[1].indexOf(".")?parseInt(g[1],10):parseFloat(g[1])),2===g.length&&g[0].length>0&&(i[e(g[0])]=e(g[1]));return i},register_media:function(b,c){Foundation.media_queries[b]===d&&(a("head").append(''),Foundation.media_queries[b]=e(a("."+c).css("font-family")))},add_custom_rule:function(a,b){if(b===d&&Foundation.stylesheet)Foundation.stylesheet.insertRule(a,Foundation.stylesheet.cssRules.length);else{var c=Foundation.media_queries[b];c!==d&&Foundation.stylesheet.insertRule("@media "+Foundation.media_queries[b]+"{ "+a+" }")}},image_loaded:function(a,b){var c=this,d=a.length;0===d&&b(a),a.each(function(){k(c.S(this),function(){d-=1,0===d&&b(a)})})},random_str:function(){return this.fidx||(this.fidx=0),this.prefix=this.prefix||[this.name||"F",(+new Date).toString(36)].join("-"),this.prefix+(this.fidx++).toString(36)}}},a.fn.foundation=function(){var a=Array.prototype.slice.call(arguments,0);return this.each(function(){return Foundation.init.apply(Foundation,[this].concat(a)),this})}}(jQuery,window,window.document),function(a,b,c){"use strict";Foundation.libs.abide={name:"abide",version:"5.4.6",settings:{live_validate:!0,focus_on_invalid:!0,error_labels:!0,timeout:1e3,patterns:{alpha:/^[a-zA-Z]+$/,alpha_numeric:/^[a-zA-Z0-9]+$/,integer:/^[-+]?\d+$/,number:/^[-+]?\d*(?:[\.\,]\d+)?$/,card:/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$/,cvv:/^([0-9]){3,4}$/,email:/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/,url:/^(https?|ftp|file|ssh):\/\/(((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/,domain:/^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$/,datetime:/^([0-2][0-9]{3})\-([0-1][0-9])\-([0-3][0-9])T([0-5][0-9])\:([0-5][0-9])\:([0-5][0-9])(Z|([\-\+]([0-1][0-9])\:00))$/,date:/(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))$/,time:/^(0[0-9]|1[0-9]|2[0-3])(:[0-5][0-9]){2}$/,dateISO:/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/,month_day_year:/^(0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])[- \/.]\d{4}$/,day_month_year:/^(0[1-9]|[12][0-9]|3[01])[- \/.](0[1-9]|1[012])[- \/.]\d{4}$/,color:/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/},validators:{equalTo:function(a){var b=c.getElementById(a.getAttribute(this.add_namespace("data-equalto"))).value,d=a.value,e=b===d;return e}}},timer:null,init:function(a,b,c){this.bindings(b,c)},events:function(b){var c=this,d=c.S(b).attr("novalidate","novalidate"),e=d.data(this.attr_name(!0)+"-init")||{};this.invalid_attr=this.add_namespace("data-invalid"),d.off(".abide").on("submit.fndtn.abide validate.fndtn.abide",function(a){var b=/ajax/i.test(c.S(this).attr(c.attr_name()));return c.validate(c.S(this).find("input, textarea, select").get(),a,b)}).on("reset",function(){return c.reset(a(this))}).find("input, textarea, select").off(".abide").on("blur.fndtn.abide change.fndtn.abide",function(a){c.validate([this],a)}).on("keydown.fndtn.abide",function(a){e.live_validate===!0&&(clearTimeout(c.timer),c.timer=setTimeout(function(){c.validate([this],a)}.bind(this),e.timeout))})},reset:function(b){b.removeAttr(this.invalid_attr),a(this.invalid_attr,b).removeAttr(this.invalid_attr),a(".error",b).not("small").removeClass("error")},validate:function(a,b,c){for(var d=this.parse_patterns(a),e=d.length,f=this.S(a[0]).closest("form"),g=/submit/.test(b.type),h=0;e>h;h++)if(!d[h]&&(g||c))return this.settings.focus_on_invalid&&a[h].focus(),f.trigger("invalid"),this.S(a[h]).closest("form").attr(this.invalid_attr,""),!1;return(g||c)&&f.trigger("valid"),f.removeAttr(this.invalid_attr),c?!1:!0},parse_patterns:function(a){for(var b=a.length,c=[];b--;)c.push(this.pattern(a[b]));return this.check_validation_and_apply_styles(c)},pattern:function(a){var b=a.getAttribute("type"),c="string"==typeof a.getAttribute("required"),d=a.getAttribute("pattern")||"";return this.settings.patterns.hasOwnProperty(d)&&d.length>0?[a,this.settings.patterns[d],c]:d.length>0?[a,new RegExp(d),c]:this.settings.patterns.hasOwnProperty(b)?[a,this.settings.patterns[b],c]:(d=/.*/,[a,d,c])},check_validation_and_apply_styles:function(b){var c=b.length,d=[],e=this.S(b[0][0]).closest("[data-"+this.attr_name(!0)+"]");for(e.data(this.attr_name(!0)+"-init")||{};c--;){var f,g,h=b[c][0],i=b[c][2],j=h.value.trim(),k=this.S(h).parent(),l=h.getAttribute(this.add_namespace("data-abide-validator")),m="radio"===h.type,n="checkbox"===h.type,o=this.S('label[for="'+h.getAttribute("id")+'"]'),p=i?h.value.length>0:!0,q=[];if(h.getAttribute(this.add_namespace("data-equalto"))&&(l="equalTo"),f=k.is("label")?k.parent():k,l&&(g=this.settings.validators[l].apply(this,[h,i,f]),q.push(g)),m&&i)q.push(this.valid_radio(h,i));else if(n&&i)q.push(this.valid_checkbox(h,i));else if(q.push(b[c][1].test(j)&&p||!i&&h.value.length<1||a(h).attr("disabled")?!0:!1),q=[q.every(function(a){return a})],q[0])this.S(h).removeAttr(this.invalid_attr),h.setAttribute("aria-invalid","false"),h.removeAttribute("aria-describedby"),f.removeClass("error"),o.length>0&&this.settings.error_labels&&o.removeClass("error").removeAttr("role"),a(h).triggerHandler("valid");else{this.S(h).attr(this.invalid_attr,""),h.setAttribute("aria-invalid","true");var r=f.find("small.error, span.error"),s=r.length>0?r[0].id:"";s.length>0&&h.setAttribute("aria-describedby",s),f.addClass("error"),o.length>0&&this.settings.error_labels&&o.addClass("error").attr("role","alert"),a(h).triggerHandler("invalid")}d.push(q[0])}return d=[d.every(function(a){return a})]},valid_checkbox:function(a,b){var a=this.S(a),c=a.is(":checked")||!b;return c?a.removeAttr(this.invalid_attr).parent().removeClass("error"):a.attr(this.invalid_attr,"").parent().addClass("error"),c},valid_radio:function(a){for(var b=a.getAttribute("name"),c=this.S(a).closest("[data-"+this.attr_name(!0)+"]").find("[name='"+b+"']"),d=c.length,e=!1,f=0;d>f;f++)c[f].checked&&(e=!0);for(var f=0;d>f;f++)e?this.S(c[f]).removeAttr(this.invalid_attr).parent().removeClass("error"):this.S(c[f]).attr(this.invalid_attr,"").parent().addClass("error");return e},valid_equal:function(a,b,d){var e=c.getElementById(a.getAttribute(this.add_namespace("data-equalto"))).value,f=a.value,g=e===f;return g?(this.S(a).removeAttr(this.invalid_attr),d.removeClass("error"),label.length>0&&settings.error_labels&&label.removeClass("error")):(this.S(a).attr(this.invalid_attr,""),d.addClass("error"),label.length>0&&settings.error_labels&&label.addClass("error")),g},valid_oneof:function(a,b,c,d){var a=this.S(a),e=this.S("["+this.add_namespace("data-oneof")+"]"),f=e.filter(":checked").length>0;if(f?a.removeAttr(this.invalid_attr).parent().removeClass("error"):a.attr(this.invalid_attr,"").parent().addClass("error"),!d){var g=this;e.each(function(){g.valid_oneof.call(g,this,null,null,!0)})}return f}}}(jQuery,window,window.document),function(a){"use strict";Foundation.libs.accordion={name:"accordion",version:"5.4.6",settings:{active_class:"active",multi_expand:!1,toggleable:!0,callback:function(){}},init:function(a,b,c){this.bindings(b,c)},events:function(){var b=this,c=this.S;c(this.scope).off(".fndtn.accordion").on("click.fndtn.accordion","["+this.attr_name()+"] > dd > a",function(d){var e=c(this).closest("["+b.attr_name()+"]"),f=b.attr_name()+"="+e.attr(b.attr_name()),g=e.data(b.attr_name(!0)+"-init"),h=c("#"+this.href.split("#")[1]),i=a("> dd",e),j=i.children(".content"),k=j.filter("."+g.active_class);return d.preventDefault(),e.attr(b.attr_name())&&(j=j.add("["+f+"] dd > .content"),i=i.add("["+f+"] dd")),g.toggleable&&h.is(k)?(h.parent("dd").toggleClass(g.active_class,!1),h.toggleClass(g.active_class,!1),g.callback(h),h.triggerHandler("toggled",[e]),void e.triggerHandler("toggled",[h])):(g.multi_expand||(j.removeClass(g.active_class),i.removeClass(g.active_class)),h.addClass(g.active_class).parent().addClass(g.active_class),g.callback(h),h.triggerHandler("toggled",[e]),void e.triggerHandler("toggled",[h]))})},off:function(){},reflow:function(){}}}(jQuery,window,window.document),function(a){"use strict";Foundation.libs.alert={name:"alert",version:"5.4.6",settings:{callback:function(){}},init:function(a,b,c){this.bindings(b,c)},events:function(){var b=this,c=this.S;a(this.scope).off(".alert").on("click.fndtn.alert","["+this.attr_name()+"] .close",function(a){var d=c(this).closest("["+b.attr_name()+"]"),e=d.data(b.attr_name(!0)+"-init")||b.settings;a.preventDefault(),Modernizr.csstransitions?(d.addClass("alert-close"),d.on("transitionend webkitTransitionEnd oTransitionEnd",function(){c(this).trigger("close").trigger("close.fndtn.alert").remove(),e.callback()})):d.fadeOut(300,function(){c(this).trigger("close").trigger("close.fndtn.alert").remove(),e.callback()})})},reflow:function(){}}}(jQuery,window,window.document),function(a,b,c,d){"use strict";Foundation.libs.clearing={name:"clearing",version:"5.4.6",settings:{templates:{viewing:'×'},close_selectors:".clearing-close, div.clearing-blackout",open_selectors:"",skip_selector:"",touch_label:"",init:!1,locked:!1},init:function(a,b,c){var d=this;Foundation.inherit(this,"throttle image_loaded"),this.bindings(b,c),d.S(this.scope).is("["+this.attr_name()+"]")?this.assemble(d.S("li",this.scope)):d.S("["+this.attr_name()+"]",this.scope).each(function(){d.assemble(d.S("li",this))})},events:function(d){var e=this,f=e.S,g=a(".scroll-container");g.length>0&&(this.scope=g),f(this.scope).off(".clearing").on("click.fndtn.clearing","ul["+this.attr_name()+"] li "+this.settings.open_selectors,function(a,b,c){var b=b||f(this),c=c||b,d=b.next("li"),g=b.closest("["+e.attr_name()+"]").data(e.attr_name(!0)+"-init"),h=f(a.target);a.preventDefault(),g||(e.init(),g=b.closest("["+e.attr_name()+"]").data(e.attr_name(!0)+"-init")),c.hasClass("visible")&&b[0]===c[0]&&d.length>0&&e.is_open(b)&&(c=d,h=f("img",c)),e.open(h,b,c),e.update_paddles(c)}).on("click.fndtn.clearing",".clearing-main-next",function(a){e.nav(a,"next")}).on("click.fndtn.clearing",".clearing-main-prev",function(a){e.nav(a,"prev")}).on("click.fndtn.clearing",this.settings.close_selectors,function(a){Foundation.libs.clearing.close(a,this)}),a(c).on("keydown.fndtn.clearing",function(a){e.keydown(a)}),f(b).off(".clearing").on("resize.fndtn.clearing",function(){e.resize()}),this.swipe_events(d)},swipe_events:function(){var a=this,b=a.S;b(this.scope).on("touchstart.fndtn.clearing",".visible-img",function(a){a.touches||(a=a.originalEvent);var c={start_page_x:a.touches[0].pageX,start_page_y:a.touches[0].pageY,start_time:(new Date).getTime(),delta_x:0,is_scrolling:d};b(this).data("swipe-transition",c),a.stopPropagation()}).on("touchmove.fndtn.clearing",".visible-img",function(c){if(c.touches||(c=c.originalEvent),!(c.touches.length>1||c.scale&&1!==c.scale)){var d=b(this).data("swipe-transition");if("undefined"==typeof d&&(d={}),d.delta_x=c.touches[0].pageX-d.start_page_x,Foundation.rtl&&(d.delta_x=-d.delta_x),"undefined"==typeof d.is_scrolling&&(d.is_scrolling=!!(d.is_scrolling||Math.abs(d.delta_x)');var d=c.detach(),e="";if(null!=d[0]){e=d[0].outerHTML;var f=this.S("#foundationClearingHolder"),g=c.data(this.attr_name(!0)+"-init"),h={grid:'
            '+e+"
            ",viewing:g.templates.viewing},i='
            '+h.viewing+h.grid+"
            ",j=this.settings.touch_label;Modernizr.touch&&(i=a(i).find(".clearing-touch-label").html(j).end()),f.after(i).remove()}}},open:function(b,d,e){function f(){setTimeout(function(){this.image_loaded(m,function(){1!==m.outerWidth()||o?g.call(this,m):f.call(this)}.bind(this))}.bind(this),100)}function g(b){var c=a(b);c.css("visibility","visible"),i.css("overflow","hidden"),j.addClass("clearing-blackout"),k.addClass("clearing-container"),l.show(),this.fix_height(e).caption(h.S(".clearing-caption",l),h.S("img",e)).center_and_label(b,n).shift(d,e,function(){e.closest("li").siblings().removeClass("visible"),e.closest("li").addClass("visible")}),l.trigger("opened.fndtn.clearing")}var h=this,i=a(c.body),j=e.closest(".clearing-assembled"),k=h.S("div",j).first(),l=h.S(".visible-img",k),m=h.S("img",l).not(b),n=h.S(".clearing-touch-label",k),o=!1;a("body").on("touchmove",function(a){a.preventDefault()}),m.error(function(){o=!0}),this.locked()||(l.trigger("open.fndtn.clearing"),m.attr("src",this.load(b)).css("visibility","hidden"),f.call(this))},close:function(b,d){b.preventDefault();var e,f,g=function(a){return/blackout/.test(a.selector)?a:a.closest(".clearing-blackout")}(a(d)),h=a(c.body);return d===b.target&&g&&(h.css("overflow",""),e=a("div",g).first(),f=a(".visible-img",e),f.trigger("close.fndtn.clearing"),this.settings.prev_index=0,a("ul["+this.attr_name()+"]",g).attr("style","").closest(".clearing-blackout").removeClass("clearing-blackout"),e.removeClass("clearing-container"),f.hide(),f.trigger("closed.fndtn.clearing")),a("body").off("touchmove"),!1},is_open:function(a){return a.parent().prop("style").length>0},keydown:function(b){var c=a(".clearing-blackout ul["+this.attr_name()+"]"),d=this.rtl?37:39,e=this.rtl?39:37,f=27;b.which===d&&this.go(c,"next"),b.which===e&&this.go(c,"prev"),b.which===f&&this.S("a.clearing-close").trigger("click").trigger("click.fndtn.clearing")},nav:function(b,c){var d=a("ul["+this.attr_name()+"]",".clearing-blackout");b.preventDefault(),this.go(d,c)},resize:function(){var b=a("img",".clearing-blackout .visible-img"),c=a(".clearing-touch-label",".clearing-blackout");b.length&&(this.center_and_label(b,c),b.trigger("resized.fndtn.clearing"))},fix_height:function(a){var b=a.parent().children(),c=this;return b.each(function(){var a=c.S(this),b=a.find("img");a.height()>b.outerHeight()&&a.addClass("fix-height")}).closest("ul").width(100*b.length+"%"),this},update_paddles:function(a){a=a.closest("li");var b=a.closest(".carousel").siblings(".visible-img");a.next().length>0?this.S(".clearing-main-next",b).removeClass("disabled"):this.S(".clearing-main-next",b).addClass("disabled"),a.prev().length>0?this.S(".clearing-main-prev",b).removeClass("disabled"):this.S(".clearing-main-prev",b).addClass("disabled")},center_and_label:function(a,b){return this.rtl?(a.css({marginRight:-(a.outerWidth()/2),marginTop:-(a.outerHeight()/2),left:"auto",right:"50%"}),b.length>0&&b.css({marginRight:-(b.outerWidth()/2),marginTop:-(a.outerHeight()/2)-b.outerHeight()-10,left:"auto",right:"50%"})):(a.css({marginLeft:-(a.outerWidth()/2),marginTop:-(a.outerHeight()/2)}),b.length>0&&b.css({marginLeft:-(b.outerWidth()/2),marginTop:-(a.outerHeight()/2)-b.outerHeight()-10})),this},load:function(a){var b;return b="A"===a[0].nodeName?a.attr("href"):a.parent().attr("href"),this.preload(a),b?b:a.attr("src")},preload:function(a){this.img(a.closest("li").next()).img(a.closest("li").prev())},img:function(a){if(a.length){var b=new Image,c=this.S("a",a);b.src=c.length?c.attr("href"):this.S("img",a).attr("src")}return this},caption:function(a,b){var c=b.attr("data-caption");return c?a.html(c).show():a.text("").hide(),this},go:function(a,b){var c=this.S(".visible",a),d=c[b]();this.settings.skip_selector&&0!=d.find(this.settings.skip_selector).length&&(d=d[b]()),d.length&&this.S("img",d).trigger("click",[c,d]).trigger("click.fndtn.clearing",[c,d]).trigger("change.fndtn.clearing")},shift:function(a,b,c){var d,e=b.parent(),f=this.settings.prev_index||b.index(),g=this.direction(e,a,b),h=this.rtl?"right":"left",i=parseInt(e.css("left"),10),j=b.outerWidth(),k={};b.index()===f||/skip/.test(g)?/skip/.test(g)&&(d=b.index()-this.settings.up_count,this.lock(),d>0?(k[h]=-(d*j),e.animate(k,300,this.unlock())):(k[h]=0,e.animate(k,300,this.unlock()))):/left/.test(g)?(this.lock(),k[h]=i+j,e.animate(k,300,this.unlock())):/right/.test(g)&&(this.lock(),k[h]=i-j,e.animate(k,300,this.unlock())),c()},direction:function(a,b,c){var d,e=this.S("li",a),f=e.outerWidth()+e.outerWidth()/4,g=Math.floor(this.S(".clearing-container").outerWidth()/f)-1,h=e.index(c);return this.settings.up_count=g,d=this.adjacent(this.settings.prev_index,h)?h>g&&h>this.settings.prev_index?"right":h>g-1&&h<=this.settings.prev_index?"left":!1:"skip",this.settings.prev_index=h,d},adjacent:function(a,b){for(var c=b+1;c>=b-1;c--)if(c===a)return!0;return!1},lock:function(){this.settings.locked=!0},unlock:function(){this.settings.locked=!1},locked:function(){return this.settings.locked},off:function(){this.S(this.scope).off(".fndtn.clearing"),this.S(b).off(".fndtn.clearing")},reflow:function(){this.init()}}}(jQuery,window,window.document),function(a,b){"use strict";Foundation.libs.dropdown={name:"dropdown",version:"5.4.6",settings:{active_class:"open",disabled_class:"disabled",mega_class:"mega",align:"bottom",is_hover:!1,opened:function(){},closed:function(){}},init:function(a,b,c){Foundation.inherit(this,"throttle"),this.bindings(b,c)},events:function(){var c=this,d=c.S;d(this.scope).off(".dropdown").on("click.fndtn.dropdown","["+this.attr_name()+"]",function(b){var e=d(this).data(c.attr_name(!0)+"-init")||c.settings;(!e.is_hover||Modernizr.touch)&&(b.preventDefault(),c.toggle(a(this)))}).on("mouseenter.fndtn.dropdown","["+this.attr_name()+"], ["+this.attr_name()+"-content]",function(a){var b,e,f=d(this);clearTimeout(c.timeout),f.data(c.data_attr())?(b=d("#"+f.data(c.data_attr())),e=f):(b=f,e=d("["+c.attr_name()+"='"+b.attr("id")+"']"));var g=e.data(c.attr_name(!0)+"-init")||c.settings;d(a.target).data(c.data_attr())&&g.is_hover&&c.closeall.call(c),g.is_hover&&c.open.apply(c,[b,e])}).on("mouseleave.fndtn.dropdown","["+this.attr_name()+"], ["+this.attr_name()+"-content]",function(){var a=d(this);c.timeout=setTimeout(function(){if(a.data(c.data_attr())){var b=a.data(c.data_attr(!0)+"-init")||c.settings;b.is_hover&&c.close.call(c,d("#"+a.data(c.data_attr())))}else{var e=d("["+c.attr_name()+'="'+d(this).attr("id")+'"]'),b=e.data(c.attr_name(!0)+"-init")||c.settings;b.is_hover&&c.close.call(c,a)}}.bind(this),150)}).on("click.fndtn.dropdown",function(b){var e=d(b.target).closest("["+c.attr_name()+"-content]");if(!(d(b.target).closest("["+c.attr_name()+"]").length>0))return!d(b.target).data("revealId")&&e.length>0&&(d(b.target).is("["+c.attr_name()+"-content]")||a.contains(e.first()[0],b.target))?void b.stopPropagation():void c.close.call(c,d("["+c.attr_name()+"-content]"))}).on("opened.fndtn.dropdown","["+c.attr_name()+"-content]",function(){c.settings.opened.call(this)}).on("closed.fndtn.dropdown","["+c.attr_name()+"-content]",function(){c.settings.closed.call(this)}),d(b).off(".dropdown").on("resize.fndtn.dropdown",c.throttle(function(){c.resize.call(c)},50)),this.resize()},close:function(b){var c=this;b.each(function(){var d=a("["+c.attr_name()+"="+b[0].id+"]")||a("aria-controls="+b[0].id+"]");d.attr("aria-expanded","false"),c.S(this).hasClass(c.settings.active_class)&&(c.S(this).css(Foundation.rtl?"right":"left","-99999px").attr("aria-hidden","true").removeClass(c.settings.active_class).prev("["+c.attr_name()+"]").removeClass(c.settings.active_class).removeData("target"),c.S(this).trigger("closed").trigger("closed.fndtn.dropdown",[b]))})},closeall:function(){var b=this;a.each(b.S("["+this.attr_name()+"-content]"),function(){b.close.call(b,b.S(this))})},open:function(a,b){this.css(a.addClass(this.settings.active_class),b),a.prev("["+this.attr_name()+"]").addClass(this.settings.active_class),a.data("target",b.get(0)).trigger("opened").trigger("opened.fndtn.dropdown",[a,b]),a.attr("aria-hidden","false"),b.attr("aria-expanded","true"),a.focus()},data_attr:function(){return this.namespace.length>0?this.namespace+"-"+this.name:this.name},toggle:function(a){if(!a.hasClass(this.settings.disabled_class)){var b=this.S("#"+a.data(this.data_attr()));0!==b.length&&(this.close.call(this,this.S("["+this.attr_name()+"-content]").not(b)),b.hasClass(this.settings.active_class)?(this.close.call(this,b),b.data("target")!==a.get(0)&&this.open.call(this,b,a)):this.open.call(this,b,a))}},resize:function(){var a=this.S("["+this.attr_name()+"-content].open"),b=this.S("["+this.attr_name()+"='"+a.attr("id")+"']");a.length&&b.length&&this.css(a,b)},css:function(a,b){var c=Math.max((b.width()-a.width())/2,8),d=b.data(this.attr_name(!0)+"-init")||this.settings;if(this.clear_idx(),this.small()){var e=this.dirs.bottom.call(a,b,d);a.attr("style","").removeClass("drop-left drop-right drop-top").css({position:"absolute",width:"95%","max-width":"none",top:e.top}),a.css(Foundation.rtl?"right":"left",c)}else this.style(a,b,d);return a},style:function(b,c,d){var e=a.extend({position:"absolute"},this.dirs[d.align].call(b,c,d));b.attr("style","").css(e)},dirs:{_base:function(a){var b=this.offsetParent(),c=b.offset(),d=a.offset();return d.top-=c.top,d.left-=c.left,d},top:function(a,b){var c=Foundation.libs.dropdown,d=c.dirs._base.call(this,a);return this.addClass("drop-top"),(a.outerWidth()0)for(var d=this.S("["+this.add_namespace("data-uuid")+'="'+a+'"]');c--;){var e,f=b[c][2];if(e=matchMedia(this.settings.named_queries.hasOwnProperty(f)?this.settings.named_queries[f]:f),e.matches)return{el:d,scenario:b[c]}}return!1},load:function(a,b){return("undefined"==typeof this["cached_"+a]||b)&&this["update_"+a](),this["cached_"+a]},update_images:function(){var a=this.S("img["+this.data_attr+"]"),b=a.length,c=b,d=0,e=this.data_attr;for(this.cache={},this.cached_images=[],this.images_loaded=0===b;c--;){if(d++,a[c]){var f=a[c].getAttribute(e)||"";f.length>0&&this.cached_images.push(a[c])}d===b&&(this.images_loaded=!0,this.enhance("images"))}return this},update_nodes:function(){var a=this.S("["+this.data_attr+"]").not("img"),b=a.length,c=b,d=0,e=this.data_attr;for(this.cached_nodes=[],this.nodes_loaded=0===b;c--;){d++;var f=a[c].getAttribute(e)||"";f.length>0&&this.cached_nodes.push(a[c]),d===b&&(this.nodes_loaded=!0,this.enhance("nodes"))}return this},enhance:function(c){for(var d=this["cached_"+c].length;d--;)this.object(a(this["cached_"+c][d]));return a(b).trigger("resize").trigger("resize.fndtn.interchange")},convert_directive:function(a){var b=this.trim(a);return b.length>0?b:"replace"},parse_scenario:function(a){var b=a[0].match(/(.+),\s*(\w+)\s*$/),c=a[1];if(b)var d=b[1],e=b[2];else var f=a[0].split(/,\s*$/),d=f[0],e="";return[this.trim(d),this.convert_directive(e),this.trim(c)]},object:function(a){var b=this.parse_data_attr(a),c=[],d=b.length;if(d>0)for(;d--;){var e=b[d].split(/\((.*?)(\))$/);if(e.length>1){var f=this.parse_scenario(e);c.push(f)}}return this.store(a,c)},store:function(a,b){var c=this.random_str(),d=a.data(this.add_namespace("uuid",!0));return this.cache[d]?this.cache[d]:(a.attr(this.add_namespace("data-uuid"),c),this.cache[c]=b)},trim:function(b){return"string"==typeof b?a.trim(b):b},set_data_attr:function(a){return a?this.namespace.length>0?this.namespace+"-"+this.settings.load_attr:this.settings.load_attr:this.namespace.length>0?"data-"+this.namespace+"-"+this.settings.load_attr:"data-"+this.settings.load_attr},parse_data_attr:function(a){for(var b=a.attr(this.attr_name()).split(/\[(.*?)\]/),c=b.length,d=[];c--;)b[c].replace(/[\W\d]+/,"").length>4&&d.push(b[c]);return d},reflow:function(){this.load("images",!0),this.load("nodes",!0)}}}(jQuery,window,window.document),function(a,b,c,d){"use strict";Foundation.libs.joyride={name:"joyride",version:"5.4.6",defaults:{expose:!1,modal:!0,keyboard:!0,tip_location:"bottom",nub_position:"auto",scroll_speed:1500,scroll_animation:"linear",timer:0,start_timer_on_click:!0,start_offset:0,next_button:!0,prev_button:!0,tip_animation:"fade",pause_after:[],exposed:[],tip_animation_fade_speed:300,cookie_monster:!1,cookie_name:"joyride",cookie_domain:!1,cookie_expires:365,tip_container:"body",abort_on_close:!0,tip_location_patterns:{top:["bottom"],bottom:[],left:["right","top","bottom"],right:["left","top","bottom"]},post_ride_callback:function(){},post_step_callback:function(){},pre_step_callback:function(){},pre_ride_callback:function(){},post_expose_callback:function(){},template:{link:'×',timer:'
            ',tip:'
            ',wrapper:'
            ',button:'',prev_button:'',modal:'
            ',expose:'
            ',expose_cover:'
            '},expose_add_class:""},init:function(b,c,d){Foundation.inherit(this,"throttle random_str"),this.settings=this.settings||a.extend({},this.defaults,d||c),this.bindings(c,d)},go_next:function(){this.settings.$li.next().length<1?this.end():this.settings.timer>0?(clearTimeout(this.settings.automate),this.hide(),this.show(),this.startTimer()):(this.hide(),this.show())},go_prev:function(){this.settings.$li.prev().length<1||(this.settings.timer>0?(clearTimeout(this.settings.automate),this.hide(),this.show(null,!0),this.startTimer()):(this.hide(),this.show(null,!0)))},events:function(){var c=this;a(this.scope).off(".joyride").on("click.fndtn.joyride",".joyride-next-tip, .joyride-modal-bg",function(a){a.preventDefault(),this.go_next()}.bind(this)).on("click.fndtn.joyride",".joyride-prev-tip",function(a){a.preventDefault(),this.go_prev()}.bind(this)).on("click.fndtn.joyride",".joyride-close-tip",function(a){a.preventDefault(),this.end(this.settings.abort_on_close)}.bind(this)).on("keyup.fndtn.joyride",function(a){if(this.settings.keyboard&&this.settings.riding)switch(a.which){case 39:a.preventDefault(),this.go_next();break;case 37:a.preventDefault(),this.go_prev();break;case 27:a.preventDefault(),this.end(this.settings.abort_on_close)}}.bind(this)),a(b).off(".joyride").on("resize.fndtn.joyride",c.throttle(function(){if(a("["+c.attr_name()+"]").length>0&&c.settings.$next_tip&&c.settings.riding){if(c.settings.exposed.length>0){var b=a(c.settings.exposed);b.each(function(){var b=a(this);c.un_expose(b),c.expose(b)})}c.is_phone()?c.pos_phone():c.pos_default(!1)}},100))},start:function(){var b=this,c=a("["+this.attr_name()+"]",this.scope),d=["timer","scrollSpeed","startOffset","tipAnimationFadeSpeed","cookieExpires"],e=d.length;!c.length>0||(this.settings.init||this.events(),this.settings=c.data(this.attr_name(!0)+"-init"),this.settings.$content_el=c,this.settings.$body=a(this.settings.tip_container),this.settings.body_offset=a(this.settings.tip_container).position(),this.settings.$tip_content=this.settings.$content_el.find("> li"),this.settings.paused=!1,this.settings.attempts=0,this.settings.riding=!0,"function"!=typeof a.cookie&&(this.settings.cookie_monster=!1),(!this.settings.cookie_monster||this.settings.cookie_monster&&!a.cookie(this.settings.cookie_name))&&(this.settings.$tip_content.each(function(c){var f=a(this);this.settings=a.extend({},b.defaults,b.data_options(f));for(var g=e;g--;)b.settings[d[g]]=parseInt(b.settings[d[g]],10);b.create({$li:f,index:c})}),!this.settings.start_timer_on_click&&this.settings.timer>0?(this.show("init"),this.startTimer()):this.show("init")))},resume:function(){this.set_li(),this.show()},tip_template:function(b){var c,d;return b.tip_class=b.tip_class||"",c=a(this.settings.template.tip).addClass(b.tip_class),d=a.trim(a(b.li).html())+this.prev_button_text(b.prev_button_text,b.index)+this.button_text(b.button_text)+this.settings.template.link+this.timer_instance(b.index),c.append(a(this.settings.template.wrapper)),c.first().attr(this.add_namespace("data-index"),b.index),a(".joyride-content-wrapper",c).append(d),c[0]},timer_instance:function(b){var c;return c=0===b&&this.settings.start_timer_on_click&&this.settings.timer>0||0===this.settings.timer?"":a(this.settings.template.timer)[0].outerHTML},button_text:function(b){return this.settings.tip_settings.next_button?(b=a.trim(b)||"Next",b=a(this.settings.template.button).append(b)[0].outerHTML):b="",b},prev_button_text:function(b,c){return this.settings.tip_settings.prev_button?(b=a.trim(b)||"Previous",b=0==c?a(this.settings.template.prev_button).append(b).addClass("disabled")[0].outerHTML:a(this.settings.template.prev_button).append(b)[0].outerHTML):b="",b},create:function(b){this.settings.tip_settings=a.extend({},this.settings,this.data_options(b.$li));var c=b.$li.attr(this.add_namespace("data-button"))||b.$li.attr(this.add_namespace("data-text")),d=b.$li.attr(this.add_namespace("data-button-prev"))||b.$li.attr(this.add_namespace("data-prev-text")),e=b.$li.attr("class"),f=a(this.tip_template({tip_class:e,index:b.index,button_text:c,prev_button_text:d,li:b.$li}));a(this.settings.tip_container).append(f)},show:function(b,c){var e=null;this.settings.$li===d||-1===a.inArray(this.settings.$li.index(),this.settings.pause_after)?(this.settings.paused?this.settings.paused=!1:this.set_li(b,c),this.settings.attempts=0,this.settings.$li.length&&this.settings.$target.length>0?(b&&(this.settings.pre_ride_callback(this.settings.$li.index(),this.settings.$next_tip),this.settings.modal&&this.show_modal()),this.settings.pre_step_callback(this.settings.$li.index(),this.settings.$next_tip),this.settings.modal&&this.settings.expose&&this.expose(),this.settings.tip_settings=a.extend({},this.settings,this.data_options(this.settings.$li)),this.settings.timer=parseInt(this.settings.timer,10),this.settings.tip_settings.tip_location_pattern=this.settings.tip_location_patterns[this.settings.tip_settings.tip_location],/body/i.test(this.settings.$target.selector)||this.scroll_to(),this.is_phone()?this.pos_phone(!0):this.pos_default(!0),e=this.settings.$next_tip.find(".joyride-timer-indicator"),/pop/i.test(this.settings.tip_animation)?(e.width(0),this.settings.timer>0?(this.settings.$next_tip.show(),setTimeout(function(){e.animate({width:e.parent().width()},this.settings.timer,"linear")}.bind(this),this.settings.tip_animation_fade_speed)):this.settings.$next_tip.show()):/fade/i.test(this.settings.tip_animation)&&(e.width(0),this.settings.timer>0?(this.settings.$next_tip.fadeIn(this.settings.tip_animation_fade_speed).show(),setTimeout(function(){e.animate({width:e.parent().width()},this.settings.timer,"linear")}.bind(this),this.settings.tip_animation_fade_speed)):this.settings.$next_tip.fadeIn(this.settings.tip_animation_fade_speed)),this.settings.$current_tip=this.settings.$next_tip):this.settings.$li&&this.settings.$target.length<1?this.show(b,c):this.end()):this.settings.paused=!0},is_phone:function(){return matchMedia(Foundation.media_queries.small).matches&&!matchMedia(Foundation.media_queries.medium).matches},hide:function(){this.settings.modal&&this.settings.expose&&this.un_expose(),this.settings.modal||a(".joyride-modal-bg").hide(),this.settings.$current_tip.css("visibility","hidden"),setTimeout(a.proxy(function(){this.hide(),this.css("visibility","visible")},this.settings.$current_tip),0),this.settings.post_step_callback(this.settings.$li.index(),this.settings.$current_tip)},set_li:function(a,b){a?(this.settings.$li=this.settings.$tip_content.eq(this.settings.start_offset),this.set_next_tip(),this.settings.$current_tip=this.settings.$next_tip):(this.settings.$li=b?this.settings.$li.prev():this.settings.$li.next(),this.set_next_tip()),this.set_target()},set_next_tip:function(){this.settings.$next_tip=a(".joyride-tip-guide").eq(this.settings.$li.index()),this.settings.$next_tip.data("closed","")},set_target:function(){var b=this.settings.$li.attr(this.add_namespace("data-class")),d=this.settings.$li.attr(this.add_namespace("data-id")),e=function(){return d?a(c.getElementById(d)):b?a("."+b).first():a("body")};this.settings.$target=e()},scroll_to:function(){var c,d;c=a(b).height()/2,d=Math.ceil(this.settings.$target.offset().top-c+this.settings.$next_tip.outerHeight()),0!=d&&a("html, body").stop().animate({scrollTop:d},this.settings.scroll_speed,"swing")},paused:function(){return-1===a.inArray(this.settings.$li.index()+1,this.settings.pause_after)},restart:function(){this.hide(),this.settings.$li=d,this.show("init")},pos_default:function(a){var b=this.settings.$next_tip.find(".joyride-nub"),c=Math.ceil(b.outerWidth()/2),d=Math.ceil(b.outerHeight()/2),e=a||!1;if(e&&(this.settings.$next_tip.css("visibility","hidden"),this.settings.$next_tip.show()),/body/i.test(this.settings.$target.selector))this.settings.$li.length&&this.pos_modal(b);else{var f=this.settings.tip_settings.tipAdjustmentY?parseInt(this.settings.tip_settings.tipAdjustmentY):0,g=this.settings.tip_settings.tipAdjustmentX?parseInt(this.settings.tip_settings.tipAdjustmentX):0;this.bottom()?(this.settings.$next_tip.css(this.rtl?{top:this.settings.$target.offset().top+d+this.settings.$target.outerHeight()+f,left:this.settings.$target.offset().left+this.settings.$target.outerWidth()-this.settings.$next_tip.outerWidth()+g}:{top:this.settings.$target.offset().top+d+this.settings.$target.outerHeight()+f,left:this.settings.$target.offset().left+g}),this.nub_position(b,this.settings.tip_settings.nub_position,"top")):this.top()?(this.settings.$next_tip.css(this.rtl?{top:this.settings.$target.offset().top-this.settings.$next_tip.outerHeight()-d+f,left:this.settings.$target.offset().left+this.settings.$target.outerWidth()-this.settings.$next_tip.outerWidth()}:{top:this.settings.$target.offset().top-this.settings.$next_tip.outerHeight()-d+f,left:this.settings.$target.offset().left+g}),this.nub_position(b,this.settings.tip_settings.nub_position,"bottom")):this.right()?(this.settings.$next_tip.css({top:this.settings.$target.offset().top+f,left:this.settings.$target.outerWidth()+this.settings.$target.offset().left+c+g}),this.nub_position(b,this.settings.tip_settings.nub_position,"left")):this.left()&&(this.settings.$next_tip.css({top:this.settings.$target.offset().top+f,left:this.settings.$target.offset().left-this.settings.$next_tip.outerWidth()-c+g}),this.nub_position(b,this.settings.tip_settings.nub_position,"right")),!this.visible(this.corners(this.settings.$next_tip))&&this.settings.attempts0&&arguments[0]instanceof a)e=arguments[0];else{if(!this.settings.$target||/body/i.test(this.settings.$target.selector))return!1;e=this.settings.$target}return e.length<1?(b.console&&console.error("element not valid",e),!1):(c=a(this.settings.template.expose),this.settings.$body.append(c),c.css({top:e.offset().top,left:e.offset().left,width:e.outerWidth(!0),height:e.outerHeight(!0)}),d=a(this.settings.template.expose_cover),f={zIndex:e.css("z-index"),position:e.css("position")},g=null==e.attr("class")?"":e.attr("class"),e.css("z-index",parseInt(c.css("z-index"))+1),"static"==f.position&&e.css("position","relative"),e.data("expose-css",f),e.data("orig-class",g),e.attr("class",g+" "+this.settings.expose_add_class),d.css({top:e.offset().top,left:e.offset().left,width:e.outerWidth(!0),height:e.outerHeight(!0)}),this.settings.modal&&this.show_modal(),this.settings.$body.append(d),c.addClass(h),d.addClass(h),e.data("expose",h),this.settings.post_expose_callback(this.settings.$li.index(),this.settings.$next_tip,e),void this.add_exposed(e))},un_expose:function(){var c,d,e,f,g,h=!1;if(arguments.length>0&&arguments[0]instanceof a)d=arguments[0];else{if(!this.settings.$target||/body/i.test(this.settings.$target.selector))return!1;d=this.settings.$target}return d.length<1?(b.console&&console.error("element not valid",d),!1):(c=d.data("expose"),e=a("."+c),arguments.length>1&&(h=arguments[1]),h===!0?a(".joyride-expose-wrapper,.joyride-expose-cover").remove():e.remove(),f=d.data("expose-css"),"auto"==f.zIndex?d.css("z-index",""):d.css("z-index",f.zIndex),f.position!=d.css("position")&&("static"==f.position?d.css("position",""):d.css("position",f.position)),g=d.data("orig-class"),d.attr("class",g),d.removeData("orig-classes"),d.removeData("expose"),d.removeData("expose-z-index"),void this.remove_exposed(d))},add_exposed:function(b){this.settings.exposed=this.settings.exposed||[],b instanceof a||"object"==typeof b?this.settings.exposed.push(b[0]):"string"==typeof b&&this.settings.exposed.push(b)},remove_exposed:function(b){var c,d;for(b instanceof a?c=b[0]:"string"==typeof b&&(c=b),this.settings.exposed=this.settings.exposed||[],d=this.settings.exposed.length;d--;)if(this.settings.exposed[d]==c)return void this.settings.exposed.splice(d,1)},center:function(){var c=a(b);return this.settings.$next_tip.css({top:(c.height()-this.settings.$next_tip.outerHeight())/2+c.scrollTop(),left:(c.width()-this.settings.$next_tip.outerWidth())/2+c.scrollLeft()}),!0},bottom:function(){return/bottom/i.test(this.settings.tip_settings.tip_location)},top:function(){return/top/i.test(this.settings.tip_settings.tip_location)},right:function(){return/right/i.test(this.settings.tip_settings.tip_location)},left:function(){return/left/i.test(this.settings.tip_settings.tip_location)},corners:function(c){var d=a(b),e=d.height()/2,f=Math.ceil(this.settings.$target.offset().top-e+this.settings.$next_tip.outerHeight()),g=d.width()+d.scrollLeft(),h=d.height()+f,i=d.height()+d.scrollTop(),j=d.scrollTop();return j>f&&(j=0>f?0:f),h>i&&(i=h),[c.offset().topc.offset().left]},visible:function(a){for(var b=a.length;b--;)if(a[b])return!1;return!0},nub_position:function(a,b,c){a.addClass("auto"===b?c:b)},startTimer:function(){this.settings.$li.length?this.settings.automate=setTimeout(function(){this.hide(),this.show(),this.startTimer()}.bind(this),this.settings.timer):clearTimeout(this.settings.automate)},end:function(b){this.settings.cookie_monster&&a.cookie(this.settings.cookie_name,"ridden",{expires:this.settings.cookie_expires,domain:this.settings.cookie_domain}),this.settings.timer>0&&clearTimeout(this.settings.automate),this.settings.modal&&this.settings.expose&&this.un_expose(),a(this.scope).off("keyup.joyride"),this.settings.$next_tip.data("closed",!0),this.settings.riding=!1,a(".joyride-modal-bg").hide(),this.settings.$current_tip.hide(),("undefined"==typeof b||b===!1)&&(this.settings.post_step_callback(this.settings.$li.index(),this.settings.$current_tip),this.settings.post_ride_callback(this.settings.$li.index(),this.settings.$current_tip)),a(".joyride-tip-guide").remove()},off:function(){a(this.scope).off(".joyride"),a(b).off(".joyride"),a(".joyride-close-tip, .joyride-next-tip, .joyride-modal-bg").off(".joyride"),a(".joyride-tip-guide, .joyride-modal-bg").remove(),clearTimeout(this.settings.automate),this.settings={}},reflow:function(){}}}(jQuery,window,window.document),function(a,b){"use strict";Foundation.libs["magellan-expedition"]={name:"magellan-expedition",version:"5.4.6",settings:{active_class:"active",threshold:0,destination_threshold:20,throttle_delay:30,fixed_top:0},init:function(a,b,c){Foundation.inherit(this,"throttle"),this.bindings(b,c)},events:function(){var c=this,d=c.S,e=c.settings;c.set_expedition_position(),d(c.scope).off(".magellan").on("click.fndtn.magellan","["+c.add_namespace("data-magellan-arrival")+'] a[href^="#"]',function(b){b.preventDefault();var d=a(this).closest("["+c.attr_name()+"]"),e=d.data("magellan-expedition-init"),f=this.hash.split("#").join(""),g=a("a[name='"+f+"']");0===g.length&&(g=a("#"+f));var h=g.offset().top-e.destination_threshold+1;h-=d.outerHeight(),a("html, body").stop().animate({scrollTop:h},700,"swing",function(){history.pushState?history.pushState(null,null,"#"+f):location.hash="#"+f})}).on("scroll.fndtn.magellan",c.throttle(this.check_for_arrivals.bind(this),e.throttle_delay)),a(b).on("resize.fndtn.magellan",c.throttle(this.set_expedition_position.bind(this),e.throttle_delay))},check_for_arrivals:function(){var a=this;a.update_arrivals(),a.update_expedition_positions()},set_expedition_position:function(){var b=this;a("["+this.attr_name()+"=fixed]",b.scope).each(function(){var c,d,e=a(this),f=e.data("magellan-expedition-init"),g=e.attr("styles");e.attr("style",""),c=e.offset().top+f.threshold,d=parseInt(e.data("magellan-fixed-top")),isNaN(d)||(b.settings.fixed_top=d),e.data(b.data_attr("magellan-top-offset"),c),e.attr("style",g)})},update_expedition_positions:function(){var c=this,d=a(b).scrollTop();a("["+this.attr_name()+"=fixed]",c.scope).each(function(){var b=a(this),e=b.data("magellan-expedition-init"),f=b.attr("style"),g=b.data("magellan-top-offset");if(d+c.settings.fixed_top>=g){var h=b.prev("["+c.add_namespace("data-magellan-expedition-clone")+"]");0===h.length&&(h=b.clone(),h.removeAttr(c.attr_name()),h.attr(c.add_namespace("data-magellan-expedition-clone"),""),b.before(h)),b.css({position:"fixed",top:e.fixed_top}).addClass("fixed")}else b.prev("["+c.add_namespace("data-magellan-expedition-clone")+"]").remove(),b.attr("style",f).css("position","").css("top","").removeClass("fixed")})},update_arrivals:function(){var c=this,d=a(b).scrollTop();a("["+this.attr_name()+"]",c.scope).each(function(){var b=a(this),e=b.data(c.attr_name(!0)+"-init"),f=c.offsets(b,d),g=b.find("["+c.add_namespace("data-magellan-arrival")+"]"),h=!1;f.each(function(a,d){if(d.viewport_offset>=d.top_offset){var f=b.find("["+c.add_namespace("data-magellan-arrival")+"]");return f.not(d.arrival).removeClass(e.active_class),d.arrival.addClass(e.active_class),h=!0,!0}}),h||g.removeClass(e.active_class)})},offsets:function(b,c){var d=this,e=b.data(d.attr_name(!0)+"-init"),f=c;return b.find("["+d.add_namespace("data-magellan-arrival")+"]").map(function(){var c=a(this).data(d.data_attr("magellan-arrival")),g=a("["+d.add_namespace("data-magellan-destination")+"="+c+"]");if(g.length>0){var h=Math.floor(g.offset().top-e.destination_threshold-b.outerHeight());return{destination:g,arrival:a(this),top_offset:h,viewport_offset:f}}}).sort(function(a,b){return a.top_offsetb.top_offset?1:0})},data_attr:function(a){return this.namespace.length>0?this.namespace+"-"+a:a},off:function(){this.S(this.scope).off(".magellan"),this.S(b).off(".magellan")},reflow:function(){var b=this;a("["+b.add_namespace("data-magellan-expedition-clone")+"]",b.scope).remove()}}}(jQuery,window,window.document),function(a){"use strict";Foundation.libs.offcanvas={name:"offcanvas",version:"5.4.6",settings:{open_method:"move",close_on_click:!1},init:function(a,b,c){this.bindings(b,c)},events:function(){var b=this,c=b.S,d="",e="",f="";"move"===this.settings.open_method?(d="move-",e="right",f="left"):"overlap_single"===this.settings.open_method?(d="offcanvas-overlap-",e="right",f="left"):"overlap"===this.settings.open_method&&(d="offcanvas-overlap"),c(this.scope).off(".offcanvas").on("click.fndtn.offcanvas",".left-off-canvas-toggle",function(f){b.click_toggle_class(f,d+e),"overlap"!==b.settings.open_method&&c(".left-submenu").removeClass(d+e),a(".left-off-canvas-toggle").attr("aria-expanded","true")}).on("click.fndtn.offcanvas",".left-off-canvas-menu a",function(f){var g=b.get_settings(f),h=c(this).parent();!g.close_on_click||h.hasClass("has-submenu")||h.hasClass("back")?c(this).parent().hasClass("has-submenu")?(f.preventDefault(),c(this).siblings(".left-submenu").toggleClass(d+e)):h.hasClass("back")&&(f.preventDefault(),h.parent().removeClass(d+e)):(b.hide.call(b,d+e,b.get_wrapper(f)),h.parent().removeClass(d+e)),a(".left-off-canvas-toggle").attr("aria-expanded","true")}).on("click.fndtn.offcanvas",".right-off-canvas-toggle",function(e){b.click_toggle_class(e,d+f),"overlap"!==b.settings.open_method&&c(".right-submenu").removeClass(d+f),a(".right-off-canvas-toggle").attr("aria-expanded","true")}).on("click.fndtn.offcanvas",".right-off-canvas-menu a",function(e){var g=b.get_settings(e),h=c(this).parent();!g.close_on_click||h.hasClass("has-submenu")||h.hasClass("back")?c(this).parent().hasClass("has-submenu")?(e.preventDefault(),c(this).siblings(".right-submenu").toggleClass(d+f)):h.hasClass("back")&&(e.preventDefault(),h.parent().removeClass(d+f)):(b.hide.call(b,d+f,b.get_wrapper(e)),h.parent().removeClass(d+f)),a(".right-off-canvas-toggle").attr("aria-expanded","true")}).on("click.fndtn.offcanvas",".exit-off-canvas",function(g){b.click_remove_class(g,d+f),c(".right-submenu").removeClass(d+f),e&&(b.click_remove_class(g,d+e),c(".left-submenu").removeClass(d+f)),a(".right-off-canvas-toggle").attr("aria-expanded","true")}).on("click.fndtn.offcanvas",".exit-off-canvas",function(c){b.click_remove_class(c,d+f),a(".left-off-canvas-toggle").attr("aria-expanded","false"),e&&(b.click_remove_class(c,d+e),a(".right-off-canvas-toggle").attr("aria-expanded","false"))})},toggle:function(a,b){b=b||this.get_wrapper(),b.is("."+a)?this.hide(a,b):this.show(a,b)},show:function(a,b){b=b||this.get_wrapper(),b.trigger("open").trigger("open.fndtn.offcanvas"),b.addClass(a)},hide:function(a,b){b=b||this.get_wrapper(),b.trigger("close").trigger("close.fndtn.offcanvas"),b.removeClass(a)},click_toggle_class:function(a,b){a.preventDefault();var c=this.get_wrapper(a);this.toggle(b,c)},click_remove_class:function(a,b){a.preventDefault();var c=this.get_wrapper(a);this.hide(b,c)},get_settings:function(a){var b=this.S(a.target).closest("["+this.attr_name()+"]");return b.data(this.attr_name(!0)+"-init")||this.settings},get_wrapper:function(a){var b=this.S(a?a.target:this.scope).closest(".off-canvas-wrap");return 0===b.length&&(b=this.S(".off-canvas-wrap")),b},reflow:function(){}}}(jQuery,window,window.document),function(a,b,c,d){"use strict";var e=function(){},f=function(e,f){if(e.hasClass(f.slides_container_class))return this;var j,k,l,m,n,o,p=this,q=e,r=0,s=!1;p.slides=function(){return q.children(f.slide_selector)},p.slides().first().addClass(f.active_slide_class),p.update_slide_number=function(b){f.slide_number&&(k.find("span:first").text(parseInt(b)+1),k.find("span:last").text(p.slides().length)),f.bullets&&(l.children().removeClass(f.bullets_active_class),a(l.children().get(b)).addClass(f.bullets_active_class))},p.update_active_link=function(b){var c=a('[data-orbit-link="'+p.slides().eq(b).attr("data-orbit-slide")+'"]');c.siblings().removeClass(f.bullets_active_class),c.addClass(f.bullets_active_class)},p.build_markup=function(){q.wrap('
            '),j=q.parent(),q.addClass(f.slides_container_class),f.stack_on_small&&j.addClass(f.stack_on_small_class),f.navigation_arrows&&(j.append(a('').addClass(f.prev_class)),j.append(a('').addClass(f.next_class))),f.timer&&(m=a("
            ").addClass(f.timer_container_class),m.append(""),m.append(a("
            ").addClass(f.timer_progress_class)),m.addClass(f.timer_paused_class),j.append(m)),f.slide_number&&(k=a("
            ").addClass(f.slide_number_class),k.append(" "+f.slide_number_text+" "),j.append(k)),f.bullets&&(l=a("
              ").addClass(f.bullets_container_class),j.append(l),l.wrap('
              '),p.slides().each(function(b){var c=a("
            1. ").attr("data-orbit-slide",b).on("click",p.link_bullet);l.append(c)}))},p._goto=function(b,c){if(b===r)return!1;"object"==typeof o&&o.restart();var d=p.slides(),e="next";if(s=!0,r>b&&(e="prev"),b>=d.length){if(!f.circular)return!1;b=0}else if(0>b){if(!f.circular)return!1;b=d.length-1}var g=a(d.get(r)),h=a(d.get(b));g.css("zIndex",2),g.removeClass(f.active_slide_class),h.css("zIndex",4).addClass(f.active_slide_class),q.trigger("before-slide-change.fndtn.orbit"),f.before_slide_change(),p.update_active_link(b);var i=function(){var a=function(){r=b,s=!1,c===!0&&(o=p.create_timer(),o.start()),p.update_slide_number(r),q.trigger("after-slide-change.fndtn.orbit",[{slide_number:r,total_slides:d.length}]),f.after_slide_change(r,d.length)};q.height()!=h.height()&&f.variable_height?q.animate({height:h.height()},250,"linear",a):a()};if(1===d.length)return i(),!1;var j=function(){"next"===e&&n.next(g,h,i),"prev"===e&&n.prev(g,h,i)};h.height()>q.height()&&f.variable_height?q.animate({height:h.height()},250,"linear",j):j()},p.next=function(a){a.stopImmediatePropagation(),a.preventDefault(),p._goto(r+1)},p.prev=function(a){a.stopImmediatePropagation(),a.preventDefault(),p._goto(r-1)},p.link_custom=function(b){b.preventDefault();var c=a(this).attr("data-orbit-link");if("string"==typeof c&&""!=(c=a.trim(c))){var d=j.find("[data-orbit-slide="+c+"]");-1!=d.index()&&p._goto(d.index())}},p.link_bullet=function(){var b=a(this).attr("data-orbit-slide");if("string"==typeof b&&""!=(b=a.trim(b)))if(isNaN(parseInt(b))){var c=j.find("[data-orbit-slide="+b+"]");-1!=c.index()&&p._goto(c.index()+1)}else p._goto(parseInt(b))},p.timer_callback=function(){p._goto(r+1,!0)},p.compute_dimensions=function(){var b=a(p.slides().get(r)),c=b.height();f.variable_height||p.slides().each(function(){a(this).height()>c&&(c=a(this).height())}),q.height(c)},p.create_timer=function(){var a=new g(j.find("."+f.timer_container_class),f,p.timer_callback);return a},p.stop_timer=function(){"object"==typeof o&&o.stop()},p.toggle_timer=function(){var a=j.find("."+f.timer_container_class);a.hasClass(f.timer_paused_class)?("undefined"==typeof o&&(o=p.create_timer()),o.start()):"object"==typeof o&&o.stop()},p.init=function(){p.build_markup(),f.timer&&(o=p.create_timer(),Foundation.utils.image_loaded(this.slides().children("img"),o.start)),n=new i(f,q),"slide"===f.animation&&(n=new h(f,q)),j.on("click","."+f.next_class,p.next),j.on("click","."+f.prev_class,p.prev),f.next_on_click&&j.on("click","."+f.slides_container_class+" [data-orbit-slide]",p.link_bullet),j.on("click",p.toggle_timer),f.swipe&&j.on("touchstart.fndtn.orbit",function(a){a.touches||(a=a.originalEvent);var b={start_page_x:a.touches[0].pageX,start_page_y:a.touches[0].pageY,start_time:(new Date).getTime(),delta_x:0,is_scrolling:d};j.data("swipe-transition",b),a.stopPropagation()}).on("touchmove.fndtn.orbit",function(a){if(a.touches||(a=a.originalEvent),!(a.touches.length>1||a.scale&&1!==a.scale)){var b=j.data("swipe-transition");if("undefined"==typeof b&&(b={}),b.delta_x=a.touches[0].pageX-b.start_page_x,"undefined"==typeof b.is_scrolling&&(b.is_scrolling=!!(b.is_scrolling||Math.abs(b.delta_x)0?b(this.scope).on("open.fndtn.reveal",this.settings.open).on("opened.fndtn.reveal",this.settings.opened).on("opened.fndtn.reveal",this.open_video).on("close.fndtn.reveal",this.settings.close).on("closed.fndtn.reveal",this.settings.closed).on("closed.fndtn.reveal",this.close_video):b(this.scope).on("open.fndtn.reveal","["+a.attr_name()+"]",this.settings.open).on("opened.fndtn.reveal","["+a.attr_name()+"]",this.settings.opened).on("opened.fndtn.reveal","["+a.attr_name()+"]",this.open_video).on("close.fndtn.reveal","["+a.attr_name()+"]",this.settings.close).on("closed.fndtn.reveal","["+a.attr_name()+"]",this.settings.closed).on("closed.fndtn.reveal","["+a.attr_name()+"]",this.close_video),!0},key_up_on:function(){var a=this;return a.S("body").off("keyup.fndtn.reveal").on("keyup.fndtn.reveal",function(b){var c=a.S("["+a.attr_name()+"].open"),d=c.data(a.attr_name(!0)+"-init")||a.settings;d&&27===b.which&&d.close_on_esc&&!a.locked&&a.close.call(a,c)}),!0},key_up_off:function(){return this.S("body").off("keyup.fndtn.reveal"),!0},open:function(c,d){var e,f=this;c?"undefined"!=typeof c.selector?e=f.S("#"+c.data(f.data_attr("reveal-id"))).first():(e=f.S(this.scope),d=c):e=f.S(this.scope);var g=e.data(f.attr_name(!0)+"-init");if(g=g||this.settings,e.hasClass("open")&&c.attr("data-reveal-id")==e.attr("id"))return f.close(e);if(!e.hasClass("open")){var h=f.S("["+f.attr_name()+"].open");if("undefined"==typeof e.data("css-top")&&e.data("css-top",parseInt(e.css("top"),10)).data("offset",this.cache_offset(e)),this.key_up_on(e),e.trigger("open").trigger("open.fndtn.reveal"),h.length<1&&this.toggle_bg(e,!0),"string"==typeof d&&(d={url:d}),"undefined"!=typeof d&&d.url){var i="undefined"!=typeof d.success?d.success:null;a.extend(d,{success:function(b,c,d){a.isFunction(i)&&i(b,c,d),e.html(b),f.S(e).foundation("section","reflow"),f.S(e).children().foundation(),h.length>0&&f.hide(h,g.css.close),f.show(e,g.css.open)}}),a.ajax(d)}else h.length>0&&this.hide(h,g.css.close),this.show(e,g.css.open)}f.S(b).trigger("resize")},close:function(a){var a=a&&a.length?a:this.S(this.scope),b=this.S("["+this.attr_name()+"].open"),c=a.data(this.attr_name(!0)+"-init")||this.settings;b.length>0&&(this.locked=!0,this.key_up_off(a),a.trigger("close").trigger("close.fndtn.reveal"),this.toggle_bg(a,!1),this.hide(b,c.css.close,c))},close_targets:function(){var a="."+this.settings.dismiss_modal_class;return this.settings.close_on_background_click?a+", ."+this.settings.bg_class:a},toggle_bg:function(b,c){0===this.S("."+this.settings.bg_class).length&&(this.settings.bg=a("
              ",{"class":this.settings.bg_class}).appendTo("body").hide());var e=this.settings.bg.filter(":visible").length>0;c!=e&&((c==d?e:!c)?this.hide(this.settings.bg):this.show(this.settings.bg))},show:function(c,d){if(d){var f=c.data(this.attr_name(!0)+"-init")||this.settings,g=f.root_element;if(0===c.parent(g).length){var h=c.wrap('
              ').parent();c.on("closed.fndtn.reveal.wrapped",function(){c.detach().appendTo(h),c.unwrap().unbind("closed.fndtn.reveal.wrapped")}),c.detach().appendTo(g)}var i=e(f.animation);if(i.animate||(this.locked=!1),i.pop){d.top=a(b).scrollTop()-c.data("offset")+"px";var j={top:a(b).scrollTop()+c.data("css-top")+"px",opacity:1};return setTimeout(function(){return c.css(d).animate(j,f.animation_speed,"linear",function(){this.locked=!1,c.trigger("opened").trigger("opened.fndtn.reveal")}.bind(this)).addClass("open")}.bind(this),f.animation_speed/2)}if(i.fade){d.top=a(b).scrollTop()+c.data("css-top")+"px";var j={opacity:1};return setTimeout(function(){return c.css(d).animate(j,f.animation_speed,"linear",function(){this.locked=!1,c.trigger("opened").trigger("opened.fndtn.reveal")}.bind(this)).addClass("open")}.bind(this),f.animation_speed/2)}return c.css(d).show().css({opacity:1}).addClass("open").trigger("opened").trigger("opened.fndtn.reveal")}var f=this.settings;return e(f.animation).fade?c.fadeIn(f.animation_speed/2):(this.locked=!1,c.show())},hide:function(c,d){if(d){var f=c.data(this.attr_name(!0)+"-init");f=f||this.settings;var g=e(f.animation);if(g.animate||(this.locked=!1),g.pop){var h={top:-a(b).scrollTop()-c.data("offset")+"px",opacity:0};return setTimeout(function(){return c.animate(h,f.animation_speed,"linear",function(){this.locked=!1,c.css(d).trigger("closed").trigger("closed.fndtn.reveal")}.bind(this)).removeClass("open")}.bind(this),f.animation_speed/2)}if(g.fade){var h={opacity:0};return setTimeout(function(){return c.animate(h,f.animation_speed,"linear",function(){this.locked=!1,c.css(d).trigger("closed").trigger("closed.fndtn.reveal")}.bind(this)).removeClass("open")}.bind(this),f.animation_speed/2)}return c.hide().css(d).removeClass("open").trigger("closed").trigger("closed.fndtn.reveal")}var f=this.settings;return e(f.animation).fade?c.fadeOut(f.animation_speed/2):c.hide()},close_video:function(b){var c=a(".flex-video",b.target),d=a("iframe",c);d.length>0&&(d.attr("data-src",d[0].src),d.attr("src",d.attr("src")),c.hide())},open_video:function(b){var c=a(".flex-video",b.target),e=c.find("iframe");if(e.length>0){var f=e.attr("data-src");if("string"==typeof f)e[0].src=e.attr("data-src");else{var g=e[0].src;e[0].src=d,e[0].src=g}c.show()}},data_attr:function(a){return this.namespace.length>0?this.namespace+"-"+a:a},cache_offset:function(a){var b=a.show().height()+parseInt(a.css("top"),10);return a.hide(),b},off:function(){a(this.scope).off(".fndtn.reveal")},reflow:function(){}}}(jQuery,window,window.document),function(a,b){"use strict";Foundation.libs.slider={name:"slider",version:"5.4.6",settings:{start:0,end:100,step:1,initial:null,display_selector:"",vertical:!1,on_change:function(){}},cache:{},init:function(a,b,c){Foundation.inherit(this,"throttle"),this.bindings(b,c),this.reflow()},events:function(){var c=this;a(this.scope).off(".slider").on("mousedown.fndtn.slider touchstart.fndtn.slider pointerdown.fndtn.slider","["+c.attr_name()+"]:not(.disabled, [disabled]) .range-slider-handle",function(b){c.cache.active||(b.preventDefault(),c.set_active_slider(a(b.target)))}).on("mousemove.fndtn.slider touchmove.fndtn.slider pointermove.fndtn.slider",function(d){if(c.cache.active)if(d.preventDefault(),a.data(c.cache.active[0],"settings").vertical){var e=0;d.pageY||(e=b.scrollY),c.calculate_position(c.cache.active,(d.pageY||d.originalEvent.clientY||d.originalEvent.touches[0].clientY||d.currentPoint.y)+e)}else c.calculate_position(c.cache.active,d.pageX||d.originalEvent.clientX||d.originalEvent.touches[0].clientX||d.currentPoint.x)}).on("mouseup.fndtn.slider touchend.fndtn.slider pointerup.fndtn.slider",function(){c.remove_active_slider()}).on("change.fndtn.slider",function(){c.settings.on_change()}),c.S(b).on("resize.fndtn.slider",c.throttle(function(){c.reflow()},300))},set_active_slider:function(a){this.cache.active=a},remove_active_slider:function(){this.cache.active=null},calculate_position:function(b,c){var d=this,e=a.data(b[0],"settings"),f=(a.data(b[0],"handle_l"),a.data(b[0],"handle_o"),a.data(b[0],"bar_l")),g=a.data(b[0],"bar_o");requestAnimationFrame(function(){var a;a=Foundation.rtl&&!e.vertical?d.limit_to((g+f-c)/f,0,1):d.limit_to((c-g)/f,0,1),a=e.vertical?1-a:a;var h=d.normalized_value(a,e.start,e.end,e.step);d.set_ui(b,h)})},set_ui:function(b,c){var d=a.data(b[0],"settings"),e=a.data(b[0],"handle_l"),f=a.data(b[0],"bar_l"),g=this.normalized_percentage(c,d.start,d.end),h=g*(f-e)-1,i=100*g;Foundation.rtl&&!d.vertical&&(h=-h),h=d.vertical?-h+f-e+1:h,this.set_translate(b,h,d.vertical),d.vertical?b.siblings(".range-slider-active-segment").css("height",i+"%"):b.siblings(".range-slider-active-segment").css("width",i+"%"),b.parent().attr(this.attr_name(),c).trigger("change").trigger("change.fndtn.slider"),b.parent().children("input[type=hidden]").val(c),b[0].hasAttribute("aria-valuemin")||b.attr({"aria-valuemin":d.start,"aria-valuemax":d.end}),b.attr("aria-valuenow",c),""!=d.display_selector&&a(d.display_selector).each(function(){this.hasOwnProperty("value")?a(this).val(c):a(this).text(c)})},normalized_percentage:function(a,b,c){return Math.min(1,(a-b)/(c-b))},normalized_value:function(a,b,c,d){var e=c-b,f=a*e,g=(f-f%d)/d,h=f%d,i=h>=.5*d?d:0;return g*d+i+b},set_translate:function(b,c,d){d?a(b).css("-webkit-transform","translateY("+c+"px)").css("-moz-transform","translateY("+c+"px)").css("-ms-transform","translateY("+c+"px)").css("-o-transform","translateY("+c+"px)").css("transform","translateY("+c+"px)"):a(b).css("-webkit-transform","translateX("+c+"px)").css("-moz-transform","translateX("+c+"px)").css("-ms-transform","translateX("+c+"px)").css("-o-transform","translateX("+c+"px)").css("transform","translateX("+c+"px)")},limit_to:function(a,b,c){return Math.min(Math.max(a,b),c)},initialize_settings:function(b){var c=a.extend({},this.settings,this.data_options(a(b).parent()));c.vertical?(a.data(b,"bar_o",a(b).parent().offset().top),a.data(b,"bar_l",a(b).parent().outerHeight()),a.data(b,"handle_o",a(b).offset().top),a.data(b,"handle_l",a(b).outerHeight())):(a.data(b,"bar_o",a(b).parent().offset().left),a.data(b,"bar_l",a(b).parent().outerWidth()),a.data(b,"handle_o",a(b).offset().left),a.data(b,"handle_l",a(b).outerWidth())),a.data(b,"bar",a(b).parent()),a.data(b,"settings",c)},set_initial_position:function(b){var c=a.data(b.children(".range-slider-handle")[0],"settings"),d=c.initial?c.initial:Math.floor(.5*(c.end-c.start)/c.step)*c.step+c.start,e=b.children(".range-slider-handle");this.set_ui(e,d)},set_value:function(b){var c=this;a("["+c.attr_name()+"]",this.scope).each(function(){a(this).attr(c.attr_name(),b)}),a(this.scope).attr(c.attr_name())&&a(this.scope).attr(c.attr_name(),b),c.reflow()},reflow:function(){var b=this;b.S("["+this.attr_name()+"]").each(function(){var c=a(this).children(".range-slider-handle")[0],d=a(this).attr(b.attr_name());b.initialize_settings(c),d?b.set_ui(a(c),parseFloat(d)):b.set_initial_position(a(this))})}}}(jQuery,window,window.document),function(a,b,c,d){"use strict";Foundation.libs.tab={name:"tab",version:"5.4.6",settings:{active_class:"active",callback:function(){},deep_linking:!1,scroll_to_content:!0,is_hover:!1},default_tab_hashes:[],init:function(a,b,c){var d=this,e=this.S;this.bindings(b,c),this.handle_location_hash_change(),e("["+this.attr_name()+"] > .active > a",this.scope).each(function(){d.default_tab_hashes.push(this.hash)})},events:function(){var a=this,c=this.S,d=function(b){var d=c(this).closest("["+a.attr_name()+"]").data(a.attr_name(!0)+"-init");(!d.is_hover||Modernizr.touch)&&(b.preventDefault(),b.stopPropagation(),a.toggle_active_tab(c(this).parent()))};c(this.scope).off(".tab").on("focus.fndtn.tab","["+this.attr_name()+"] > * > a",d).on("click.fndtn.tab","["+this.attr_name()+"] > * > a",d).on("mouseenter.fndtn.tab","["+this.attr_name()+"] > * > a",function(){var b=c(this).closest("["+a.attr_name()+"]").data(a.attr_name(!0)+"-init");b.is_hover&&a.toggle_active_tab(c(this).parent())}),c(b).on("hashchange.fndtn.tab",function(b){b.preventDefault(),a.handle_location_hash_change()})},handle_location_hash_change:function(){var b=this,c=this.S;c("["+this.attr_name()+"]",this.scope).each(function(){var e=c(this).data(b.attr_name(!0)+"-init");if(e.deep_linking){var f;if(f=e.scroll_to_content?b.scope.location.hash:b.scope.location.hash.replace("fndtn-",""),""!=f){var g=c(f);if(g.hasClass("content")&&g.parent().hasClass("tab-content"))b.toggle_active_tab(a("["+b.attr_name()+"] > * > a[href="+f+"]").parent());else{var h=g.closest(".content").attr("id");h!=d&&b.toggle_active_tab(a("["+b.attr_name()+"] > * > a[href=#"+h+"]").parent(),f)}}else for(var i=0;i * > a[href="+b.default_tab_hashes[i]+"]").parent())}})},toggle_active_tab:function(e,f){var g=this.S,h=e.closest("["+this.attr_name()+"]"),i=e.find("a"),j=e.children("a").first(),k="#"+j.attr("href").split("#")[1],l=g(k),m=e.siblings(),n=h.data(this.attr_name(!0)+"-init"),o=function(b){var d,e=a(this),f=a(this).parents("li").prev().children('[role="tab"]'),g=a(this).parents("li").next().children('[role="tab"]');switch(b.keyCode){case 37:d=f;break;case 39:d=g;break;default:d=!1}d.length&&(e.attr({tabindex:"-1","aria-selected":null}),d.attr({tabindex:"0","aria-selected":!0}).focus()),a('[role="tabpanel"]').attr("aria-hidden","true"),a("#"+a(c.activeElement).attr("href").substring(1)).attr("aria-hidden",null)};g(this).data(this.data_attr("tab-content"))&&(k="#"+g(this).data(this.data_attr("tab-content")).split("#")[1],l=g(k)),n.deep_linking&&(n.scroll_to_content?(b.location.hash=f||k,f==d||f==k?e.parent()[0].scrollIntoView():g(k)[0].scrollIntoView()):b.location.hash=f!=d?"fndtn-"+f.replace("#",""):"fndtn-"+k.replace("#","")),e.addClass(n.active_class).triggerHandler("opened"),i.attr({"aria-selected":"true",tabindex:0}),m.removeClass(n.active_class),m.find("a").attr({"aria-selected":"false",tabindex:-1}),l.siblings().removeClass(n.active_class).attr({"aria-hidden":"true",tabindex:-1}),l.addClass(n.active_class).attr("aria-hidden","false").removeAttr("tabindex"),n.callback(e),l.triggerHandler("toggled",[e]),h.triggerHandler("toggled",[l]),i.off("keydown").on("keydown",o)},data_attr:function(a){return this.namespace.length>0?this.namespace+"-"+a:a},off:function(){},reflow:function(){}}}(jQuery,window,window.document),function(a,b){"use strict";Foundation.libs.tooltip={name:"tooltip",version:"5.4.6",settings:{additional_inheritable_classes:[],tooltip_class:".tooltip",append_to:"body",touch_close_text:"Tap To Close",disable_for_touch:!1,hover_delay:200,show_on:"all",tip_template:function(a,b){return''+b+''}},cache:{},init:function(a,b,c){Foundation.inherit(this,"random_str"),this.bindings(b,c)},should_show:function(b){var c=a.extend({},this.settings,this.data_options(b));return"all"===c.show_on?!0:this.small()&&"small"===c.show_on?!0:this.medium()&&"medium"===c.show_on?!0:this.large()&&"large"===c.show_on?!0:!1},medium:function(){return matchMedia(Foundation.media_queries.medium).matches},large:function(){return matchMedia(Foundation.media_queries.large).matches},events:function(b){var c=this,d=c.S;c.create(this.S(b)),a(this.scope).off(".tooltip").on("mouseenter.fndtn.tooltip mouseleave.fndtn.tooltip touchstart.fndtn.tooltip MSPointerDown.fndtn.tooltip","["+this.attr_name()+"]",function(b){var e=d(this),f=a.extend({},c.settings,c.data_options(e)),g=!1;if(Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type)&&d(b.target).is("a"))return!1;if(/mouse/i.test(b.type)&&c.ie_touch(b))return!1;if(e.hasClass("open"))Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type)&&b.preventDefault(),c.hide(e);else{if(f.disable_for_touch&&Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type))return;!f.disable_for_touch&&Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type)&&(b.preventDefault(),d(f.tooltip_class+".open").hide(),g=!0),/enter|over/i.test(b.type)?this.timer=setTimeout(function(){c.showTip(e)}.bind(this),c.settings.hover_delay):"mouseout"===b.type||"mouseleave"===b.type?(clearTimeout(this.timer),c.hide(e)):c.showTip(e)}}).on("mouseleave.fndtn.tooltip touchstart.fndtn.tooltip MSPointerDown.fndtn.tooltip","["+this.attr_name()+"].open",function(b){return/mouse/i.test(b.type)&&c.ie_touch(b)?!1:void(("touch"!=a(this).data("tooltip-open-event-type")||"mouseleave"!=b.type)&&("mouse"==a(this).data("tooltip-open-event-type")&&/MSPointerDown|touchstart/i.test(b.type)?c.convert_to_touch(a(this)):c.hide(a(this))))}).on("DOMNodeRemoved DOMAttrModified","["+this.attr_name()+"]:not(a)",function(){c.hide(d(this))})},ie_touch:function(){return!1},showTip:function(a){var b=this.getTip(a);return this.should_show(a,b)?this.show(a):void 0},getTip:function(b){var c=this.selector(b),d=a.extend({},this.settings,this.data_options(b)),e=null;return c&&(e=this.S('span[data-selector="'+c+'"]'+d.tooltip_class)),"object"==typeof e?e:!1},selector:function(a){var b=a.attr("id"),c=a.attr(this.attr_name())||a.attr("data-selector");return(b&&b.length<1||!b)&&"string"!=typeof c&&(c=this.random_str(6),a.attr("data-selector",c).attr("aria-describedby",c)),b&&b.length>0?b:c},create:function(c){var d=this,e=a.extend({},this.settings,this.data_options(c)),f=this.settings.tip_template;"string"==typeof e.tip_template&&b.hasOwnProperty(e.tip_template)&&(f=b[e.tip_template]);var g=a(f(this.selector(c),a("
              ").html(c.attr("title")).html())),h=this.inheritable_classes(c);g.addClass(h).appendTo(e.append_to),Modernizr.touch&&(g.append(''+e.touch_close_text+""),g.on("touchstart.fndtn.tooltip MSPointerDown.fndtn.tooltip",function(){d.hide(c)})),c.removeAttr("title").attr("title","")},reposition:function(b,c,d){var e,f,g,h,i;if(c.css("visibility","hidden").show(),e=b.data("width"),f=c.children(".nub"),g=f.outerHeight(),h=f.outerHeight(),c.css(this.small()?{width:"100%"}:{width:e?e:"auto"}),i=function(a,b,c,d,e){return a.css({top:b?b:"auto",bottom:d?d:"auto",left:e?e:"auto",right:c?c:"auto"}).end()},i(c,b.offset().top+b.outerHeight()+10,"auto","auto",b.offset().left),this.small())i(c,b.offset().top+b.outerHeight()+10,"auto","auto",12.5,a(this.scope).width()),c.addClass("tip-override"),i(f,-g,"auto","auto",b.offset().left);else{var j=b.offset().left;Foundation.rtl&&(f.addClass("rtl"),j=b.offset().left+b.outerWidth()-c.outerWidth()),i(c,b.offset().top+b.outerHeight()+10,"auto","auto",j),c.removeClass("tip-override"),d&&d.indexOf("tip-top")>-1?(Foundation.rtl&&f.addClass("rtl"),i(c,b.offset().top-c.outerHeight(),"auto","auto",j).removeClass("tip-override")):d&&d.indexOf("tip-left")>-1?(i(c,b.offset().top+b.outerHeight()/2-c.outerHeight()/2,"auto","auto",b.offset().left-c.outerWidth()-g).removeClass("tip-override"),f.removeClass("rtl")):d&&d.indexOf("tip-right")>-1&&(i(c,b.offset().top+b.outerHeight()/2-c.outerHeight()/2,"auto","auto",b.offset().left+b.outerWidth()+g).removeClass("tip-override"),f.removeClass("rtl"))}c.css("visibility","visible").hide()},small:function(){return matchMedia(Foundation.media_queries.small).matches&&!matchMedia(Foundation.media_queries.medium).matches},inheritable_classes:function(b){var c=a.extend({},this.settings,this.data_options(b)),d=["tip-top","tip-left","tip-bottom","tip-right","radius","round"].concat(c.additional_inheritable_classes),e=b.attr("class"),f=e?a.map(e.split(" "),function(b){return-1!==a.inArray(b,d)?b:void 0}).join(" "):"";return a.trim(f)},convert_to_touch:function(b){var c=this,d=c.getTip(b),e=a.extend({},c.settings,c.data_options(b));0===d.find(".tap-to-close").length&&(d.append(''+e.touch_close_text+""),d.on("click.fndtn.tooltip.tapclose touchstart.fndtn.tooltip.tapclose MSPointerDown.fndtn.tooltip.tapclose",function(){c.hide(b)})),b.data("tooltip-open-event-type","touch")},show:function(a){var b=this.getTip(a);"touch"==a.data("tooltip-open-event-type")&&this.convert_to_touch(a),this.reposition(a,b,a.attr("class")),a.addClass("open"),b.fadeIn(150)},hide:function(a){var b=this.getTip(a);b.fadeOut(150,function(){b.find(".tap-to-close").remove(),b.off("click.fndtn.tooltip.tapclose MSPointerDown.fndtn.tapclose"),a.removeClass("open")})},off:function(){var b=this;this.S(this.scope).off(".fndtn.tooltip"),this.S(this.settings.tooltip_class).each(function(c){a("["+b.attr_name()+"]").eq(c).attr("title",a(this).text())}).remove()},reflow:function(){}}}(jQuery,window,window.document),function(a,b,c){"use strict";Foundation.libs.topbar={name:"topbar",version:"5.4.6",settings:{index:0,sticky_class:"sticky",custom_back_text:!0,back_text:"Back",mobile_show_parent_link:!0,is_hover:!0,scrolltop:!0,sticky_on:"all"},init:function(b,c,d){Foundation.inherit(this,"add_custom_rule register_media throttle");var e=this;e.register_media("topbar","foundation-mq-topbar"),this.bindings(c,d),e.S("["+this.attr_name()+"]",this.scope).each(function(){{var b=a(this),c=b.data(e.attr_name(!0)+"-init");e.S("section, .top-bar-section",this)}b.data("index",0);var d=b.parent();d.hasClass("fixed")||e.is_sticky(b,d,c)?(e.settings.sticky_class=c.sticky_class,e.settings.sticky_topbar=b,b.data("height",d.outerHeight()),b.data("stickyoffset",d.offset().top)):b.data("height",b.outerHeight()),c.assembled||e.assemble(b),c.is_hover?e.S(".has-dropdown",b).addClass("not-click"):e.S(".has-dropdown",b).removeClass("not-click"),e.add_custom_rule(".f-topbar-fixed { padding-top: "+b.data("height")+"px }"),d.hasClass("fixed")&&e.S("body").addClass("f-topbar-fixed")})},is_sticky:function(a,b,c){var d=b.hasClass(c.sticky_class);return d&&"all"===c.sticky_on?!0:d&&this.small()&&"small"===c.sticky_on?matchMedia(Foundation.media_queries.small).matches&&!matchMedia(Foundation.media_queries.medium).matches&&!matchMedia(Foundation.media_queries.large).matches:d&&this.medium()&&"medium"===c.sticky_on?matchMedia(Foundation.media_queries.small).matches&&matchMedia(Foundation.media_queries.medium).matches&&!matchMedia(Foundation.media_queries.large).matches:d&&this.large()&&"large"===c.sticky_on?matchMedia(Foundation.media_queries.small).matches&&matchMedia(Foundation.media_queries.medium).matches&&matchMedia(Foundation.media_queries.large).matches:!1},toggle:function(c){var d,e=this;d=c?e.S(c).closest("["+this.attr_name()+"]"):e.S("["+this.attr_name()+"]");var f=d.data(this.attr_name(!0)+"-init"),g=e.S("section, .top-bar-section",d);e.breakpoint()&&(e.rtl?(g.css({right:"0%"}),a(">.name",g).css({right:"100%"})):(g.css({left:"0%"}),a(">.name",g).css({left:"100%"})),e.S("li.moved",g).removeClass("moved"),d.data("index",0),d.toggleClass("expanded").css("height","")),f.scrolltop?d.hasClass("expanded")?d.parent().hasClass("fixed")&&(f.scrolltop?(d.parent().removeClass("fixed"),d.addClass("fixed"),e.S("body").removeClass("f-topbar-fixed"),b.scrollTo(0,0)):d.parent().removeClass("expanded")):d.hasClass("fixed")&&(d.parent().addClass("fixed"),d.removeClass("fixed"),e.S("body").addClass("f-topbar-fixed")):(e.is_sticky(d,d.parent(),f)&&d.parent().addClass("fixed"),d.parent().hasClass("fixed")&&(d.hasClass("expanded")?(d.addClass("fixed"),d.parent().addClass("expanded"),e.S("body").addClass("f-topbar-fixed")):(d.removeClass("fixed"),d.parent().removeClass("expanded"),e.update_sticky_positioning())))},timer:null,events:function(){var c=this,d=this.S;d(this.scope).off(".topbar").on("click.fndtn.topbar","["+this.attr_name()+"] .toggle-topbar",function(a){a.preventDefault(),c.toggle(this)}).on("click.fndtn.topbar",'.top-bar .top-bar-section li a[href^="#"],['+this.attr_name()+'] .top-bar-section li a[href^="#"]',function(){var b=a(this).closest("li");!c.breakpoint()||b.hasClass("back")||b.hasClass("has-dropdown")||c.toggle()}).on("click.fndtn.topbar","["+this.attr_name()+"] li.has-dropdown",function(b){var e=d(this),f=d(b.target),g=e.closest("["+c.attr_name()+"]"),h=g.data(c.attr_name(!0)+"-init");return f.data("revealId")?void c.toggle():void(c.breakpoint()||(!h.is_hover||Modernizr.touch)&&(b.stopImmediatePropagation(),e.hasClass("hover")?(e.removeClass("hover").find("li").removeClass("hover"),e.parents("li.hover").removeClass("hover")):(e.addClass("hover"),a(e).siblings().removeClass("hover"),"A"===f[0].nodeName&&f.parent().hasClass("has-dropdown")&&b.preventDefault())))}).on("click.fndtn.topbar","["+this.attr_name()+"] .has-dropdown>a",function(a){if(c.breakpoint()){a.preventDefault();var b=d(this),e=b.closest("["+c.attr_name()+"]"),f=e.find("section, .top-bar-section"),g=(b.next(".dropdown").outerHeight(),b.closest("li"));e.data("index",e.data("index")+1),g.addClass("moved"),c.rtl?(f.css({right:-(100*e.data("index"))+"%"}),f.find(">.name").css({right:100*e.data("index")+"%"})):(f.css({left:-(100*e.data("index"))+"%"}),f.find(">.name").css({left:100*e.data("index")+"%"})),e.css("height",b.siblings("ul").outerHeight(!0)+e.data("height"))}}),d(b).off(".topbar").on("resize.fndtn.topbar",c.throttle(function(){c.resize.call(c)},50)).trigger("resize").trigger("resize.fndtn.topbar").load(function(){d(this).trigger("resize.fndtn.topbar")}),d("body").off(".topbar").on("click.fndtn.topbar",function(a){var b=d(a.target).closest("li").closest("li.hover");b.length>0||d("["+c.attr_name()+"] li.hover").removeClass("hover")}),d(this.scope).on("click.fndtn.topbar","["+this.attr_name()+"] .has-dropdown .back",function(a){a.preventDefault();var b=d(this),e=b.closest("["+c.attr_name()+"]"),f=e.find("section, .top-bar-section"),g=(e.data(c.attr_name(!0)+"-init"),b.closest("li.moved")),h=g.parent();e.data("index",e.data("index")-1),c.rtl?(f.css({right:-(100*e.data("index"))+"%"}),f.find(">.name").css({right:100*e.data("index")+"%"})):(f.css({left:-(100*e.data("index"))+"%"}),f.find(">.name").css({left:100*e.data("index")+"%"})),0===e.data("index")?e.css("height",""):e.css("height",h.outerHeight(!0)+e.data("height")),setTimeout(function(){g.removeClass("moved")},300)}),d(this.scope).find(".dropdown a").focus(function(){a(this).parents(".has-dropdown").addClass("hover")}).blur(function(){a(this).parents(".has-dropdown").removeClass("hover")})},resize:function(){var a=this;a.S("["+this.attr_name()+"]").each(function(){var b,d=a.S(this),e=d.data(a.attr_name(!0)+"-init"),f=d.parent("."+a.settings.sticky_class);if(!a.breakpoint()){var g=d.hasClass("expanded");d.css("height","").removeClass("expanded").find("li").removeClass("hover"),g&&a.toggle(d)}a.is_sticky(d,f,e)&&(f.hasClass("fixed")?(f.removeClass("fixed"),b=f.offset().top,a.S(c.body).hasClass("f-topbar-fixed")&&(b-=d.data("height")),d.data("stickyoffset",b),f.addClass("fixed")):(b=f.offset().top,d.data("stickyoffset",b)))})},breakpoint:function(){return!matchMedia(Foundation.media_queries.topbar).matches},small:function(){return matchMedia(Foundation.media_queries.small).matches},medium:function(){return matchMedia(Foundation.media_queries.medium).matches},large:function(){return matchMedia(Foundation.media_queries.large).matches},assemble:function(b){var c=this,d=b.data(this.attr_name(!0)+"-init"),e=c.S("section, .top-bar-section",b);e.detach(),c.S(".has-dropdown>a",e).each(function(){var b,e=c.S(this),f=e.siblings(".dropdown"),g=e.attr("href");f.find(".title.back").length||(b=a(1==d.mobile_show_parent_link&&g?'
            3. '+e.html()+"
              4. ":'
            4. '),a("h5>a",b).html(1==d.custom_back_text?d.back_text:"« "+e.html()),f.prepend(b))}),e.appendTo(b),this.sticky(),this.assembled(b)},assembled:function(b){b.data(this.attr_name(!0),a.extend({},b.data(this.attr_name(!0)),{assembled:!0}))},height:function(b){var c=0,d=this;return a("> li",b).each(function(){c+=d.S(this).outerHeight(!0)}),c},sticky:function(){var a=this;this.S(b).on("scroll",function(){a.update_sticky_positioning() -})},update_sticky_positioning:function(){var a="."+this.settings.sticky_class,c=this.S(b),d=this;if(d.settings.sticky_topbar&&d.is_sticky(this.settings.sticky_topbar,this.settings.sticky_topbar.parent(),this.settings)){var e=this.settings.sticky_topbar.data("stickyoffset");d.S(a).hasClass("expanded")||(c.scrollTop()>e?d.S(a).hasClass("fixed")||(d.S(a).addClass("fixed"),d.S("body").addClass("f-topbar-fixed")):c.scrollTop()<=e&&d.S(a).hasClass("fixed")&&(d.S(a).removeClass("fixed"),d.S("body").removeClass("f-topbar-fixed")))}},off:function(){this.S(this.scope).off(".fndtn.topbar"),this.S(b).off(".fndtn.topbar")},reflow:function(){}}}(jQuery,window,window.document); \ No newline at end of file +var c=b.delta_x<0?r+1:r-1;b.active=!0,p._goto(c)}}}).on("touchend.fndtn.orbit",function(a){j.data("swipe-transition",{}),a.stopPropagation()}),j.on("mouseenter.fndtn.orbit",function(){f.timer&&f.pause_on_hover&&p.stop_timer()}).on("mouseleave.fndtn.orbit",function(){f.timer&&f.resume_on_mouseout&&o.start()}),a(c).on("click","[data-orbit-link]",p.link_custom),a(b).on("load resize",p.compute_dimensions),Foundation.utils.image_loaded(this.slides().children("img"),p.compute_dimensions),Foundation.utils.image_loaded(this.slides().children("img"),function(){j.prev("."+f.preloader_class).css("display","none"),p.update_slide_number(0),p.update_active_link(0),q.trigger("ready.fndtn.orbit")})},p.init()},g=function(a,b,c){var d,e,f=this,g=b.timer_speed,h=a.find("."+b.timer_progress_class),i=-1;this.update_progress=function(a){var b=h.clone();b.attr("style",""),b.css("width",a+"%"),h.replaceWith(b),h=b},this.restart=function(){clearTimeout(e),a.addClass(b.timer_paused_class),i=-1,f.update_progress(0)},this.start=function(){return a.hasClass(b.timer_paused_class)?(i=-1===i?g:i,a.removeClass(b.timer_paused_class),d=(new Date).getTime(),h.animate({width:"100%"},i,"linear"),e=setTimeout(function(){f.restart(),c()},i),void a.trigger("timer-started.fndtn.orbit")):!0},this.stop=function(){if(a.hasClass(b.timer_paused_class))return!0;clearTimeout(e),a.addClass(b.timer_paused_class);var c=(new Date).getTime();i-=c-d;var h=100-i/g*100;f.update_progress(h),a.trigger("timer-stopped.fndtn.orbit")}},h=function(b){var c=b.animation_speed,d=1===a("html[dir=rtl]").length,e=d?"marginRight":"marginLeft",f={};f[e]="0%",this.next=function(a,b,d){a.animate({marginLeft:"-100%"},c),b.animate(f,c,function(){a.css(e,"100%"),d()})},this.prev=function(a,b,d){a.animate({marginLeft:"100%"},c),b.css(e,"-100%"),b.animate(f,c,function(){a.css(e,"100%"),d()})}},i=function(b){{var c=b.animation_speed;1===a("html[dir=rtl]").length}this.next=function(a,b,d){b.css({margin:"0%",opacity:"0.01"}),b.animate({opacity:"1"},c,"linear",function(){a.css("margin","100%"),d()})},this.prev=function(a,b,d){b.css({margin:"0%",opacity:"0.01"}),b.animate({opacity:"1"},c,"linear",function(){a.css("margin","100%"),d()})}};Foundation.libs=Foundation.libs||{},Foundation.libs.orbit={name:"orbit",version:"5.4.6",settings:{animation:"slide",timer_speed:1e4,pause_on_hover:!0,resume_on_mouseout:!1,next_on_click:!0,animation_speed:500,stack_on_small:!1,navigation_arrows:!0,slide_number:!0,slide_number_text:"of",container_class:"orbit-container",stack_on_small_class:"orbit-stack-on-small",next_class:"orbit-next",prev_class:"orbit-prev",timer_container_class:"orbit-timer",timer_paused_class:"paused",timer_progress_class:"orbit-progress",slides_container_class:"orbit-slides-container",preloader_class:"preloader",slide_selector:"*",bullets_container_class:"orbit-bullets",bullets_active_class:"active",slide_number_class:"orbit-slide-number",caption_class:"orbit-caption",active_slide_class:"active",orbit_transition_class:"orbit-transitioning",bullets:!0,circular:!0,timer:!0,variable_height:!1,swipe:!0,before_slide_change:e,after_slide_change:e},init:function(a,b,c){this.bindings(b,c)},events:function(a){var b=new f(this.S(a),this.S(a).data("orbit-init"));this.S(a).data(this.name+"-instance",b)},reflow:function(){var a=this;if(a.S(a.scope).is("[data-orbit]")){var b=a.S(a.scope),c=b.data(a.name+"-instance");c.compute_dimensions()}else a.S("[data-orbit]",a.scope).each(function(b,c){var d=a.S(c),e=(a.data_options(d),d.data(a.name+"-instance"));e.compute_dimensions()})}}}(jQuery,window,window.document),function(a,b,c,d){"use strict";function e(a){var b=/fade/i.test(a),c=/pop/i.test(a);return{animate:b||c,pop:c,fade:b}}Foundation.libs.reveal={name:"reveal",version:"5.4.6",locked:!1,settings:{animation:"fadeAndPop",animation_speed:250,close_on_background_click:!0,close_on_esc:!0,dismiss_modal_class:"close-reveal-modal",bg_class:"reveal-modal-bg",root_element:"body",open:function(){},opened:function(){},close:function(){},closed:function(){},bg:a(".reveal-modal-bg"),css:{open:{opacity:0,visibility:"visible",display:"block"},close:{opacity:1,visibility:"hidden",display:"none"}}},init:function(b,c,d){a.extend(!0,this.settings,c,d),this.bindings(c,d)},events:function(){var a=this,b=a.S;return b(this.scope).off(".reveal").on("click.fndtn.reveal","["+this.add_namespace("data-reveal-id")+"]:not([disabled])",function(c){if(c.preventDefault(),!a.locked){var d=b(this),e=d.data(a.data_attr("reveal-ajax"));if(a.locked=!0,"undefined"==typeof e)a.open.call(a,d);else{var f=e===!0?d.attr("href"):e;a.open.call(a,d,{url:f})}}}),b(c).on("click.fndtn.reveal",this.close_targets(),function(c){if(c.preventDefault(),!a.locked){var d=b("["+a.attr_name()+"].open").data(a.attr_name(!0)+"-init"),e=b(c.target)[0]===b("."+d.bg_class)[0];if(e){if(!d.close_on_background_click)return;c.stopPropagation()}a.locked=!0,a.close.call(a,e?b("["+a.attr_name()+"].open"):b(this).closest("["+a.attr_name()+"]"))}}),b("["+a.attr_name()+"]",this.scope).length>0?b(this.scope).on("open.fndtn.reveal",this.settings.open).on("opened.fndtn.reveal",this.settings.opened).on("opened.fndtn.reveal",this.open_video).on("close.fndtn.reveal",this.settings.close).on("closed.fndtn.reveal",this.settings.closed).on("closed.fndtn.reveal",this.close_video):b(this.scope).on("open.fndtn.reveal","["+a.attr_name()+"]",this.settings.open).on("opened.fndtn.reveal","["+a.attr_name()+"]",this.settings.opened).on("opened.fndtn.reveal","["+a.attr_name()+"]",this.open_video).on("close.fndtn.reveal","["+a.attr_name()+"]",this.settings.close).on("closed.fndtn.reveal","["+a.attr_name()+"]",this.settings.closed).on("closed.fndtn.reveal","["+a.attr_name()+"]",this.close_video),!0},key_up_on:function(){var a=this;return a.S("body").off("keyup.fndtn.reveal").on("keyup.fndtn.reveal",function(b){var c=a.S("["+a.attr_name()+"].open"),d=c.data(a.attr_name(!0)+"-init")||a.settings;d&&27===b.which&&d.close_on_esc&&!a.locked&&a.close.call(a,c)}),!0},key_up_off:function(){return this.S("body").off("keyup.fndtn.reveal"),!0},open:function(c,d){var e,f=this;c?"undefined"!=typeof c.selector?e=f.S("#"+c.data(f.data_attr("reveal-id"))).first():(e=f.S(this.scope),d=c):e=f.S(this.scope);var g=e.data(f.attr_name(!0)+"-init");if(g=g||this.settings,e.hasClass("open")&&c.attr("data-reveal-id")==e.attr("id"))return f.close(e);if(!e.hasClass("open")){var h=f.S("["+f.attr_name()+"].open");if("undefined"==typeof e.data("css-top")&&e.data("css-top",parseInt(e.css("top"),10)).data("offset",this.cache_offset(e)),this.key_up_on(e),e.trigger("open").trigger("open.fndtn.reveal"),h.length<1&&this.toggle_bg(e,!0),"string"==typeof d&&(d={url:d}),"undefined"!=typeof d&&d.url){var i="undefined"!=typeof d.success?d.success:null;a.extend(d,{success:function(b,c,d){a.isFunction(i)&&i(b,c,d),e.html(b),f.S(e).foundation("section","reflow"),f.S(e).children().foundation(),h.length>0&&f.hide(h,g.css.close),f.show(e,g.css.open)}}),a.ajax(d)}else h.length>0&&this.hide(h,g.css.close),this.show(e,g.css.open)}f.S(b).trigger("resize")},close:function(a){var a=a&&a.length?a:this.S(this.scope),b=this.S("["+this.attr_name()+"].open"),c=a.data(this.attr_name(!0)+"-init")||this.settings;b.length>0&&(this.locked=!0,this.key_up_off(a),a.trigger("close").trigger("close.fndtn.reveal"),this.toggle_bg(a,!1),this.hide(b,c.css.close,c))},close_targets:function(){var a="."+this.settings.dismiss_modal_class;return this.settings.close_on_background_click?a+", ."+this.settings.bg_class:a},toggle_bg:function(b,c){0===this.S("."+this.settings.bg_class).length&&(this.settings.bg=a("
              ",{"class":this.settings.bg_class}).appendTo("body").hide());var e=this.settings.bg.filter(":visible").length>0;c!=e&&((c==d?e:!c)?this.hide(this.settings.bg):this.show(this.settings.bg))},show:function(c,d){if(d){var f=c.data(this.attr_name(!0)+"-init")||this.settings,g=f.root_element;if(0===c.parent(g).length){var h=c.wrap('
              ').parent();c.on("closed.fndtn.reveal.wrapped",function(){c.detach().appendTo(h),c.unwrap().unbind("closed.fndtn.reveal.wrapped")}),c.detach().appendTo(g)}var i=e(f.animation);if(i.animate||(this.locked=!1),i.pop){d.top=a(b).scrollTop()-c.data("offset")+"px";var j={top:a(b).scrollTop()+c.data("css-top")+"px",opacity:1};return setTimeout(function(){return c.css(d).animate(j,f.animation_speed,"linear",function(){this.locked=!1,c.trigger("opened").trigger("opened.fndtn.reveal")}.bind(this)).addClass("open")}.bind(this),f.animation_speed/2)}if(i.fade){d.top=a(b).scrollTop()+c.data("css-top")+"px";var j={opacity:1};return setTimeout(function(){return c.css(d).animate(j,f.animation_speed,"linear",function(){this.locked=!1,c.trigger("opened").trigger("opened.fndtn.reveal")}.bind(this)).addClass("open")}.bind(this),f.animation_speed/2)}return c.css(d).show().css({opacity:1}).addClass("open").trigger("opened").trigger("opened.fndtn.reveal")}var f=this.settings;return e(f.animation).fade?c.fadeIn(f.animation_speed/2):(this.locked=!1,c.show())},hide:function(c,d){if(d){var f=c.data(this.attr_name(!0)+"-init");f=f||this.settings;var g=e(f.animation);if(g.animate||(this.locked=!1),g.pop){var h={top:-a(b).scrollTop()-c.data("offset")+"px",opacity:0};return setTimeout(function(){return c.animate(h,f.animation_speed,"linear",function(){this.locked=!1,c.css(d).trigger("closed").trigger("closed.fndtn.reveal")}.bind(this)).removeClass("open")}.bind(this),f.animation_speed/2)}if(g.fade){var h={opacity:0};return setTimeout(function(){return c.animate(h,f.animation_speed,"linear",function(){this.locked=!1,c.css(d).trigger("closed").trigger("closed.fndtn.reveal")}.bind(this)).removeClass("open")}.bind(this),f.animation_speed/2)}return c.hide().css(d).removeClass("open").trigger("closed").trigger("closed.fndtn.reveal")}var f=this.settings;return e(f.animation).fade?c.fadeOut(f.animation_speed/2):c.hide()},close_video:function(b){var c=a(".flex-video",b.target),d=a("iframe",c);d.length>0&&(d.attr("data-src",d[0].src),d.attr("src",d.attr("src")),c.hide())},open_video:function(b){var c=a(".flex-video",b.target),e=c.find("iframe");if(e.length>0){var f=e.attr("data-src");if("string"==typeof f)e[0].src=e.attr("data-src");else{var g=e[0].src;e[0].src=d,e[0].src=g}c.show()}},data_attr:function(a){return this.namespace.length>0?this.namespace+"-"+a:a},cache_offset:function(a){var b=a.show().height()+parseInt(a.css("top"),10);return a.hide(),b},off:function(){a(this.scope).off(".fndtn.reveal")},reflow:function(){}}}(jQuery,window,window.document),function(a,b){"use strict";Foundation.libs.slider={name:"slider",version:"5.4.6",settings:{start:0,end:100,step:1,initial:null,display_selector:"",vertical:!1,on_change:function(){}},cache:{},init:function(a,b,c){Foundation.inherit(this,"throttle"),this.bindings(b,c),this.reflow()},events:function(){var c=this;a(this.scope).off(".slider").on("mousedown.fndtn.slider touchstart.fndtn.slider pointerdown.fndtn.slider","["+c.attr_name()+"]:not(.disabled, [disabled]) .range-slider-handle",function(b){c.cache.active||(b.preventDefault(),c.set_active_slider(a(b.target)))}).on("mousemove.fndtn.slider touchmove.fndtn.slider pointermove.fndtn.slider",function(d){if(c.cache.active)if(d.preventDefault(),a.data(c.cache.active[0],"settings").vertical){var e=0;d.pageY||(e=b.scrollY),c.calculate_position(c.cache.active,(d.pageY||d.originalEvent.clientY||d.originalEvent.touches[0].clientY||d.currentPoint.y)+e)}else c.calculate_position(c.cache.active,d.pageX||d.originalEvent.clientX||d.originalEvent.touches[0].clientX||d.currentPoint.x)}).on("mouseup.fndtn.slider touchend.fndtn.slider pointerup.fndtn.slider",function(){c.remove_active_slider()}).on("change.fndtn.slider",function(){c.settings.on_change()}),c.S(b).on("resize.fndtn.slider",c.throttle(function(){c.reflow()},300))},set_active_slider:function(a){this.cache.active=a},remove_active_slider:function(){this.cache.active=null},calculate_position:function(b,c){var d=this,e=a.data(b[0],"settings"),f=(a.data(b[0],"handle_l"),a.data(b[0],"handle_o"),a.data(b[0],"bar_l")),g=a.data(b[0],"bar_o");requestAnimationFrame(function(){var a;a=Foundation.rtl&&!e.vertical?d.limit_to((g+f-c)/f,0,1):d.limit_to((c-g)/f,0,1),a=e.vertical?1-a:a;var h=d.normalized_value(a,e.start,e.end,e.step);d.set_ui(b,h)})},set_ui:function(b,c){var d=a.data(b[0],"settings"),e=a.data(b[0],"handle_l"),f=a.data(b[0],"bar_l"),g=this.normalized_percentage(c,d.start,d.end),h=g*(f-e)-1,i=100*g;Foundation.rtl&&!d.vertical&&(h=-h),h=d.vertical?-h+f-e+1:h,this.set_translate(b,h,d.vertical),d.vertical?b.siblings(".range-slider-active-segment").css("height",i+"%"):b.siblings(".range-slider-active-segment").css("width",i+"%"),b.parent().attr(this.attr_name(),c).trigger("change").trigger("change.fndtn.slider"),b.parent().children("input[type=hidden]").val(c),b[0].hasAttribute("aria-valuemin")||b.attr({"aria-valuemin":d.start,"aria-valuemax":d.end}),b.attr("aria-valuenow",c),""!=d.display_selector&&a(d.display_selector).each(function(){this.hasOwnProperty("value")?a(this).val(c):a(this).text(c)})},normalized_percentage:function(a,b,c){return Math.min(1,(a-b)/(c-b))},normalized_value:function(a,b,c,d){var e=c-b,f=a*e,g=(f-f%d)/d,h=f%d,i=h>=.5*d?d:0;return g*d+i+b},set_translate:function(b,c,d){d?a(b).css("-webkit-transform","translateY("+c+"px)").css("-moz-transform","translateY("+c+"px)").css("-ms-transform","translateY("+c+"px)").css("-o-transform","translateY("+c+"px)").css("transform","translateY("+c+"px)"):a(b).css("-webkit-transform","translateX("+c+"px)").css("-moz-transform","translateX("+c+"px)").css("-ms-transform","translateX("+c+"px)").css("-o-transform","translateX("+c+"px)").css("transform","translateX("+c+"px)")},limit_to:function(a,b,c){return Math.min(Math.max(a,b),c)},initialize_settings:function(b){var c=a.extend({},this.settings,this.data_options(a(b).parent()));c.vertical?(a.data(b,"bar_o",a(b).parent().offset().top),a.data(b,"bar_l",a(b).parent().outerHeight()),a.data(b,"handle_o",a(b).offset().top),a.data(b,"handle_l",a(b).outerHeight())):(a.data(b,"bar_o",a(b).parent().offset().left),a.data(b,"bar_l",a(b).parent().outerWidth()),a.data(b,"handle_o",a(b).offset().left),a.data(b,"handle_l",a(b).outerWidth())),a.data(b,"bar",a(b).parent()),a.data(b,"settings",c)},set_initial_position:function(b){var c=a.data(b.children(".range-slider-handle")[0],"settings"),d=c.initial?c.initial:Math.floor(.5*(c.end-c.start)/c.step)*c.step+c.start,e=b.children(".range-slider-handle");this.set_ui(e,d)},set_value:function(b){var c=this;a("["+c.attr_name()+"]",this.scope).each(function(){a(this).attr(c.attr_name(),b)}),a(this.scope).attr(c.attr_name())&&a(this.scope).attr(c.attr_name(),b),c.reflow()},reflow:function(){var b=this;b.S("["+this.attr_name()+"]").each(function(){var c=a(this).children(".range-slider-handle")[0],d=a(this).attr(b.attr_name());b.initialize_settings(c),d?b.set_ui(a(c),parseFloat(d)):b.set_initial_position(a(this))})}}}(jQuery,window,window.document),function(a,b,c,d){"use strict";Foundation.libs.tab={name:"tab",version:"5.4.6",settings:{active_class:"active",callback:function(){},deep_linking:!1,scroll_to_content:!0,is_hover:!1},default_tab_hashes:[],init:function(a,b,c){var d=this,e=this.S;this.bindings(b,c),this.handle_location_hash_change(),e("["+this.attr_name()+"] > .active > a",this.scope).each(function(){d.default_tab_hashes.push(this.hash)})},events:function(){var a=this,c=this.S,d=function(b){var d=c(this).closest("["+a.attr_name()+"]").data(a.attr_name(!0)+"-init");(!d.is_hover||Modernizr.touch)&&(b.preventDefault(),b.stopPropagation(),a.toggle_active_tab(c(this).parent()))};c(this.scope).off(".tab").on("focus.fndtn.tab","["+this.attr_name()+"] > * > a",d).on("click.fndtn.tab","["+this.attr_name()+"] > * > a",d).on("mouseenter.fndtn.tab","["+this.attr_name()+"] > * > a",function(){var b=c(this).closest("["+a.attr_name()+"]").data(a.attr_name(!0)+"-init");b.is_hover&&a.toggle_active_tab(c(this).parent())}),c(b).on("hashchange.fndtn.tab",function(b){b.preventDefault(),a.handle_location_hash_change()})},handle_location_hash_change:function(){var b=this,c=this.S;c("["+this.attr_name()+"]",this.scope).each(function(){var e=c(this).data(b.attr_name(!0)+"-init");if(e.deep_linking){var f;if(f=e.scroll_to_content?b.scope.location.hash:b.scope.location.hash.replace("fndtn-",""),""!=f){var g=c(f);if(g.hasClass("content")&&g.parent().hasClass("tab-content"))b.toggle_active_tab(a("["+b.attr_name()+"] > * > a[href="+f+"]").parent());else{var h=g.closest(".content").attr("id");h!=d&&b.toggle_active_tab(a("["+b.attr_name()+"] > * > a[href=#"+h+"]").parent(),f)}}else for(var i=0;i * > a[href="+b.default_tab_hashes[i]+"]").parent())}})},toggle_active_tab:function(e,f){var g=this.S,h=e.closest("["+this.attr_name()+"]"),i=e.find("a"),j=e.children("a").first(),k="#"+j.attr("href").split("#")[1],l=g(k),m=e.siblings(),n=h.data(this.attr_name(!0)+"-init"),o=function(b){var d,e=a(this),f=a(this).parents("li").prev().children('[role="tab"]'),g=a(this).parents("li").next().children('[role="tab"]');switch(b.keyCode){case 37:d=f;break;case 39:d=g;break;default:d=!1}d.length&&(e.attr({tabindex:"-1","aria-selected":null}),d.attr({tabindex:"0","aria-selected":!0}).focus()),a('[role="tabpanel"]').attr("aria-hidden","true"),a("#"+a(c.activeElement).attr("href").substring(1)).attr("aria-hidden",null)};g(this).data(this.data_attr("tab-content"))&&(k="#"+g(this).data(this.data_attr("tab-content")).split("#")[1],l=g(k)),n.deep_linking&&(n.scroll_to_content?(b.location.hash=f||k,f==d||f==k?e.parent()[0].scrollIntoView():g(k)[0].scrollIntoView()):b.location.hash=f!=d?"fndtn-"+f.replace("#",""):"fndtn-"+k.replace("#","")),e.addClass(n.active_class).triggerHandler("opened"),i.attr({"aria-selected":"true",tabindex:0}),m.removeClass(n.active_class),m.find("a").attr({"aria-selected":"false",tabindex:-1}),l.siblings().removeClass(n.active_class).attr({"aria-hidden":"true",tabindex:-1}),l.addClass(n.active_class).attr("aria-hidden","false").removeAttr("tabindex"),n.callback(e),l.triggerHandler("toggled",[e]),h.triggerHandler("toggled",[l]),i.off("keydown").on("keydown",o)},data_attr:function(a){return this.namespace.length>0?this.namespace+"-"+a:a},off:function(){},reflow:function(){}}}(jQuery,window,window.document),function(a,b){"use strict";Foundation.libs.tooltip={name:"tooltip",version:"5.4.6",settings:{additional_inheritable_classes:[],tooltip_class:".tooltip",append_to:"body",touch_close_text:"Tap To Close",disable_for_touch:!1,hover_delay:0,show_on:"all",tip_template:function(a,b){return''+b+''}},cache:{},init:function(a,b,c){Foundation.inherit(this,"random_str"),this.bindings(b,c)},should_show:function(b){var c=a.extend({},this.settings,this.data_options(b));return"all"===c.show_on?!0:this.small()&&"small"===c.show_on?!0:this.medium()&&"medium"===c.show_on?!0:this.large()&&"large"===c.show_on?!0:!1},medium:function(){return matchMedia(Foundation.media_queries.medium).matches},large:function(){return matchMedia(Foundation.media_queries.large).matches},events:function(b){var c=this,d=c.S;c.create(this.S(b)),a(this.scope).off(".tooltip").on("mouseenter.fndtn.tooltip mouseleave.fndtn.tooltip touchstart.fndtn.tooltip MSPointerDown.fndtn.tooltip","["+this.attr_name()+"]",function(b){var e=d(this),f=a.extend({},c.settings,c.data_options(e)),g=!1;if(Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type)&&d(b.target).is("a"))return!1;if(/mouse/i.test(b.type)&&c.ie_touch(b))return!1;if(e.hasClass("open"))Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type)&&b.preventDefault(),c.hide(e);else{if(f.disable_for_touch&&Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type))return;!f.disable_for_touch&&Modernizr.touch&&/touchstart|MSPointerDown/i.test(b.type)&&(b.preventDefault(),d(f.tooltip_class+".open").hide(),g=!0),/enter|over/i.test(b.type)?this.timer=setTimeout(function(){c.showTip(e)}.bind(this),c.settings.hover_delay):"mouseout"===b.type||"mouseleave"===b.type?(clearTimeout(this.timer),c.hide(e)):c.showTip(e)}}).on("mouseleave.fndtn.tooltip touchstart.fndtn.tooltip MSPointerDown.fndtn.tooltip","["+this.attr_name()+"].open",function(b){return/mouse/i.test(b.type)&&c.ie_touch(b)?!1:void(("touch"!=a(this).data("tooltip-open-event-type")||"mouseleave"!=b.type)&&("mouse"==a(this).data("tooltip-open-event-type")&&/MSPointerDown|touchstart/i.test(b.type)?c.convert_to_touch(a(this)):c.hide(a(this))))}).on("DOMNodeRemoved DOMAttrModified","["+this.attr_name()+"]:not(a)",function(){c.hide(d(this))})},ie_touch:function(){return!1},showTip:function(a){var b=this.getTip(a);return this.should_show(a,b)?this.show(a):void 0},getTip:function(b){var c=this.selector(b),d=a.extend({},this.settings,this.data_options(b)),e=null;return c&&(e=this.S('span[data-selector="'+c+'"]'+d.tooltip_class)),"object"==typeof e?e:!1},selector:function(a){var b=a.attr("id"),c=a.attr(this.attr_name())||a.attr("data-selector");return(b&&b.length<1||!b)&&"string"!=typeof c&&(c=this.random_str(6),a.attr("data-selector",c).attr("aria-describedby",c)),b&&b.length>0?b:c},create:function(c){var d=this,e=a.extend({},this.settings,this.data_options(c)),f=this.settings.tip_template;"string"==typeof e.tip_template&&b.hasOwnProperty(e.tip_template)&&(f=b[e.tip_template]);var g=a(f(this.selector(c),a("
              ").html(c.attr("title")).html())),h=this.inheritable_classes(c);g.addClass(h).appendTo(e.append_to),Modernizr.touch&&(g.append(''+e.touch_close_text+""),g.on("touchstart.fndtn.tooltip MSPointerDown.fndtn.tooltip",function(){d.hide(c)})),c.removeAttr("title").attr("title","")},reposition:function(b,c,d){var e,f,g,h,i;if(c.css("visibility","hidden").show(),e=b.data("width"),f=c.children(".nub"),g=f.outerHeight(),h=f.outerHeight(),c.css(this.small()?{width:"100%"}:{width:e?e:"auto"}),i=function(a,b,c,d,e){return a.css({top:b?b:"auto",bottom:d?d:"auto",left:e?e:"auto",right:c?c:"auto"}).end()},i(c,b.offset().top+b.outerHeight()+10,"auto","auto",b.offset().left),this.small())i(c,b.offset().top+b.outerHeight()+10,"auto","auto",12.5,a(this.scope).width()),c.addClass("tip-override"),i(f,-g,"auto","auto",b.offset().left);else{var j=b.offset().left;Foundation.rtl&&(f.addClass("rtl"),j=b.offset().left+b.outerWidth()-c.outerWidth()),i(c,b.offset().top+b.outerHeight()+10,"auto","auto",j),c.removeClass("tip-override"),d&&d.indexOf("tip-top")>-1?(Foundation.rtl&&f.addClass("rtl"),i(c,b.offset().top-c.outerHeight(),"auto","auto",j).removeClass("tip-override")):d&&d.indexOf("tip-left")>-1?(i(c,b.offset().top+b.outerHeight()/2-c.outerHeight()/2,"auto","auto",b.offset().left-c.outerWidth()-g).removeClass("tip-override"),f.removeClass("rtl")):d&&d.indexOf("tip-right")>-1&&(i(c,b.offset().top+b.outerHeight()/2-c.outerHeight()/2,"auto","auto",b.offset().left+b.outerWidth()+g).removeClass("tip-override"),f.removeClass("rtl"))}c.css("visibility","visible").hide()},small:function(){return matchMedia(Foundation.media_queries.small).matches&&!matchMedia(Foundation.media_queries.medium).matches},inheritable_classes:function(b){var c=a.extend({},this.settings,this.data_options(b)),d=["tip-top","tip-left","tip-bottom","tip-right","radius","round"].concat(c.additional_inheritable_classes),e=b.attr("class"),f=e?a.map(e.split(" "),function(b){return-1!==a.inArray(b,d)?b:void 0}).join(" "):"";return a.trim(f)},convert_to_touch:function(b){var c=this,d=c.getTip(b),e=a.extend({},c.settings,c.data_options(b));0===d.find(".tap-to-close").length&&(d.append(''+e.touch_close_text+""),d.on("click.fndtn.tooltip.tapclose touchstart.fndtn.tooltip.tapclose MSPointerDown.fndtn.tooltip.tapclose",function(){c.hide(b)})),b.data("tooltip-open-event-type","touch")},show:function(a){var b=this.getTip(a);"touch"==a.data("tooltip-open-event-type")&&this.convert_to_touch(a),this.reposition(a,b,a.attr("class")),a.addClass("open"),b.fadeIn(150)},hide:function(a){var b=this.getTip(a);b.fadeOut(150,function(){b.find(".tap-to-close").remove(),b.off("click.fndtn.tooltip.tapclose MSPointerDown.fndtn.tapclose"),a.removeClass("open")})},off:function(){var b=this;this.S(this.scope).off(".fndtn.tooltip"),this.S(this.settings.tooltip_class).each(function(c){a("["+b.attr_name()+"]").eq(c).attr("title",a(this).text())}).remove()},reflow:function(){}}}(jQuery,window,window.document),function(a,b,c){"use strict";Foundation.libs.topbar={name:"topbar",version:"5.4.6",settings:{index:0,sticky_class:"sticky",custom_back_text:!0,back_text:"Back",mobile_show_parent_link:!0,is_hover:!0,scrolltop:!0,sticky_on:"all"},init:function(b,c,d){Foundation.inherit(this,"add_custom_rule register_media throttle");var e=this;e.register_media("topbar","foundation-mq-topbar"),this.bindings(c,d),e.S("["+this.attr_name()+"]",this.scope).each(function(){{var b=a(this),c=b.data(e.attr_name(!0)+"-init");e.S("section, .top-bar-section",this)}b.data("index",0);var d=b.parent();d.hasClass("fixed")||e.is_sticky(b,d,c)?(e.settings.sticky_class=c.sticky_class,e.settings.sticky_topbar=b,b.data("height",d.outerHeight()),b.data("stickyoffset",d.offset().top)):b.data("height",b.outerHeight()),c.assembled||e.assemble(b),c.is_hover?e.S(".has-dropdown",b).addClass("not-click"):e.S(".has-dropdown",b).removeClass("not-click"),e.add_custom_rule(".f-topbar-fixed { padding-top: "+b.data("height")+"px }"),d.hasClass("fixed")&&e.S("body").addClass("f-topbar-fixed")})},is_sticky:function(a,b,c){var d=b.hasClass(c.sticky_class);return d&&"all"===c.sticky_on?!0:d&&this.small()&&"small"===c.sticky_on?matchMedia(Foundation.media_queries.small).matches&&!matchMedia(Foundation.media_queries.medium).matches&&!matchMedia(Foundation.media_queries.large).matches:d&&this.medium()&&"medium"===c.sticky_on?matchMedia(Foundation.media_queries.small).matches&&matchMedia(Foundation.media_queries.medium).matches&&!matchMedia(Foundation.media_queries.large).matches:d&&this.large()&&"large"===c.sticky_on?matchMedia(Foundation.media_queries.small).matches&&matchMedia(Foundation.media_queries.medium).matches&&matchMedia(Foundation.media_queries.large).matches:!1},toggle:function(c){var d,e=this;d=c?e.S(c).closest("["+this.attr_name()+"]"):e.S("["+this.attr_name()+"]");var f=d.data(this.attr_name(!0)+"-init"),g=e.S("section, .top-bar-section",d);e.breakpoint()&&(e.rtl?(g.css({right:"0%"}),a(">.name",g).css({right:"100%"})):(g.css({left:"0%"}),a(">.name",g).css({left:"100%"})),e.S("li.moved",g).removeClass("moved"),d.data("index",0),d.toggleClass("expanded").css("height","")),f.scrolltop?d.hasClass("expanded")?d.parent().hasClass("fixed")&&(f.scrolltop?(d.parent().removeClass("fixed"),d.addClass("fixed"),e.S("body").removeClass("f-topbar-fixed"),b.scrollTo(0,0)):d.parent().removeClass("expanded")):d.hasClass("fixed")&&(d.parent().addClass("fixed"),d.removeClass("fixed"),e.S("body").addClass("f-topbar-fixed")):(e.is_sticky(d,d.parent(),f)&&d.parent().addClass("fixed"),d.parent().hasClass("fixed")&&(d.hasClass("expanded")?(d.addClass("fixed"),d.parent().addClass("expanded"),e.S("body").addClass("f-topbar-fixed")):(d.removeClass("fixed"),d.parent().removeClass("expanded"),e.update_sticky_positioning())))},timer:null,events:function(){var c=this,d=this.S;d(this.scope).off(".topbar").on("click.fndtn.topbar","["+this.attr_name()+"] .toggle-topbar",function(a){a.preventDefault(),c.toggle(this)}).on("click.fndtn.topbar",'.top-bar .top-bar-section li a[href^="#"],['+this.attr_name()+'] .top-bar-section li a[href^="#"]',function(){var b=a(this).closest("li");!c.breakpoint()||b.hasClass("back")||b.hasClass("has-dropdown")||c.toggle()}).on("click.fndtn.topbar","["+this.attr_name()+"] li.has-dropdown",function(b){var e=d(this),f=d(b.target),g=e.closest("["+c.attr_name()+"]"),h=g.data(c.attr_name(!0)+"-init");return f.data("revealId")?void c.toggle():void(c.breakpoint()||(!h.is_hover||Modernizr.touch)&&(b.stopImmediatePropagation(),e.hasClass("hover")?(e.removeClass("hover").find("li").removeClass("hover"),e.parents("li.hover").removeClass("hover")):(e.addClass("hover"),a(e).siblings().removeClass("hover"),"A"===f[0].nodeName&&f.parent().hasClass("has-dropdown")&&b.preventDefault())))}).on("click.fndtn.topbar","["+this.attr_name()+"] .has-dropdown>a",function(a){if(c.breakpoint()){a.preventDefault();var b=d(this),e=b.closest("["+c.attr_name()+"]"),f=e.find("section, .top-bar-section"),g=(b.next(".dropdown").outerHeight(),b.closest("li"));e.data("index",e.data("index")+1),g.addClass("moved"),c.rtl?(f.css({right:-(100*e.data("index"))+"%"}),f.find(">.name").css({right:100*e.data("index")+"%"})):(f.css({left:-(100*e.data("index"))+"%"}),f.find(">.name").css({left:100*e.data("index")+"%"})),e.css("height",b.siblings("ul").outerHeight(!0)+e.data("height"))}}),d(b).off(".topbar").on("resize.fndtn.topbar",c.throttle(function(){c.resize.call(c)},50)).trigger("resize").trigger("resize.fndtn.topbar").load(function(){d(this).trigger("resize.fndtn.topbar")}),d("body").off(".topbar").on("click.fndtn.topbar",function(a){var b=d(a.target).closest("li").closest("li.hover");b.length>0||d("["+c.attr_name()+"] li.hover").removeClass("hover")}),d(this.scope).on("click.fndtn.topbar","["+this.attr_name()+"] .has-dropdown .back",function(a){a.preventDefault();var b=d(this),e=b.closest("["+c.attr_name()+"]"),f=e.find("section, .top-bar-section"),g=(e.data(c.attr_name(!0)+"-init"),b.closest("li.moved")),h=g.parent();e.data("index",e.data("index")-1),c.rtl?(f.css({right:-(100*e.data("index"))+"%"}),f.find(">.name").css({right:100*e.data("index")+"%"})):(f.css({left:-(100*e.data("index"))+"%"}),f.find(">.name").css({left:100*e.data("index")+"%"})),0===e.data("index")?e.css("height",""):e.css("height",h.outerHeight(!0)+e.data("height")),setTimeout(function(){g.removeClass("moved")},300)}),d(this.scope).find(".dropdown a").focus(function(){a(this).parents(".has-dropdown").addClass("hover")}).blur(function(){a(this).parents(".has-dropdown").removeClass("hover")})},resize:function(){var a=this;a.S("["+this.attr_name()+"]").each(function(){var b,d=a.S(this),e=d.data(a.attr_name(!0)+"-init"),f=d.parent("."+a.settings.sticky_class);if(!a.breakpoint()){var g=d.hasClass("expanded");d.css("height","").removeClass("expanded").find("li").removeClass("hover"),g&&a.toggle(d)}a.is_sticky(d,f,e)&&(f.hasClass("fixed")?(f.removeClass("fixed"),b=f.offset().top,a.S(c.body).hasClass("f-topbar-fixed")&&(b-=d.data("height")),d.data("stickyoffset",b),f.addClass("fixed")):(b=f.offset().top,d.data("stickyoffset",b)))})},breakpoint:function(){return!matchMedia(Foundation.media_queries.topbar).matches},small:function(){return matchMedia(Foundation.media_queries.small).matches},medium:function(){return matchMedia(Foundation.media_queries.medium).matches},large:function(){return matchMedia(Foundation.media_queries.large).matches},assemble:function(b){var c=this,d=b.data(this.attr_name(!0)+"-init"),e=c.S("section, .top-bar-section",b);e.detach(),c.S(".has-dropdown>a",e).each(function(){var b,e=c.S(this),f=e.siblings(".dropdown"),g=e.attr("href");f.find(".title.back").length||(b=a(1==d.mobile_show_parent_link&&g?'
            6. '+e.html()+"
              7. ":'
            7. '),a("h5>a",b).html(1==d.custom_back_text?d.back_text:"« "+e.html()),f.prepend(b))}),e.appendTo(b),this.sticky(),this.assembled(b)},assembled:function(b){b.data(this.attr_name(!0),a.extend({},b.data(this.attr_name(!0)),{assembled:!0}))},height:function(b){var c=0,d=this;return a("> li",b).each(function(){c+=d.S(this).outerHeight(!0)}),c},sticky:function(){var a=this;this.S(b).on("scroll",function(){a.update_sticky_positioning() +})},update_sticky_positioning:function(){var a="."+this.settings.sticky_class,c=this.S(b),d=this;if(d.settings.sticky_topbar&&d.is_sticky(this.settings.sticky_topbar,this.settings.sticky_topbar.parent(),this.settings)){var e=this.settings.sticky_topbar.data("stickyoffset");d.S(a).hasClass("expanded")||(c.scrollTop()>e?d.S(a).hasClass("fixed")||(d.S(a).addClass("fixed"),d.S("body").addClass("f-topbar-fixed")):c.scrollTop()<=e&&d.S(a).hasClass("fixed")&&(d.S(a).removeClass("fixed"),d.S("body").removeClass("f-topbar-fixed")))}},off:function(){this.S(this.scope).off(".fndtn.topbar"),this.S(b).off(".fndtn.topbar")},reflow:function(){}}}(jQuery,window,window.document); From 84507a64cc04ad7415dcf4cd657ffd8d3e62de16 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 13 Nov 2014 18:10:31 +0100 Subject: [PATCH 18/56] Bug #3346: Show vCenter and Hybrid IPs in cloud view (cherry picked from commit d80a53a4fdf482060d154664e3aa66b05c9c0a91) --- .../public/js/plugins/provision-tab.js | 18 +---- src/sunstone/public/js/plugins/vms-tab.js | 65 ------------------- src/sunstone/public/js/sunstone.js | 60 +++++++++++++++++ 3 files changed, 61 insertions(+), 82 deletions(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index e93b37b738..d3808b8c0d 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -3324,23 +3324,7 @@ function get_provision_disk_image(data) { } function get_provision_ips(data) { - var nics = [] - if ($.isArray(data.TEMPLATE.NIC)) - nics = data.TEMPLATE.NIC - else if (!$.isEmptyObject(data.TEMPLATE.NIC)) - nics = [data.TEMPLATE.NIC] - - if (nics.length > 0) { - var ips = []; - $.each(nics, function(index, nic){ - if (nic.IP) - ips.push(nic.IP); - }) - - return ' ' + ips.join(', '); - } else { - return ' -'; - } + return ' ' + ip_str(data, " - "); } // @params diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 2d3ceff0bc..71dad7ff07 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -30,14 +30,6 @@ function loadVNC(){ } loadVNC(); -function calculate_isHybrid(vm_info){ - return vm_info.USER_TEMPLATE.HYPERVISOR && - (vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "vcenter" - || vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "ec2" - || vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "azure" - || vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "softlayer") -} - var VNCstates=[ tr("RUNNING"), tr("SHUTDOWN"), @@ -973,63 +965,6 @@ function str_start_time(vm){ return pretty_time(vm.STIME); }; - -// Return the IP or several IPs of a VM -function ip_str(vm){ - - var isHybrid = calculate_isHybrid(vm); - - if (isHybrid) - { - switch(vm.USER_TEMPLATE.HYPERVISOR.toLowerCase()) - { - case "vcenter": - ip = vm.TEMPLATE.GUEST_IP?vm.TEMPLATE.GUEST_IP:"--"; - break; - case "ec2": - ip = vm.TEMPLATE.IP_ADDRESS?vm.TEMPLATE.IP_ADDRESS:"--"; - break; - case "azure": - ip = vm.TEMPLATE.IPADDRESS?vm.TEMPLATE.IPADDRESS:"--"; - break; - case "softlayer": - ip = vm.TEMPLATE.PRIMARYIPADDRESS?vm.TEMPLATE.PRIMARYIPADDRESS:"--"; - break; - default: - ip = "--"; - } - } - else - { - var nic = vm.TEMPLATE.NIC; - - if (nic == undefined){ - return '--'; - } - - if (!$.isArray(nic)){ - nic = [nic]; - } - - ip = ''; - $.each(nic, function(index,value){ - if (value.IP){ - ip += value.IP+'
              '; - } - - if (value.IP6_GLOBAL){ - ip += value.IP6_GLOBAL+'
              '; - } - - if (value.IP6_ULA){ - ip += value.IP6_ULA+'
              '; - } - }); - } - - return ip; -}; - // Returns an array formed by the information contained in the vm_json // and ready to be introduced in a dataTable function vMachineElementArray(vm_json){ diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 31e0e212b3..14a9fb2259 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -6804,3 +6804,63 @@ function getInternetExplorerVersion(){ } return rv; } + +// Return true if the VM has a hybrid section +function calculate_isHybrid(vm_info){ + return vm_info.USER_TEMPLATE.HYPERVISOR && + (vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "vcenter" + || vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "ec2" + || vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "azure" + || vm_info.USER_TEMPLATE.HYPERVISOR.toLowerCase() == "softlayer") +} + +// Return the IP or several IPs of a VM +function ip_str(vm, divider){ + var divider = divider || "
              " + var isHybrid = calculate_isHybrid(vm); + var nic = vm.TEMPLATE.NIC; + + if (nic == undefined) { + if (isHybrid) { + switch(vm.USER_TEMPLATE.HYPERVISOR.toLowerCase()) { + case "vcenter": + ip = vm.TEMPLATE.GUEST_IP?vm.TEMPLATE.GUEST_IP:"--"; + break; + case "ec2": + ip = vm.TEMPLATE.IP_ADDRESS?vm.TEMPLATE.IP_ADDRESS:"--"; + break; + case "azure": + ip = vm.TEMPLATE.IPADDRESS?vm.TEMPLATE.IPADDRESS:"--"; + break; + case "softlayer": + ip = vm.TEMPLATE.PRIMARYIPADDRESS?vm.TEMPLATE.PRIMARYIPADDRESS:"--"; + break; + default: + ip = "--"; + } + } else { + return '--'; + } + } else { + if (!$.isArray(nic)){ + nic = [nic]; + } + + ip = ''; + $.each(nic, function(index,value){ + if (value.IP){ + ip += value.IP+divider; + } + + if (value.IP6_GLOBAL){ + ip += value.IP6_GLOBAL+divider; + } + + if (value.IP6_ULA){ + ip += value.IP6_ULA+divider; + } + }); + } + + return ip; +}; From b4f84e77a0a4c880cd471c334bdcf82123979be8 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 13 Nov 2014 23:22:49 +0100 Subject: [PATCH 19/56] bug #3351: Fix wrong method call. Thanks to Sebastiaan Smit --- src/cloud/common/CloudAuth/EC2CloudAuth.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloud/common/CloudAuth/EC2CloudAuth.rb b/src/cloud/common/CloudAuth/EC2CloudAuth.rb index 028dfff238..ea62b5de37 100644 --- a/src/cloud/common/CloudAuth/EC2CloudAuth.rb +++ b/src/cloud/common/CloudAuth/EC2CloudAuth.rb @@ -50,7 +50,7 @@ module EC2CloudAuth digest_generator = OpenSSL::Digest::Digest.new(digest) digest = OpenSSL::HMAC.digest(digest_generator, secret_key, req_desc) - b64sig = Base64.b64encode(digest) + b64sig = Base64.encode64(digest) return b64sig.strip end From f83f5ef8525f842a3fd6a0010599b8528923715f Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 14 Nov 2014 15:05:52 +0100 Subject: [PATCH 20/56] bug #3334: fix bug searching for templates in vcenter (cherry picked from commit 55ec34a6243bf11f44a71d7f40b6e8bdaba9a297) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index d409a3a738..0b228dd202 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -120,7 +120,7 @@ class VIClient def find_vm_template(uuid) vms = @dc.vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine) - return vms.find{ |v| v.config.uuid == uuid } + return vms.find{ |v| v.config && v.config.uuid == uuid } end ######################################################################## From 1adb2691c34cd573bfb6eb794c15821782b598b7 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 14 Nov 2014 17:14:59 +0100 Subject: [PATCH 21/56] Bug #3320: Hardcoded path of /usr/bin/false, used by econe server (cherry picked from commit 758f175184a954c05095d12ff2863a7091d30254) --- src/cloud/ec2/etc/econe.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf index 1114d096ec..e5b7499be2 100644 --- a/src/cloud/ec2/etc/econe.conf +++ b/src/cloud/ec2/etc/econe.conf @@ -94,11 +94,11 @@ # Script to associate a public IP with a private IP # - arguments: elastic_ip private_ip vnet_template(base64_encoded) -:associate_script: /usr/bin/false +:associate_script: false # Script to disassociate a public IP # - arguments: elastic_ip -:disassociate_script: /usr/bin/false +:disassociate_script: false ############################################################# # EBS From 6c7eef4c97c4711ccb288c395a22ad1c43343c14 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 17 Nov 2014 11:47:09 +0100 Subject: [PATCH 22/56] bug #3334: skip non defined objects when searching for vcenter templates Some objects returned by childEntity can be already deletend when they are accessed. This patch skips these objects. (cherry picked from commit e2886255464e666c6a62d91cc1d016da6ab1a643) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 0b228dd202..b38118a591 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -120,7 +120,13 @@ class VIClient def find_vm_template(uuid) vms = @dc.vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine) - return vms.find{ |v| v.config && v.config.uuid == uuid } + return vms.find do |v| + begin + v.config && v.config.uuid == uuid + rescue ManagedObjectNotFound + false + end + end end ######################################################################## From 56f2babf22b69af22fd3d3e58762a039509a3dc5 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 14 Nov 2014 19:36:36 +0100 Subject: [PATCH 23/56] feature #3327: search recursively for objects in vcenter It searches for both hosts and vms inside folders. Based on the patch sent by Jens Grunert: https://github.com/OpenNebula/one/pull/39 (cherry picked from commit 4d90449753b6275199cc120806aa9e028b08e3a5) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index b38118a591..624869d938 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -50,6 +50,23 @@ module VCenterDriver class VIClient attr_reader :vim, :one, :root, :cluster, :user, :pass, :host + def get_entities(entities=[], folder, type) + return nil if folder == [] + folder.childEntity.each do |child| + name, junk = child.to_s.split('(') + + case name + when "Folder" + get_entities(entities, child, type) + when type + entities.push(child) + end + end + + return entities + end + + ############################################################################ # Initializr the VIClient, and creates an OpenNebula client. The parameters # are obtained from the associated OpenNebula host @@ -74,9 +91,10 @@ class VIClient initialize_vim(connection) - @root.childEntity.each {|dc| - ccrs = dc.hostFolder.childEntity.grep( - RbVmomi::VIM::ClusterComputeResource) + datacenters = get_entities(@root, 'Datacenter') + + datacenters.each {|dc| + ccrs = get_entities(dc.hostFolder, 'ClusterComputeResource') next if ccrs.nil? @@ -118,7 +136,7 @@ class VIClient # @param uuid [String] the UUID of the VM or VM Template ######################################################################## def find_vm_template(uuid) - vms = @dc.vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine) + vms = get_entities(@dc.vmFolder, 'VirtualMachine') return vms.find do |v| begin @@ -157,9 +175,10 @@ class VIClient def vm_templates vm_templates = {} - @root.childEntity.each { |dc| + datacenters = get_entities(@root, 'Datacenter') - vms = dc.vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine) + datacenters.each { |dc| + vms = get_entities(dc.vmFolder, 'VirtualMachine') tmp = vms.select { |v| v.config.template == true } From 526ec6bcea7722ab1ea58c752e2e49ec9aa541e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Nov 2014 12:50:19 +0100 Subject: [PATCH 24/56] Bug #3256: Change RMDelete return code --- src/rm/RequestManagerDelete.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc index 152a5d1de0..074ebcc928 100644 --- a/src/rm/RequestManagerDelete.cc +++ b/src/rm/RequestManagerDelete.cc @@ -91,7 +91,7 @@ void RequestManagerDelete::request_execute(xmlrpc_c::paramList const& paramList, if ( rc != 0 ) { - failure_response(INTERNAL, + failure_response(ACTION, request_error("Cannot delete "+object_name(auth_object),error_msg), att); return; From c4340382b2128004334dddeeba42d2b664c13a3b Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 13:10:31 +0100 Subject: [PATCH 25/56] bug #3303: Do not ask for password for ldap user creation --- src/sunstone/public/js/plugins/users-tab.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 14b58a56fa..3ed8b0b29a 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -642,10 +642,8 @@ function buildUserJSON(dialog){ if (driver == 'custom'){ driver = $('input[name="custom_auth"]', dialog).val(); - } - - if (!user_name.length || !user_password.length){ - return false; + } else if (driver == "ldap") { + user_password = "-" } var user_json = { "user" : @@ -670,6 +668,16 @@ function setupCreateUserDialog(){ //$('button',dialog).button(); + $('#driver', dialog).change(function(){ + if ($(this).val() == "ldap"){ + $('#pass',dialog).hide(); + $('label[for="pass"]',dialog).hide(); + } else { + $('#pass',dialog).show(); + $('label[for="pass"]',dialog).show(); + }; + }); + setupCustomAuthDialog(dialog); $('#create_user_form',dialog).submit(function(){ From a57f5bdf7b70da21de9ce9146bb487322a7c7fb9 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 17 Nov 2014 15:19:07 +0100 Subject: [PATCH 26/56] bug #3293: move vcenter_driver.rb to /usr/lib/one/ruby --- install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 0a859578b4..7a4d481526 100755 --- a/install.sh +++ b/install.sh @@ -630,7 +630,8 @@ RUBY_LIB_FILES="src/mad/ruby/ActionManager.rb \ src/vnm_mad/one_vnm.rb \ src/oca/ruby/deprecated/OpenNebula.rb \ src/oca/ruby/opennebula.rb \ - src/sunstone/OpenNebulaVNC.rb" + src/sunstone/OpenNebulaVNC.rb \ + src/vmm_mad/remotes/vcenter/vcenter_driver.rb" #------------------------------------------------------------------------------- # Ruby auth library files, to be installed under $LIB_LOCATION/ruby/opennebula @@ -783,8 +784,7 @@ VMM_EXEC_VCENTER_SCRIPTS="src/vmm_mad/remotes/vcenter/cancel \ src/vmm_mad/remotes/vcenter/reset \ src/vmm_mad/remotes/vcenter/save \ src/vmm_mad/remotes/vcenter/poll \ - src/vmm_mad/remotes/vcenter/shutdown \ - src/vmm_mad/remotes/vcenter/vcenter_driver.rb" + src/vmm_mad/remotes/vcenter/shutdown" #------------------------------------------------------------------------------ # VMM Driver EC2 scripts, to be installed under $REMOTES_LOCATION/vmm/ec2 From 2cac660e7333d42b0b0cadd228ca7c518e337a08 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 17 Nov 2014 15:30:31 +0100 Subject: [PATCH 27/56] Feature #3305: Enable context in vCenter view (cherry picked from commit 4c277b87e439ce7215666234980fb95e7cb1561a) --- src/sunstone/public/js/plugins/templates-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 7a210db724..6a6faae680 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1856,7 +1856,7 @@ function wizard_tab_dd(){ } if (Config.isTemplateCreationTabEnabled('context')){ - str += "

              "+tr("Context")+"
              "; + str += "

              "+tr("Context")+"
              "; } if (Config.isTemplateCreationTabEnabled('scheduling')){ From 2d05f1f2eaeb0f16899ef69392bd19ce39d0af77 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 17 Nov 2014 15:31:07 +0100 Subject: [PATCH 28/56] Solve recursion problem in vCenter driver for hierarchy function (cherry picked from commit ab35b92babe0383fd193866171f75084a1e07f31) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 624869d938..85584b6230 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -156,11 +156,10 @@ class VIClient def hierarchy vc_hosts = {} - @root.childEntity.each { |dc| - - ccrs = dc.hostFolder.childEntity.grep( - RbVmomi::VIM::ClusterComputeResource) + datacenters = get_entities(@root, 'Datacenter') + datacenters.each { |dc| + ccrs = get_entities(dc.hostFolder, 'ClusterComputeResource') vc_hosts[dc.name] = ccrs.collect { |c| c.name } } From bf43bc0a0b6a99299b7a35595fc8e1ce02503996 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 15:38:05 +0100 Subject: [PATCH 29/56] bug #3304: Add support for different time formats in acct inputs --- src/sunstone/public/js/sunstone.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 14a9fb2259..db799d600d 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -4763,11 +4763,11 @@ function accountingGraphs(div, opt){ '
              \
              \ \ - \ + \
              \
              \ \ - \ + \
              \
              \ \ @@ -4961,6 +4961,10 @@ function accountingGraphs(div, opt){ //-------------------------------------------------------------------------- // Submit request //-------------------------------------------------------------------------- + function dateFromString(str) { + var a = $.map(str.split(/[^0-9]/), function(s) { return parseInt(s, 10) }); + return Date.UTC(a[0], a[1]-1 || 0, a[2] || 1, a[3] || 0, a[4] || 0, a[5] || 0, a[6] || 0); + } $("#acct_submit", div).on("click", function(){ var start_time = -1; @@ -4971,7 +4975,8 @@ function accountingGraphs(div, opt){ notifyError(tr("Time range start is mandatory")); return false; }else{ - start_time = Date.parse(v+' UTC'); + start_time = dateFromString(v) + //start_time = Date.parse(v+' UTC'); if (isNaN(start_time)){ notifyError(tr("Time range start is not a valid date. It must be YYYY/MM/DD")); @@ -4984,8 +4989,7 @@ function accountingGraphs(div, opt){ var v = $("#acct_end_time", div).val(); if (v != ""){ - - end_time = Date.parse(v+' UTC'); + end_time = dateFromString(v) if (isNaN(end_time)){ notifyError(tr("Time range end is not a valid date. It must be YYYY/MM/DD")); @@ -5053,7 +5057,7 @@ function fillAccounting(div, req, response, no_table) { // start_time is mandatory var start = new Date(options.start_time * 1000); - start.setHours(0,0,0,0); + start.setUTCHours(0,0,0,0); var end = new Date(); From 88235fe9d77e03b6fde48ac45d10e4bb23120798 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 15:42:50 +0100 Subject: [PATCH 30/56] bug #3304: Fix acct end_time placeholder --- src/sunstone/public/js/sunstone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index db799d600d..a0c4c395af 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -4767,7 +4767,7 @@ function accountingGraphs(div, opt){
              \
              \ \ - \ + \
              \
              \ \ From dd3c9ad8d271529f56991c785604b611ef16896b Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 17 Nov 2014 15:57:17 +0100 Subject: [PATCH 31/56] Bug #3332: Attach non-persistent disks does not work for ceph --- src/vmm_mad/remotes/kvm/attach_disk | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/attach_disk b/src/vmm_mad/remotes/kvm/attach_disk index 366110598d..3df84d8927 100755 --- a/src/vmm_mad/remotes/kvm/attach_disk +++ b/src/vmm_mad/remotes/kvm/attach_disk @@ -29,6 +29,8 @@ TARGET="$3" TARGET_INDEX="$4" DRV_ACTION="$5" +ATTACH_FILE="$SOURCE.attach" + XPATH="${DRIVER_PATH}/../../datastore/xpath.rb -b $DRV_ACTION" unset i j XPATH_ELEMENTS @@ -37,20 +39,26 @@ DISK_XPATH="/VMM_DRIVER_ACTION_DATA/VM/TEMPLATE/DISK[ATTACH='YES']" while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" -done < <($XPATH $DISK_XPATH/DRIVER \ +done < <($XPATH /VMM_DRIVER_ACTION_DATA/VM/ID \ + $DISK_XPATH/DRIVER \ $DISK_XPATH/TYPE \ $DISK_XPATH/READONLY \ $DISK_XPATH/CACHE \ $DISK_XPATH/SOURCE \ + $DISK_XPATH/DISK_ID \ + $DISK_XPATH/CLONE \ $DISK_XPATH/CEPH_HOST \ $DISK_XPATH/CEPH_SECRET \ $DISK_XPATH/CEPH_USER) +VMID="${XPATH_ELEMENTS[j++]}" DRIVER="${XPATH_ELEMENTS[j++]:-$DEFAULT_TYPE}" TYPE="${XPATH_ELEMENTS[j++]}" READONLY="${XPATH_ELEMENTS[j++]}" CACHE="${XPATH_ELEMENTS[j++]}" IMG_SRC="${XPATH_ELEMENTS[j++]}" +DISK_ID="${XPATH_ELEMENTS[j++]}" +CLONE="${XPATH_ELEMENTS[j++]}" CEPH_HOST="${XPATH_ELEMENTS[j++]}" CEPH_SECRET="${XPATH_ELEMENTS[j++]}" CEPH_USER="${XPATH_ELEMENTS[j++]}" @@ -72,9 +80,14 @@ rbd) TYPE_SOURCE="protocol" TYPE_XML="network" SOURCE="rbd" - SOURCE_ARGS="name='$IMG_SRC'" DEVICE="disk" + if [ "$CLONE" = "YES" ]; then + SOURCE_ARGS="name='${IMG_SRC}-${VMID}-${DISK_ID}'" + else + SOURCE_ARGS="name='${IMG_SRC}'" + fi + for host in $CEPH_HOST ; do BCK_IFS=$IFS IFS=':' @@ -120,8 +133,6 @@ else READONLY="" fi -ATTACH_FILE="$SOURCE.attach" - cat < $ATTACH_FILE From 099c514fcae1899723b4307dd307dd3366befbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Nov 2014 16:01:17 +0100 Subject: [PATCH 32/56] Bug #3353: Do not set last_pool time to 0 in lcm::monitor_poweron --- src/lcm/LifeCycleStates.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index eba86cf0f4..3f3d79a93c 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -1356,7 +1356,7 @@ void LifeCycleManager::monitor_poweron_action(int vid) vm->set_running_stime(the_time); - vm->set_last_poll(0); + vm->set_last_poll(the_time); vmpool->update_history(vm); From 66400df2f86420d587d7cbb1a274219dfd39cf8f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 16:33:30 +0100 Subject: [PATCH 33/56] bug #3276: Check client errors when creating a new support request --- src/sunstone/public/js/plugins/support-tab.js | 10 +++++--- src/sunstone/routes/support.rb | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/sunstone/public/js/plugins/support-tab.js b/src/sunstone/public/js/plugins/support-tab.js index 5373649d54..a720cbc655 100644 --- a/src/sunstone/public/js/plugins/support-tab.js +++ b/src/sunstone/public/js/plugins/support-tab.js @@ -118,10 +118,14 @@ var support_actions = { //addTemplateElement(request, response); //notifyCustom(tr("Request created"), " ID: " + response.VMTEMPLATE.ID, false) }, - error: function(request, response){ + error: function(request, error_json){ popFormDialog("create_support_request_form", $("#support-tab")); - $("a[href=back]", $("#support-tab")).trigger("click"); - show_support_connect(); + if (error_json.error.http_status=="403") { + notifyError(error_json.error.message); + } else { + $("a[href=back]", $("#support-tab")).trigger("click"); + show_support_connect(); + } } }, diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 0753987ba0..8e6ea6affc 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -161,16 +161,22 @@ post '/support/request' do check_zendesk_api_gem body_hash = JSON.parse(@request_body) - zrequest = zendesk_client.requests.create({ - :subject => body_hash['subject'], - :comment => { :value => body_hash['description'] }, - :custom_fields => [ - {:id => 391197, :value => body_hash['severity']}, - {:id => 391130, :value => body_hash['opennebula_version']} - ] - }) - [201, JSON.pretty_generate(zrequest_to_one(zrequest))] + zrequest = ticket = ZendeskAPI::Request.new(zendesk_client, { + :subject => body_hash['subject'], + :comment => { :value => body_hash['description'] }, + :custom_fields => [ + {:id => 391197, :value => body_hash['severity']}, + {:id => 391130, :value => body_hash['opennebula_version']} + ] + }) + + if zrequest.save + [201, JSON.pretty_generate(zrequest_to_one(zrequest))] + else + logger.error(zrequest.errors) + [403, Error.new(zrequest.errors["base"][0]["description"]).to_json] + end end post '/support/request/:id/action' do From ddc4b757e736b024e11765c0eea48a25ef13122c Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 17 Nov 2014 13:03:32 +0100 Subject: [PATCH 34/56] bug #3315: use semantic versioning for remotes onehost sync was using alphabetical comparison but this method does not work for this comparison: 4.10.0 > 4.8.0 Now the versions are parsed by Gem::Version, that comes with rubygems and should be installed in the frontend. When the version can not be parsed it falls back to text comparison or forces update if the comparison can not be made (one of the two versions is malformed). More information about semantic versioning: http://semver.org/ --- src/cli/one_helper/onehost_helper.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index 50f149dee5..40d252bac8 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -16,6 +16,7 @@ require 'one_helper' require 'one_helper/onevm_helper' +require 'rubygems' class OneHostHelper < OpenNebulaHelper::OneHelper TEMPLATE_XPATH = '//HOST/TEMPLATE' @@ -178,6 +179,12 @@ class OneHostHelper < OpenNebulaHelper::OneHelper exit(-1) end + begin + current_version = Gem::Version.new(current_version) + rescue + STDERR.puts "VERSION file is malformed, use semantic versioning." + end + cluster_id = options[:cluster] # Get remote_dir (implies oneadmin group) @@ -218,8 +225,17 @@ class OneHostHelper < OpenNebulaHelper::OneHelper host_version=host['TEMPLATE/VERSION'] + begin + host_version = Gem::Version.new(host_version) + rescue + end + if !options[:force] - next if host_version && host_version >= current_version + begin + next if host_version && host_version >= current_version + rescue + STDERR.puts "Error comparing versions for host #{host['NAME']}." + end end puts "* Adding #{host['NAME']} to upgrade" From 6b8a81d019e107f66d88d69383ac9fa6e05dc7b6 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 17:15:24 +0100 Subject: [PATCH 35/56] bug #3276: Remove debug info --- src/sunstone/routes/support.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 8e6ea6affc..e8d37a143c 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -174,7 +174,6 @@ post '/support/request' do if zrequest.save [201, JSON.pretty_generate(zrequest_to_one(zrequest))] else - logger.error(zrequest.errors) [403, Error.new(zrequest.errors["base"][0]["description"]).to_json] end end From 722f645a33b5736f8049b7465065a09d6407c64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Nov 2014 17:20:59 +0100 Subject: [PATCH 36/56] Bug #3352: Fix refresh in VM attach disk/nic --- src/sunstone/public/js/plugins/vms-tab.js | 8 +++++--- src/sunstone/public/js/sunstone.js | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 71dad7ff07..cbcb9fcb74 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1930,19 +1930,19 @@ function setupAttachDiskDialog(){
              \
              ' + - generate_disk_tab_content("attach_disk", "attach_disk") + + generate_disk_tab_content("attach_disk") + '
              \
              \ \
              \
              \ ×\ -
            ') +
            '); dialog.addClass("reveal-modal large max-height").attr("data-reveal", ""); setupTips(dialog); - setup_disk_tab_content(dialog, "attach_disk", "attach_disk") + setup_disk_tab_content(dialog, "attach_disk"); $('#attach_disk_form',dialog).submit(function(){ var vm_id = $('#vm_id', this).text(); @@ -1975,6 +1975,7 @@ function setupAttachDiskDialog(){ function popUpAttachDiskDialog(vm_id){ $('#vm_id',$attach_disk_dialog).text(vm_id); + refreshImageTableSelect($attach_disk_dialog, "attach_disk"); $attach_disk_dialog.foundation().foundation('reveal', 'open'); } @@ -2262,6 +2263,7 @@ function setupAttachNicDialog(){ function popUpAttachNicDialog(vm_id){ $('#vm_id',$attach_nic_dialog).text(vm_id); + refreshImageTableSelect($attach_nic_dialog, "attach_nic"); $attach_nic_dialog.foundation().foundation('reveal', 'open'); } diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index a0c4c395af..e35e4a5227 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -6355,9 +6355,9 @@ function setupResourceTableSelect(section, context_id, options) { var dataTable_select = $('#datatable_'+context_id, section).dataTable(options.dataTable_options); - $('#refresh_button_'+context_id, section).die(); + $('#refresh_button_'+context_id, section).off("click"); - $('#refresh_button_'+context_id, section).live('click', function(){ + section.on('click', '#refresh_button_'+context_id, function(){ options.update_fn($('table[id=datatable_'+context_id+']', section).dataTable()); }); From 4576d001d503118c31441874390890281175b85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Nov 2014 17:49:06 +0100 Subject: [PATCH 37/56] Bug #3275: Fix cluster wizard columns --- src/sunstone/public/js/plugins/clusters-tab.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 512ac6c1a4..295b2f6e45 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -74,13 +74,9 @@ function setupCreateClusterDialog(){ dialog.addClass("reveal-modal large max-height").attr("data-reveal", ""); - var opts = { - multiple_choice: true - }; - - setupHostTableSelect(dialog, "cluster_wizard_hosts", opts); - setupVNetTableSelect(dialog, "cluster_wizard_vnets", opts); - setupDatastoreTableSelect(dialog, "cluster_wizard_datastores", opts); + setupHostTableSelect(dialog, "cluster_wizard_hosts", {multiple_choice: true}); + setupVNetTableSelect(dialog, "cluster_wizard_vnets", {multiple_choice: true}); + setupDatastoreTableSelect(dialog, "cluster_wizard_datastores", {multiple_choice: true}); // Handle the Create button $('#create_cluster_submit').click(function(){ From d1df225e36527451fb5f013b133bd1d44d47565f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 17:27:11 +0100 Subject: [PATCH 38/56] bug #3359: Fix cep pool name tooltip --- .../public/js/plugins/datastores-tab.js | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 1c14324704..50da1ede94 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -172,35 +172,37 @@ var create_datastore_tmpl = \
            \ \ -
            \ - \ - \ -
            \ -
            \ - \ - \ -
            \ -
            \ - \ - \ -
            \ -
            \ - \ - \ -
            \ -
            \ - \ - \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \
            \
            \
            \ From 1167c38b2b34288a90bd8e97c1ec2804b4c95179 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 17:27:33 +0100 Subject: [PATCH 39/56] bug #3359: Fix gluster_volume assignment --- src/sunstone/public/js/plugins/datastores-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 50da1ede94..7f8ef51d52 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -959,7 +959,7 @@ function setupCreateDatastoreDialog(){ ds_obj.datastore.gluster_host = gluster_host; if (gluster_volume) - ds_obj.datastore.gluster_host = gluster_volume; + ds_obj.datastore.gluster_volume = gluster_volume; if (pool_name) ds_obj.datastore.pool_name = pool_name; From 18ba43e1f8664b3bd32bb783bda6e959334bca6a Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 17 Nov 2014 18:10:21 +0100 Subject: [PATCH 40/56] Bug #3359: Add missing ceph attrs --- .../public/js/plugins/datastores-tab.js | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 7f8ef51d52..3e2c97ae57 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -197,12 +197,39 @@ var create_datastore_tmpl = '\ \
            \ +
            \ + \ + \ +
            \
            \ \ \
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ +
            \
            \
            \
            \ @@ -804,6 +831,11 @@ function hide_all(context) $('label[for="pool_name"],input#pool_name',context).parent().hide(); $('label[for="ceph_host"],input#ceph_host',context).parent().hide(); $('label[for="ceph_secret"],input#ceph_secret',context).parent().hide(); + $('label[for="ceph_user"],input#ceph_user',context).parent().hide(); + $('label[for="rbd_format"],input#rbd_format',context).parent().hide(); + $('label[for="staging_dir"],input#staging_dir',context).parent().hide(); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw',context).parent().hide(); + $('label[for="no_decompress"],input#no_decompress',context).parent().hide(); $('select#ds_mad').removeAttr('disabled'); $('select#tm_mad').removeAttr('disabled'); $('select#tm_mad').children('option').each(function() { @@ -906,6 +938,11 @@ function setupCreateDatastoreDialog(){ var pool_name = $('#pool_name',context).val(); var ceph_host = $('#ceph_host',context).val(); var ceph_secret = $('#ceph_secret',context).val(); + var ceph_user = $('#ceph_user',context).val(); + var rbd_format = $('#rbd_format',context).val(); + var staging_dir = $('#staging_dir',context).val(); + var limit_transfer_bw = $('#limit_transfer_bw',context).val(); + var no_decompress = $('#no_decompress',context).is(':checked'); if (!name){ @@ -970,6 +1007,21 @@ function setupCreateDatastoreDialog(){ if (ceph_secret) ds_obj.datastore.ceph_secret = ceph_secret; + if (ceph_user) + ds_obj.datastore.ceph_user = ceph_user; + + if (rbd_format) + ds_obj.datastore.rbd_format = rbd_format; + + if (staging_dir) + ds_obj.datastore.staging_dir = staging_dir; + + if (limit_transfer_bw) + ds_obj.datastore.limit_transfer_bw = limit_transfer_bw; + + if (no_decompress) + ds_obj.datastore.no_decompress = "YES"; + // Sanitize dialog $('#ds_use_ssh').prop('checked', false); $('#tm_use_ssh').prop('checked', false); @@ -1069,6 +1121,11 @@ function select_ceph(){ $('label[for="pool_name"],input#pool_name').parent().fadeIn(); $('label[for="ceph_host"],input#ceph_host').parent().fadeIn(); $('label[for="ceph_secret"],input#ceph_secret').parent().fadeIn(); + $('label[for="ceph_user"],input#ceph_user').parent().fadeIn(); + $('label[for="rbd_format"],input#rbd_format').parent().fadeIn(); + $('label[for="staging_dir"],input#staging_dir').parent().fadeIn(); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); $('select#disk_type').val('RBD'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); From 3863a3dbdc9c9c1a33b17452570224aba6a0edd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Nov 2014 18:25:02 +0100 Subject: [PATCH 41/56] Bug #3350: Remove cluster -1 from the acl wizard --- src/sunstone/public/js/plugins/acls-tab.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 7a9739d6a4..4e37da5e0f 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -674,6 +674,9 @@ function popUpCreateAclDialog(){ insertSelectOptions('div#belonging_to', dialog, "Group", null, true); insertSelectOptions('#in_cluster',dialog, "Cluster", null, true); + // Delete cluster -1 option + $('#in_cluster select option[value="-1"]',dialog).remove(); + insertSelectOptions('div#zones_applies', dialog, "Zone", "*", false, ''); From 4b71995261f24ab352a73ea31a087bfbcf7d30e2 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 17 Nov 2014 18:57:47 +0100 Subject: [PATCH 42/56] Feature #3305: Add context info for vCenter VMs (cherry picked from commit 6dd30ec6a66d6b18bdde5639f35ba5f390fdcbb9) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 85584b6230..0212e57a31 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -39,6 +39,7 @@ $: << LIB_LOCATION+'/ruby' require 'rbvmomi' require 'yaml' require 'opennebula' +require 'base64' module VCenterDriver @@ -770,6 +771,8 @@ private raise "Cannot find host id in deployment file history." if hid.nil? + context = xml.root.elements["//TEMPLATE/CONTEXT"] + connection = VIClient.new(hid) vc_template = connection.find_vm_template(uuid) @@ -799,11 +802,26 @@ private vnc_listen = vnc_listen.text end + config_array = [] + if vnc_port - spec = RbVmomi::VIM.VirtualMachineConfigSpec(:extraConfig => + config_array += [{:key=>"remotedisplay.vnc.enabled", :value=>"TRUE"}, {:key=>"remotedisplay.vnc.port", :value=>vnc_port.text}, - {:key=>"remotedisplay.vnc.ip", :value=>vnc_listen}]) + {:key=>"remotedisplay.vnc.ip", :value=>vnc_listen}] + end + + if context + # Remove (9) and \n (11) + context_text = Base64.encode64(context.to_s[9..-11]) + config_array += + [{:key=>"guestinfo.opennebula.context", + :value=>context_text}] + end + + if config_array != [] + spec_hash = {:extraConfig =>config_array} + spec = RbVmomi::VIM.VirtualMachineConfigSpec(spec_hash) rc.ReconfigVM_Task(:spec => spec).wait_for_completion end From aadd17d84f77cf2f65fd7cf4ec7864aaee8c699c Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 18 Nov 2014 11:55:16 +0100 Subject: [PATCH 43/56] Fix for cli error (cherry picked from commit 6124ba7d2c89eb366935c6d4d26a6b21ee17c223) --- src/cli/one_helper/onevm_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 5dd840c45b..cb38c73af3 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -419,13 +419,13 @@ class OneVMHelper < OpenNebulaHelper::OneHelper case hybridvisor when "vcenter" - nic.IP = vm_tmplt['GUEST_IP'] if vm_tmplt['GUEST_IP'] + nic["IP"] = vm_tmplt['GUEST_IP'] if vm_tmplt['GUEST_IP'] when "ec2" - nic.IP = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS'] + nic["IP"] = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS'] when "azure" - nic.IP = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS'] + nic["IP"]P = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS'] when "softlayer" - nic.IP = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS'] + nic["IP"] = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS'] else isHybrid = false end From 1e81cc7a1da065d0aca492987884d08c836883f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 18 Nov 2014 12:19:26 +0100 Subject: [PATCH 44/56] Bug #3319: Clear flow instantiate dialog after each submit --- src/sunstone/public/js/plugins/oneflow-templates.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index f0fb860683..e52c3f3f2b 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -1881,6 +1881,7 @@ function setupInstantiateServiceTemplateDialog(){ } } + $instantiate_service_template_dialog.empty(); $instantiate_service_template_dialog.foundation('reveal', 'close') return false; }); From 66cba3841fc4bbca3e7ed0f7af8a21f3393ce9df Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 18 Nov 2014 12:06:58 +0100 Subject: [PATCH 45/56] bug #3130: Service instantiate should not allow to add new extra network interfaces (cherry picked from commit 394293b7a1a4705013c82044f8f94cb14594dffa) --- src/sunstone/public/js/plugins/provision-tab.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index d3808b8c0d..ec65409fe0 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -2320,7 +2320,7 @@ function generate_provision_network_table(context, nic, vnet_attr){ update_provision_networks_datatable(provision_networks_datatable); } -function generate_provision_network_accordion(context){ +function generate_provision_network_accordion(context, hide_add_button){ context.off(); context.html( '
            '+ @@ -2341,7 +2341,7 @@ function generate_provision_network_accordion(context){ '
            '+ '
            '+ '
            '+ - ''+ + ''+ tr("Add another Network Interface")+ ''+ '
            '+ @@ -6295,7 +6295,7 @@ $(document).ready(function(){ if (network_attrs.length > 0) { generate_provision_network_accordion( - $(".provision_network_selector", context)); + $(".provision_network_selector", context), true); $.each(network_attrs, function(index, vnet_attr){ generate_provision_network_table( From 31f2f805fb238aae69ed40e7606c872d6bfe8503 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 18 Nov 2014 12:42:52 +0100 Subject: [PATCH 46/56] Bug #3338: Generate host graphs when the tab is clicked (cherry picked from commit 5baa08f057a07992b0498f268b4b61d9bd60bede) --- src/sunstone/public/js/plugins/hosts-tab.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index ccbe03791c..5c7e6dfaf3 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -210,6 +210,7 @@ var host_actions = { updateHostElement(request, response); if (Sunstone.rightInfoVisible($("#hosts-tab"))) { updateHostInfo(request, response); + $(".right-info-tabs > dd.active > a", "#hosts-tab").trigger("click"); } }, error: onError @@ -1042,8 +1043,10 @@ function updateHostInfo(request,host){ //pop up panel while we retrieve the graphs - Sunstone.runAction("Host.monitor",host_info.ID, - {monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU,HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM"}); + $("[href='#host_monitoring_tab']").on("click", function(){ + Sunstone.runAction("Host.monitor",host_info.ID, + {monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU,HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM"}); + }); } //Prepares the host creation dialog From ab7b13b664bf54842c34c2be583dad51ccd78dcf Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 18 Nov 2014 12:53:43 +0100 Subject: [PATCH 47/56] bug #3363: rescue exception when trying to parse a plain service template --- src/sunstone/public/js/plugins/oneflow-templates.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index e52c3f3f2b..a4b1a90311 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -1390,7 +1390,12 @@ function initialize_create_service_template_dialog(dialog){ }).on('valid', function() { if ($('#create_service_template_form_advanced',dialog).attr("action") == "create") { var json_template = $("#template", this).val(); - Sunstone.runAction("ServiceTemplate.create", JSON.parse(json_template) ); + try { + Sunstone.runAction("ServiceTemplate.create", JSON.parse(json_template) ); + } catch(e) { + popFormDialog("create_service_template_form", $("#oneflow-templates")); + notifyError(e); + } return false; } else if ($('#create_service_template_form_advanced',dialog).attr("action") == "update") { var json_template = $("#template", this).val(); From 3d6711bec4f3eef5e131c30f6c51b04ef183def2 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 18 Nov 2014 12:55:21 +0100 Subject: [PATCH 48/56] Fix syntax error (cherry picked from commit eaa2380fca57d5475865721f7a5a2a2d02fe8161) --- src/cli/one_helper/onevm_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index cb38c73af3..97c3d505b9 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -423,7 +423,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper when "ec2" nic["IP"] = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS'] when "azure" - nic["IP"]P = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS'] + nic["IP"] = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS'] when "softlayer" nic["IP"] = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS'] else From 1f20b7c29ce19a5262d7ab759f7fcf34bd8b6eb0 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 18 Nov 2014 12:57:08 +0100 Subject: [PATCH 49/56] bug #3354: ask for memberOf attribute in ldap auth Patch sent by Fabian Zimmermann. (cherry picked from commit a2a25673b4e45ef5e932a633ef0fc0a7cd7a5546) --- src/authm_mad/remotes/ldap/ldap_auth.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/authm_mad/remotes/ldap/ldap_auth.rb b/src/authm_mad/remotes/ldap/ldap_auth.rb index 161ef225ea..da9a30255d 100644 --- a/src/authm_mad/remotes/ldap/ldap_auth.rb +++ b/src/authm_mad/remotes/ldap/ldap_auth.rb @@ -47,7 +47,8 @@ class OpenNebula::LdapAuth :mapping_timeout => 300, :mapping_filename => 'server1.yaml', :mapping_key => 'GROUP_DN', - :mapping_default => 1 + :mapping_default => 1, + :attributes => [ "memberOf" ] }.merge(options) ops={} @@ -123,6 +124,7 @@ class OpenNebula::LdapAuth begin result=@ldap.search( :base => @options[:base], + :attributes => @options[:attributes], :filter => "#{@options[:user_field]}=#{name}") if result && result.first @@ -146,6 +148,7 @@ class OpenNebula::LdapAuth def is_in_group?(user, group) result=@ldap.search( :base => group, + :attributes => @options[:group_field], :filter => "(#{@options[:group_field]}=#{user.first})") if result && result.first @@ -183,7 +186,7 @@ class OpenNebula::LdapAuth end groups.delete(false) - groups.compact + groups.compact.uniq end end From 676a8f0c4c8b044a83d2d81728a5bbb42359c41f Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 18 Nov 2014 14:50:42 +0100 Subject: [PATCH 50/56] bug #3364: install zendesk_api gem compatible with 1.8.7 (cherry picked from commit abca2ddd03b2a8075d529caa1e3907c55a7d171c) --- share/install_gems/install_gems | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems index b42cef33f7..58f0c88a9c 100755 --- a/share/install_gems/install_gems +++ b/share/install_gems/install_gems @@ -13,17 +13,19 @@ end if !defined?(RUBY_VERSION) || RUBY_VERSION < '1.9.0' $nokogiri='nokogiri --version "< 1.6.0"' LDAP='net-ldap --version "< 0.9"' + ZENDESK_API='zendesk_api --version "< 1.5"' else $nokogiri='nokogiri' DEFAULT = DEFAULT_PRE + %w{hybrid} LDAP='net-ldap' + ZENDESK_API='zendesk_api' end DEFAULT = DEFAULT_PRE if !defined?(DEFAULT) GROUPS={ :quota => [SQLITE, 'sequel'], - :sunstone => ['json', 'rack', 'sinatra', 'thin', 'zendesk_api', SQLITE], + :sunstone => ['json', 'rack', 'sinatra', 'thin', ZENDESK_API, SQLITE], :cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb json}, :hybrid => %w{softlayer_api configparser azure}, :auth_ldap => LDAP, @@ -37,7 +39,8 @@ GROUPS={ PACKAGES=GROUPS.keys GEM_TEST={ - LDAP => 'net/ldap' + LDAP => 'net/ldap', + ZENDESK_API => 'zendesk_api' } DISTRIBUTIONS={ From 3959dcabac94db9835831147a82eece8f49ec7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 18 Nov 2014 15:55:10 +0100 Subject: [PATCH 51/56] Bug #3137: Use common quota code in provision tab --- .../public/js/plugins/provision-tab.js | 82 ++++--------------- 1 file changed, 16 insertions(+), 66 deletions(-) diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index ec65409fe0..db8ee44732 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -2662,41 +2662,16 @@ function show_provision_user_info_callback(request, response) { var info = response.USER; var default_user_quotas = Quotas.default_quotas(info.DEFAULT_USER_QUOTAS); - var vms_quota = Quotas.vms(info, default_user_quotas); - var cpu_quota = Quotas.cpu(info, default_user_quotas); - var memory_quota = Quotas.memory(info, default_user_quotas); - var volatile_size_quota = Quotas.volatile_size(info, default_user_quotas); - var image_quota = Quotas.image(info, default_user_quotas); - var network_quota = Quotas.network(info, default_user_quotas); - var datastore_quota = Quotas.datastore(info, default_user_quotas); - var quotas_html; - if (vms_quota || cpu_quota || memory_quota || volatile_size_quota || image_quota || network_quota || datastore_quota) { - quotas_html = '
            ' + vms_quota + '
            '; - quotas_html += '
            ' + cpu_quota + '
            '; - quotas_html += '
            ' + memory_quota + '
            '; - quotas_html += '
            ' + volatile_size_quota+ '
            '; - quotas_html += '
            ' + image_quota + '
            '; - quotas_html += '
            ' + network_quota + '
            '; - quotas_html += '
            ' + datastore_quota + '
            '; - } else { - quotas_html = '
            '+ - '
            '+ - '
            '+ - ''+ - ''+ - ''+ - ''+ - '
            '+ - '

            '+ - tr("There are no quotas defined")+ - '

            '+ - '
            '+ - '
            '+ - '
            '; - } + var quotas_tab_html = initQuotasPanel(info, default_user_quotas, + "#provision_user_info_quotas_div", false); - $("#provision_user_info_quotas_div").html(quotas_html); + $("#provision_user_info_quotas_div").html(quotas_tab_html); + + setupQuotasPanel(info, + "#provision_user_info_quotas_div", + false, + "User"); var ssh_key = info.TEMPLATE.SSH_PUBLIC_KEY; if (ssh_key && ssh_key.length) { @@ -2724,41 +2699,16 @@ function show_provision_group_info_callback(request, response) { var context = $("#provision_manage_vdc"); var default_group_quotas = Quotas.default_quotas(info.DEFAULT_GROUP_QUOTAS); - var vms_quota = Quotas.vms(info, default_group_quotas); - var cpu_quota = Quotas.cpu(info, default_group_quotas); - var memory_quota = Quotas.memory(info, default_group_quotas); - var volatile_size_quota = Quotas.volatile_size(info, default_group_quotas); - var image_quota = Quotas.image(info, default_group_quotas); - var network_quota = Quotas.network(info, default_group_quotas); - var datastore_quota = Quotas.datastore(info, default_group_quotas); - var quotas_html; - if (vms_quota || cpu_quota || memory_quota || volatile_size_quota || image_quota || network_quota || datastore_quota) { - quotas_html = '
            ' + vms_quota + '
            '; - quotas_html += '
            ' + cpu_quota + '
            '; - quotas_html += '
            ' + memory_quota + '
            '; - quotas_html += '
            ' + volatile_size_quota+ '
            '; - quotas_html += '
            ' + image_quota + '
            '; - quotas_html += '
            ' + network_quota + '
            '; - quotas_html += '
            ' + datastore_quota + '
            '; - } else { - quotas_html = '
            '+ - '
            '+ - '
            '+ - ''+ - ''+ - ''+ - ''+ - '
            '+ - '

            '+ - tr("There are no quotas defined")+ - '

            '+ - '
            '+ - '
            '+ - '
            '; - } + var quotas_tab_html = initQuotasPanel(info, default_group_quotas, + "#provision_vdc_quotas_div", false); - $("#provision_vdc_quotas_div").html(quotas_html); + $("#provision_vdc_quotas_div").html(quotas_tab_html); + + setupQuotasPanel(info, + "#provision_vdc_quotas_div", + false, + "Group"); accountingGraphs( $("#provision_info_vdc_group_acct", context), From 464ec1b4b179c358f3b7fd7b5d906e0170419091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 18 Nov 2014 16:31:50 +0100 Subject: [PATCH 52/56] Bug #3291: Keep vnet id when new AR dialog is reset --- src/sunstone/public/js/plugins/vnets-tab.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 486c0c4ffa..f70210e391 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1666,10 +1666,12 @@ function setupAddARDialog(){ setup_ar_tab_content(dialog, "add_ar") $('#submit_ar_reset_button').click(function(){ + var vnet_id = $('#vnet_id', $add_ar_dialog).text(); + $add_ar_dialog.html(""); setupAddARDialog(); - popUpAddAR(); + popUpAddAR(vnet_id); }); $('#add_ar_form',dialog).on('invalid', function () { From 1363fdacdd06dc014c06e0c97e67c1b9bf97365a Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Tue, 18 Nov 2014 18:01:04 +0100 Subject: [PATCH 53/56] Bug #3341: Temporary fix that fixes de broken pipe use but breaks the CLI SSL support for Ruby 1.8.7 (cherry picked from commit f40d69d0bdb22712b2b8b2f68fde235f68c2e725) --- src/cli/one_helper.rb | 11 ++++++++++- src/cli/one_helper/oneuser_helper.rb | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 5935c3f1e7..e0d884f76e 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -370,7 +370,16 @@ EOT endpoint=options[:endpoint] end - @@client=OpenNebula::Client.new(secret, endpoint, :sync => true) + # This breaks the CLI SSL support for Ruby 1.8.7, but is necessary + # in order to do template updates, otherwise you get the broken pipe + # error (bug #3341) + if RUBY_VERSION < '1.9' + sync = false + else + sync = true + end + + @@client=OpenNebula::Client.new(secret, endpoint, :sync => sync) end end diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index d53e190c10..4d567c6d8c 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -162,10 +162,20 @@ class OneUserHelper < OpenNebulaHelper::OneHelper # Authenticate with oned using the token/passwd and set/generate the # authentication token for the user #----------------------------------------------------------------------- + + # This breaks the CLI SSL support for Ruby 1.8.7, but is necessary + # in order to do template updates, otherwise you get the broken pipe + # error (bug #3341) + if RUBY_VERSION < '1.9' + sync = false + else + sync = true + end + token = auth.login_token(username, options[:time]) login_client = OpenNebula::Client.new("#{username}:#{token}", nil, - :sync => true) + :sync => sync) user = OpenNebula::User.new(User.build_xml, login_client) From 12157a9a251eaaa9c5f7a5048b20b52b976d40ff Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 18 Nov 2014 18:46:06 +0100 Subject: [PATCH 54/56] bug #3293: add ruby lib path to vcenter im (cherry picked from commit 11641950f5f28d6ccfab29623adf5a29b8c32681) --- src/im_mad/remotes/vcenter.d/vcenter.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/im_mad/remotes/vcenter.d/vcenter.rb b/src/im_mad/remotes/vcenter.d/vcenter.rb index a7b7649632..dffa53efff 100755 --- a/src/im_mad/remotes/vcenter.d/vcenter.rb +++ b/src/im_mad/remotes/vcenter.d/vcenter.rb @@ -24,6 +24,7 @@ else RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby" if !defined?(RUBY_LIB_LOCATION) end +$: << RUBY_LIB_LOCATION $: << "../../vmm/vcenter/" require 'vcenter_driver' From 7b8434592673cc4d16bce04917606e70844d5ef0 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 18 Nov 2014 18:53:13 +0100 Subject: [PATCH 55/56] feature #3327: make vcenter recursive search compatible with ruby 1.8.7 (cherry picked from commit a093e08780b98a5b8728fb37ffd21ef09aefe91a) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 0212e57a31..40564acf2d 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -51,14 +51,15 @@ module VCenterDriver class VIClient attr_reader :vim, :one, :root, :cluster, :user, :pass, :host - def get_entities(entities=[], folder, type) + def get_entities(folder, type, entities=[]) return nil if folder == [] + folder.childEntity.each do |child| name, junk = child.to_s.split('(') case name when "Folder" - get_entities(entities, child, type) + get_entities(child, type, entities) when type entities.push(child) end From 20500b6c9981ea96bf2a7a4cbab136d56480a722 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 19 Nov 2014 10:52:07 +0100 Subject: [PATCH 56/56] bug #3361: Add missing datastore attrs in the creation wizard (cherry picked from commit 570f8524cbf4a83d53629b2ab49374c306929b7c) --- .../public/js/plugins/datastores-tab.js | 140 +++++++++--------- 1 file changed, 72 insertions(+), 68 deletions(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 3e2c97ae57..96c963921b 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -127,24 +127,12 @@ var create_datastore_tmpl = '\ \
            \ -
            \ -
            \
            \ \ \
            \ -
            \ -
            \ -
            \ - \ - \ -
            \ -
            \ -
            \
            \
            \
            \ - \ -
            \ -
            \ - \ -
            \ -
            \ - \ - \ -
            \ -
            \ - \ - \ + \ + \
            \
            \ \ \
            \ -
            \ -
            \ +
            \ + \ +
            \ +
            \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \ +
            \ + \ + \ +
            \
            \
            \
            \ \ \
            \ @@ -221,15 +221,6 @@ var create_datastore_tmpl = '\ \
            \ -
            \ - \ - \ -
            \ -
            \ - \ -
            \ \
            \
            \ @@ -817,14 +808,12 @@ function hide_all(context) { // Hide all the options that depends on datastore type // and reset the selects - $('label[for="ds_use_ssh"],input#ds_use_ssh',context).hide(); - $('label[for="tm_use_ssh"],input#tm_use_ssh',context).hide(); $('input#image_ds_type').attr('checked', 'true'); $('input[name=ds_type]').removeAttr('disabled', 'disabled'); - $('label[for="bridge_list"],input#bridge_list',context).parent().parent().hide(); - $('label[for="base_iqn"],input#base_iqn',context).hide(); + $('label[for="bridge_list"],input#bridge_list',context).parent().hide(); + $('label[for="ds_tmp_dir"],input#ds_tmp_dir',context).parent().hide(); $('label[for="vg_name"],input#vg_name',context).hide(); $('label[for="gluster_host"],input#gluster_host',context).parent().hide(); $('label[for="gluster_volume"],input#gluster_volume',context).parent().hide(); @@ -924,13 +913,16 @@ function setupCreateDatastoreDialog(){ var tm_mad = $('#tm_mad',context).val(); tm_mad = tm_mad == "custom" ? $('input[name="ds_tab_custom_tm_mad"]').val() : tm_mad; var type = $('#disk_type',context).val(); + var safe_dirs = $('#safe_dirs',context).val(); var base_path = $('#base_path',context).val(); var restricted_dirs = $('#restricted_dirs',context).val(); + var limit_transfer_bw = $('#limit_transfer_bw',context).val(); + var datastore_capacity_check = $('#datastore_capacity_check',context).is(':checked'); + var no_decompress = $('#no_decompress',context).is(':checked'); + var bridge_list = $('#bridge_list',context).val(); - var ds_use_ssh = $('#ds_use_ssh',context).is(':checked'); - var tm_use_ssh = $('#tm_use_ssh',context).is(':checked'); - var base_iqn = $('#base_iqn',context).val(); + var ds_tmp_dir = $('#ds_tmp_dir',context).val(); var vg_name = $('#vg_name',context).val(); var limit_mb = $('#limit_mb',context).val(); var gluster_host = $('#gluster_host',context).val(); @@ -941,8 +933,6 @@ function setupCreateDatastoreDialog(){ var ceph_user = $('#ceph_user',context).val(); var rbd_format = $('#rbd_format',context).val(); var staging_dir = $('#staging_dir',context).val(); - var limit_transfer_bw = $('#limit_transfer_bw',context).val(); - var no_decompress = $('#no_decompress',context).is(':checked'); if (!name){ @@ -974,17 +964,20 @@ function setupCreateDatastoreDialog(){ if (restricted_dirs) ds_obj.datastore.restricted_dirs = restricted_dirs; + if (limit_transfer_bw) + ds_obj.datastore.limit_transfer_bw = limit_transfer_bw; + + if (no_decompress) + ds_obj.datastore.no_decompress = "YES"; + + if (datastore_capacity_check) + ds_obj.datastore.datastore_capacity_check = "YES"; + if (bridge_list) ds_obj.datastore.bridge_list = bridge_list; - if (ds_use_ssh) - ds_obj.datastore.ds_use_ssh = "YES"; - - if (tm_use_ssh) - ds_obj.datastore.tm_use_ssh = "YES"; - - if (base_iqn) - ds_obj.datastore.base_iqn = base_iqn; + if (ds_tmp_dir) + ds_obj.datastore.ds_tmp_dir = ds_tmp_dir; if (vg_name) ds_obj.datastore.vg_name = vg_name; @@ -1016,16 +1009,6 @@ function setupCreateDatastoreDialog(){ if (staging_dir) ds_obj.datastore.staging_dir = staging_dir; - if (limit_transfer_bw) - ds_obj.datastore.limit_transfer_bw = limit_transfer_bw; - - if (no_decompress) - ds_obj.datastore.no_decompress = "YES"; - - // Sanitize dialog - $('#ds_use_ssh').prop('checked', false); - $('#tm_use_ssh').prop('checked', false); - Sunstone.runAction("Datastore.create",ds_obj); return false; }); @@ -1087,6 +1070,9 @@ function select_filesystem(){ }); $('select#disk_type').val('file'); $('select#disk_type').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('input#safe_dirs').removeAttr('disabled'); $('select#disk_type').removeAttr('disabled'); $('input#base_path').removeAttr('disabled'); @@ -1095,13 +1081,15 @@ function select_filesystem(){ } function select_vmware_vmfs(){ - $('label[for="bridge_list"],input#bridge_list').parent().parent().fadeIn(); - $('label[for="ds_use_ssh"],input#ds_use_ssh').fadeIn(); - $('label[for="tm_use_ssh"],input#tm_use_ssh').fadeIn(); + $('label[for="bridge_list"],input#bridge_list').parent().fadeIn(); + $('label[for="ds_tmp_dir"],input#ds_tmp_dir').parent().fadeIn(); $('select#ds_mad').val('vmfs'); $('select#ds_mad').attr('disabled', 'disabled'); $('select#tm_mad').val('vmfs'); $('select#tm_mad').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('file'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1117,7 +1105,7 @@ function select_ceph(){ $('select#ds_mad').attr('disabled', 'disabled'); $('select#tm_mad').val('ceph'); $('select#tm_mad').attr('disabled', 'disabled'); - $('label[for="bridge_list"],input#bridge_list').parent().parent().fadeIn(); + $('label[for="bridge_list"],input#bridge_list').parent().fadeIn(); $('label[for="pool_name"],input#pool_name').parent().fadeIn(); $('label[for="ceph_host"],input#ceph_host').parent().fadeIn(); $('label[for="ceph_secret"],input#ceph_secret').parent().fadeIn(); @@ -1126,6 +1114,7 @@ function select_ceph(){ $('label[for="staging_dir"],input#staging_dir').parent().fadeIn(); $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('RBD'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1141,8 +1130,11 @@ function select_block_lvm(){ $('select#tm_mad').attr('disabled', 'disabled'); $('input#image_ds_type').attr('checked', 'true'); $('input[name=ds_type]').attr('disabled', 'disabled'); - $('label[for="bridge_list"],input#bridge_list').parent().parent().fadeIn(); + $('label[for="bridge_list"],input#bridge_list').parent().fadeIn(); $('label[for="vg_name"],input#vg_name').fadeIn(); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('block'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1158,6 +1150,9 @@ function select_fs_lvm(){ $('select#tm_mad').attr('disabled', 'disabled'); $('input#image_ds_type').attr('checked', 'true'); $('input[name=ds_type]').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('block'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1185,6 +1180,9 @@ function select_gluster(){ $('select#disk_type').attr('disabled', 'disabled'); $('label[for="gluster_host"],input#gluster_host').parent().fadeIn(); $('label[for="gluster_volume"],input#gluster_volume').parent().fadeIn(); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('input#safe_dirs').removeAttr('disabled'); $('input#base_path').removeAttr('disabled'); $('input#limit_mb').removeAttr('disabled'); @@ -1200,6 +1198,9 @@ function select_devices(){ $('input[name=ds_type]').attr('disabled', 'disabled'); $('select#disk_type').val('block'); $('select#disk_type').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().hide(); + $('label[for="no_decompress"],input#no_decompress').parent().hide(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().hide(); $('input#safe_dirs').attr('disabled', 'disabled'); $('input#base_path').attr('disabled', 'disabled'); $('input#limit_mb').attr('disabled', 'disabled'); @@ -1215,6 +1216,9 @@ function select_custom(){ $('input#base_path').removeAttr('disabled'); $('input#limit_mb').removeAttr('disabled'); $('input#restricted_dirs').removeAttr('disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); } function popUpCreateDatastoreDialog(){