feature #4363: Fix provision vm create

This commit is contained in:
Daniel Molina committed 2016-03-30 17:51:11 +02:00
1 parent 9ca8ecf310
commit a2eda5b43f
6 files changed
+153 -151

No files matched your search

+48 -81
View File
@@ -218,8 +218,6 @@ define(function(require) {
}
}
var provision_capacity_accordion_id = 0;
function generate_provision_capacity_accordion(context, element) {
var capacity = element.TEMPLATE;
@@ -237,74 +235,39 @@ define(function(require) {
}
context.html(
'<br>'+
'<div class="row">'+
'<div class="large-12 large-centered columns">'+
'<h3 class="subheader">'+
'<span class="left">'+
'<i class="fa fa-laptop fa-lg"></i> '+
Locale.tr("Capacity")+
'</span>'+
'<span>'+
'<span class="cpu_value">'+(capacity.CPU ? capacity.CPU : '-')+'</span> '+
'<small>'+Locale.tr("CPU")+'</small>'+
'<span class="memory_value">'+memory_value+'</span>'+
' '+
'<span class="memory_unit">'+memory_unit+'</span> '+
'<small>'+Locale.tr("MEMORY")+'</small>'+
'<span class="provision_create_template_cost_div" hidden>' +
'<span class="cost_value">0.00</span> '+
'<small>'+Locale.tr("COST")+' / ' + Locale.tr("HOUR") + '</small>'+
'</span>'+
'</span>'+
'</h3>'+
'<br>'+
'</div>'+
'</div>'+
(Config.provision.create_vm.isEnabled("capacity_select") ?
'<div class="row">'+
'<div class="large-12 large-centered columns">'+
'<dl class="accordion" data-accordion data-allow-all-closed="true">'+
'<dd class="accordion-item" data-accordion-item>'+
'<a href="#provision_capacity_dd_'+provision_capacity_accordion_id+'" class="accordion-title">'+
Locale.tr("Change Capacity")+
'</a>'+
'<div id="provision_capacity_dd_'+provision_capacity_accordion_id+'" class="accordion-content" data-tab-content>'+
'<br>'+
CapacityInputs.html() +
'</div>'+
'</dd>'+
'</dl>'+
'</div>'+
'</div>' : '' ) +
'<br>');
'<fieldset>' +
'<legend>' +
'<i class="fa fa-laptop fa-lg"></i> '+
Locale.tr("Capacity") + ' ' +
'<span class="provision_create_template_cost_div" hidden>' +
'<span class="cost_value">0.00</span> '+
'<small>'+Locale.tr("COST")+' / ' + Locale.tr("HOUR") + '</small>'+
'</span>'+
'</legend>' +
CapacityInputs.html() +
'</fieldset>');
if (Config.provision.create_vm.isEnabled("capacity_select")) {
Foundation.reflow(context, 'accordion');
provision_capacity_accordion_id += 1;
CapacityInputs.setup(context);
CapacityInputs.fill(context, element);
CapacityInputs.setup(context);
CapacityInputs.fill(context, element);
CapacityInputs.setCallback(context, function(values){
$(".cpu_value", context).html(values.CPU);
CapacityInputs.setCallback(context, function(values){
$(".cpu_value", context).html(values.CPU);
var memory_value;
var memory_unit;
var memory_value;
var memory_unit;
if (values.MEMORY >= 1024){
memory_value = (values.MEMORY/1024).toFixed(2);
memory_unit = "GB";
} else {
memory_value = values.MEMORY;
memory_unit = "MB";
}
if (values.MEMORY >= 1024){
memory_value = (values.MEMORY/1024).toFixed(2);
memory_unit = "GB";
} else {
memory_value = values.MEMORY;
memory_unit = "MB";
}
$(".memory_value", context).html(memory_value);
$(".memory_unit", context).html(memory_unit);
});
}
$(".memory_value", context).html(memory_value);
$(".memory_unit", context).html(memory_unit);
});
var cost = 0;
@@ -616,7 +579,7 @@ define(function(require) {
$("#provision_create_vm .provision_network_selector").html("");
$("#provision_create_vm .provision_custom_attributes_selector").html("")
$("#provision_create_vm dd:not(.active) a[href='#provision_dd_template']").trigger("click")
$("#provision_create_vm li:not(.is-active) a[href='#provision_dd_template']").trigger("click")
$(".section_content").hide();
$("#provision_create_vm").fadeIn();
@@ -790,7 +753,7 @@ define(function(require) {
var logo;
if (data.TEMPLATE.LOGO) {
logo = '<span class="provision-logo" href="#">'+
logo = '<span class="provision-logo">'+
'<img src="'+data.TEMPLATE.LOGO+'">'+
'</span>';
} else {
@@ -809,19 +772,19 @@ define(function(require) {
owner = Locale.tr("system");
}
var li = $('<div class="column">'+
'<ul class="provision-pricing-table hoverable only-one menu vertical" opennebula_id="'+data.ID+'">'+
var li = $('<div class="column">' +
'<ul class="provision-pricing-table only-one hoverable menu vertical text-center" opennebula_id="'+data.ID+'">'+
'<li class="provision-title" title="'+data.NAME+'">'+
data.NAME+
'<a href="">' + data.NAME + '</a>' +
'</li>'+
'<li class="provision-bullet-item">'+
logo +
'</li>'+
'<li class="provision-description">'+
'<li class="provision-bullet-item">'+
(data.TEMPLATE.DESCRIPTION || '...')+
'</li>'+
'<li class="provision-bullet-item">'+
'<span class="left">'+
'<li class="provision-bullet-item-last text-left">'+
'<span>'+
'<i class="fa fa-fw fa-lg fa-user"/> '+
owner+
'</span>'+
@@ -848,7 +811,7 @@ define(function(require) {
'</div>');
} else {
$('#'+tableID+'_table').html(
'<div id="'+tableID+'_ul" class="row large-up-3 medium-up-3 small-up-1"></div>');
'<div id="'+tableID+'_ul" class="row large-up-5 medium-up-3 small-up-1"></div>');
}
return true;
@@ -928,12 +891,12 @@ define(function(require) {
var create_vm_context = $("#provision_create_vm");
if ($(this).hasClass("selected")){
$(".provision_disk_selector", create_vm_context).html("");
$(".provision_network_selector", create_vm_context).html("");
$(".provision_capacity_selector", create_vm_context).html("");
$(".provision_accordion_template .selected_template").hide();
$(".provision_accordion_template .select_template").show();
//$(".provision_disk_selector", create_vm_context).html("");
//$(".provision_network_selector", create_vm_context).html("");
//$(".provision_capacity_selector", create_vm_context).html("");
//
//$(".provision_accordion_template .selected_template").hide();
//$(".provision_accordion_template .select_template").show();
} else {
var template_id = $(this).attr("opennebula_id");
var template_json = $(this).data("opennebula");
@@ -983,16 +946,20 @@ define(function(require) {
} else {
$(".provision_custom_attributes_selector", create_vm_context).html("");
}
return false;
}
})
tab.on("click", "#provision_create_vm .provision-pricing-table.only-one" , function(){
if ($(this).hasClass("selected")){
$(this).removeClass("selected");
//$(this).removeClass("selected");
} else {
$(".provision-pricing-table", $(this).parents(".large-up-3,.large-up-2")).removeClass("selected")
$(".provision-pricing-table", $(this).parents(".dataTable")).removeClass("selected")
$(this).addClass("selected");
}
return false;
})
$("#provision_create_vm").submit(function(){
@@ -185,15 +185,15 @@ define(function(require) {
data.NAME +
'</span>' +
'</li>'+
'<li class="provision-bullet-item">'+
(data.TEMPLATE.DESCRIPTION || '')+
'</li>'+
'<li class="provision-bullet-item" >'+
'<i class="fa fa-fw fa-lg fa-laptop"/> '+
cpu_txt+' - '+
mem_txt+' - '+
get_provision_disk_image(data) +
'</li>'+
'<li class="provision-description">'+
(data.TEMPLATE.DESCRIPTION || '')+
'</li>'+
'<li class="provision-bullet-item text-right">'+
actions_html+
'</li>'+
@@ -15,79 +15,89 @@
{{! -------------------------------------------------------------------------- }}
<form id="provision_create_vm" class="section_content" hidden>
<div class="row">
<div class="large-10 large-centered columns">
<h2 class="subheader">{{tr "Create Virtual Machine"}}</h2>
<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"}}"/>
<br></div>
</div>
<div class="row">
<div class="large-10 large-centered columns">
<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"> <i class="fa fa-pencil"/></span>
</span>
</a>
<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"> <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"/>
</div>
<div class="medium-4 columns">
<select id="provision_vm_instantiate_templates_owner_filter">
<option value="all" selected="selected">{{tr "ALL"}}</option>
<option value="mine">{{tr "mine"}}</option>
<option value="group">{{tr "group"}}</option>
<option value="system">{{tr "system"}}</option>
</select>
</div>
</div>
<div class="row provision_select_template">
<div class="small-12 columns">
<table id="provision_vm_instantiate_templates_table">
<thead hidden>
<tr>
<th>ID</th>
<th>Name</th>
<th>OWNER</th>
<th>Labels</th>
</tr>
</thead>
<tbody hidden></tbody>
</table>
</div>
</div>
</div>
</li>
</ul>
<div class="large-6 columns">
<h3>{{tr "Create Virtual Machine"}}</h3>
</div>
<div class="large-6 columns">
<button href="#" class="button large success right" type="submit">{{tr "Create"}}</button>
<div data-alert class="alert-box alert-box-error text-center" hidden></div>
</div>
</div>
<div class="row">
<div class="large-10 large-centered columns">
<div class="large-6 columns">
<input type="text" id="vm_name" class="provision-input" placeholder="{{tr "Virtual Machine Name"}}"/>
</div>
</div>
<fieldset>
<legend>{{tr "Template"}}</legend>
<div class="row">
<div class="large-12 columns">
<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="selected_template" hidden>
<span class="provision-logo selected_template_logo"></span>
<span class="selected_template_name"></span>
<span class=""> <i class="fa fa-lg fa-pencil"/></span>
</span>
</a>
<div id="provision_dd_template" class="accordion-content" data-tab-content>
<div class="row">
<div class="medium-6 columns">
<div class="row collapse">
<div class="medium-5 columns">
<input type="search" class="provision-search-input" placeholder="Search Template" id="provision_vm_instantiate_template_search"/>
</div>
<div class="medium-3 columns">
<select id="provision_vm_instantiate_templates_owner_filter">
<option value="all" selected="selected">{{tr "ALL"}}</option>
<option value="mine">{{tr "mine"}}</option>
<option value="group">{{tr "group"}}</option>
<option value="system">{{tr "system"}}</option>
</select>
</div>
<div class="medium-4 columns">
<button href="#" data-options="align:right" data-dropdown="provisionVMInstantiateLabelsDropdown" class="secondary button dropdown"> <i class="fa fa-tags"/>{{tr "Labels"}}
</button>
<ul id="provisionVMInstantiateLabelsDropdown" class="labels-dropdown f-dropdown" data-dropdown-content></ul>
</div>
</div>
<div class="medium-6 columns"></div>
</div>
</div>
<div class="row provision_select_template">
<div class="small-12 columns">
<table id="provision_vm_instantiate_templates_table">
<thead hidden>
<tr>
<th>ID</th>
<th>Name</th>
<th>OWNER</th>
<th>Labels</th>
</tr>
</thead>
<tbody hidden></tbody>
</table>
</div>
</div>
</div>
</li>
</ul>
</div>
</div>
</fieldset>
<div class="row">
<div class="large-6 columns">
<div class="provision_capacity_selector"></div>
<br>
</div>
<div class="large-6 columns">
<div class="provision_disk_selector"></div>
<br>
</div>
<div class="large-6 columns">
<div class="provision_network_selector"></div>
<br>
</div>
<div class="large-6 columns">
<div class="provision_custom_attributes_selector"></div>
</div>
</div>
<div class="row">
<div class="large-7 columns large-centered">
<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>
</form>
@@ -20,7 +20,7 @@
</span>
</a>
<h3>
{{!opts.title}}
{{opts.title}}
<span class="provision_info_vm_name only-not-active"></span>
{{#isTabActionEnabled "provision-tab" "VM.rename"}}
<small class="provision_info_vm_rename only-not-active">
+19
View File
@@ -59,4 +59,23 @@
background: #dfdfdf;
}
}
}
.provision_accordion_template {
.accordion-item > a {
padding: 0;
font-size: 1.2rem;
i {
color: $primary-color;
}
}
.accordion-content {
margin-top: 1rem;
.provision_select_template {
margin-top: 1rem;
}
}
}
+6
View File
@@ -97,4 +97,10 @@ textarea {
.dropdown-pane {
width: auto;
max-width: 300px;
}
.provision-logo {
img {
height: 3rem;
}
}