Feature #4363: Fix vm create network selector

This commit is contained in:
Daniel Molina committed 2016-03-10 12:11:38 +01:00
1 parent 853cd05625
commit 204536c905
4 files changed
+29 -32

No files matched your search

@@ -1047,6 +1047,8 @@ define(function(require) {
show_provision_create_vm();
});
Foundation.reflow($('#provision_create_vm'), 'accordion');
//
// Create FLOW
@@ -17,32 +17,29 @@
<div class="row">
<div class="large-10 large-centered columns">
<h2 class="subheader">{{tr "Create Virtual Machine"}}</h2>
<br>
</div>
<br></div>
</div>
<div class="row">
<div class="large-8 large-centered columns">
<input type="text" id="vm_name" class="provision-input" placeholder="{{tr "Virtual Machine Name"}}" style="height: 40px !important; font-size: 16px; padding: 0.5rem !important;"/>
<br>
</div>
<input type="text" id="vm_name" class="provision-input" placeholder="{{tr "Virtual Machine Name"}}"/>
<br></div>
</div>
<div class="row">
<div class="large-10 large-centered columns">
<dl class="accordion provision_accordion_template" data-accordion="provision_accordion_template">
<dd style="border-bottom: 1px solid #efefef;" class="active accordion-navigation">
<a href="#provision_dd_template" style="background: #fff; font-size: 30px">
<span class="select_template" style="color:#555">{{tr "Select a Template"}}</span>
<span class="selected_template" style="display:none; color:#555">
<span class="provision-logo selected_template_logo" style="line-height: 80px"></span>
<ul class="accordion provision_accordion_template" data-accordion data-allow-all-closed="true">
<li class="accordion-item is-active" data-accordion-item>
<a href="#provision_dd_template" class="accordion-title">
<span class="select_template">{{tr "Select a Template"}}</span>
<span class="selected_template" hidden>
<span class="provision-logo selected_template_logo"></span>
<span class="selected_template_name"></span>
<span class="has-tip right" style="cursor: pointer; margin-right:10px; line-height: 80px"> <i class="fa fa-pencil"/></span>
<span class="has-tip right"> <i class="fa fa-pencil"/></span>
</span>
</a>
<div id="provision_dd_template" class="active content">
<div id="provision_dd_template" class="accordion-content" data-tab-content>
<div class="row">
<div class="medium-8 columns">
<button href="#" data-options="align:right" data-dropdown="provisionVMInstantiateLabelsDropdown" class="right small secondary button dropdown radius">
<i class="fa fa-tags"/> {{tr "Labels"}}
<button href="#" data-options="align:right" data-dropdown="provisionVMInstantiateLabelsDropdown" class="right small secondary button dropdown"> <i class="fa fa-tags"/>{{tr "Labels"}}
</button>
<ul id="provisionVMInstantiateLabelsDropdown" class="labels-dropdown f-dropdown" data-dropdown-content></ul>
<input type="search" class="right provision-search-input" placeholder="Search" id="provision_vm_instantiate_template_search"/>
@@ -72,11 +69,10 @@
</div>
</div>
</div>
</dd>
</dl>
</li>
</ul>
</div>
</div>
<br>
<div class="row">
<div class="large-10 large-centered columns">
<div class="provision_capacity_selector"></div>
@@ -88,15 +84,10 @@
<div class="provision_custom_attributes_selector"></div>
</div>
</div>
<br>
<br>
<br>
<div class="row">
<div class="large-7 columns large-centered">
<div data-alert class="alert-box alert-box-error radius text-center" hidden></div>
<button href="#" class="button large success radius large-12 small-12" type="submit" style="height: 59px">{{tr "Create"}}</button>
<div data-alert class="alert-box alert-box-error text-center" hidden></div>
<button href="#" class="button large success large-12 small-12" type="submit">{{tr "Create"}}</button>
</div>
</div>
<br>
<br>
</form>
@@ -172,11 +172,11 @@ define(function(require) {
'</span>';
}
var dd_context = $('<dd style="border-bottom: 1px solid #efefef;" class="accordion-navigation">' +
'<a href="#provision_accordion_dd_' + provision_nic_accordion_dd_id + '" style="background: #fff; font-size: 24px">' +
var dd_context = $('<dd class="accordion-item" data-accordion-item>' +
'<a href="#provision_accordion_dd_' + provision_nic_accordion_dd_id + '" class="accordion-title">' +
nic_span +
'</a>' +
'<div id="provision_accordion_dd_' + provision_nic_accordion_dd_id + '" class="content">' +
'<div id="provision_accordion_dd_' + provision_nic_accordion_dd_id + '" class="accordion-content" data-tab-content>' +
'<div class="row">' +
'<div class="large-12 large-centered columns">' +
'<h3 class="subheader text-right">' +
@@ -203,6 +203,8 @@ define(function(require) {
'</div>' +
'</dd>').appendTo(context);
Foundation.reInit(context);
provision_nic_accordion_dd_id += 1;
var provision_networks_datatable = $('.provision_networks_table', dd_context).dataTable({
@@ -367,16 +369,18 @@ define(function(require) {
'</div>' +
'<div class="row">' +
'<div class="large-12 large-centered columns">' +
'<dl class="accordion provision_nic_accordion" data-accordion="provision_accordion_' + provision_nic_accordion_id + '">' +
'<dl class="accordion provision_nic_accordion" data-accordion data-allow-all-closed="true">' +
'</dl>' +
'<br>' +
'<a class="button radius secondary provision_add_network_interface" style="width:inherit; padding: 1rem; color: #555; ' + (options.hide_add_button ? 'display:none;' : '') + '">' +
'<a class="button secondary provision_add_network_interface"' + (options.hide_add_button ? 'hidden' : '') + '>' +
Locale.tr("Add another Network Interface") +
'</a>' +
'</div>' +
'</div>' +
'<br>')
Foundation.reflow(context, 'accordion');
provision_nic_accordion_id += 1;
$(".provision_add_network_interface", context).on("click", function() {
+2 -2
View File
@@ -2,12 +2,12 @@
.accordion-item {
&.is-active {
.only-not-active {
display: none;
display: none !important;
}
}
&:not(.is-active) {
.only-active {
display: none;
display: none !important;
}
}
}