mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 12:22:38 +09:00
Feature #4363: Fix network section
This commit is contained in:
1 parent
2ddd62f27d
commit
ba7b2dbddf
6 files changed
+41
-41
No files matched your search
@@ -101,9 +101,9 @@ define(function(require) {
|
||||
'<br>'+
|
||||
'<div class="row">'+
|
||||
'<div class="large-12 large-centered columns">'+
|
||||
'<h3 class="subheader text-right">'+
|
||||
'<h3 class="subheader">'+
|
||||
'<span class="left">'+
|
||||
'<i class="fa fa-th fa-lg"></i> '+
|
||||
'<i class="fa fa-th fa-lg"></i> '+
|
||||
Locale.tr("Cardinality")+
|
||||
'</span>'+
|
||||
'</h3>'+
|
||||
@@ -249,9 +249,9 @@ define(function(require) {
|
||||
'<br>'+
|
||||
'<div class="row">'+
|
||||
'<div class="large-12 large-centered columns">'+
|
||||
'<h3 class="subheader text-right">'+
|
||||
'<h3 class="subheader">'+
|
||||
'<span class="left">'+
|
||||
'<i class="fa fa-laptop fa-lg"></i> '+
|
||||
'<i class="fa fa-laptop fa-lg"></i> '+
|
||||
Locale.tr("Capacity")+
|
||||
'</span>'+
|
||||
'<span>'+
|
||||
@@ -829,9 +829,9 @@ define(function(require) {
|
||||
'<li class="provision-description">'+
|
||||
(data.TEMPLATE.DESCRIPTION || '...')+
|
||||
'</li>'+
|
||||
'<li class="text-right provision-bullet-item">'+
|
||||
'<li class="provision-bullet-item">'+
|
||||
'<span class="left">'+
|
||||
'<i class="fa fa-fw fa-lg fa-user"/> '+
|
||||
'<i class="fa fa-fw fa-lg fa-user"/> '+
|
||||
owner+
|
||||
'</span>'+
|
||||
'</li>'+
|
||||
@@ -953,7 +953,7 @@ define(function(require) {
|
||||
if (template_json.VMTEMPLATE.TEMPLATE.LOGO) {
|
||||
$(".provision_accordion_template .selected_template_logo").html('<img src="'+template_json.VMTEMPLATE.TEMPLATE.LOGO+'">');
|
||||
} else {
|
||||
$(".provision_accordion_template .selected_template_logo").html('<i class="fa fa-file-text-o fa-lg"/> ');
|
||||
$(".provision_accordion_template .selected_template_logo").html('<i class="fa fa-file-text-o fa-lg"/> ');
|
||||
}
|
||||
|
||||
$(".provision_accordion_template a").first().trigger("click");
|
||||
@@ -987,7 +987,7 @@ define(function(require) {
|
||||
UserInputs.vmTemplateInsert(
|
||||
$(".provision_custom_attributes_selector", create_vm_context),
|
||||
template_json,
|
||||
{text_header: '<i class="fa fa-gears fa-lg"></i> '+Locale.tr("Custom Attributes")});
|
||||
{text_header: '<i class="fa fa-gears fa-lg"></i> '+Locale.tr("Custom Attributes")});
|
||||
|
||||
} else {
|
||||
$(".provision_custom_attributes_selector", create_vm_context).html("");
|
||||
@@ -1085,7 +1085,7 @@ define(function(require) {
|
||||
'</span>'+
|
||||
'</div>');
|
||||
} else {
|
||||
$("#provision_flow_templates_table").html('<div id="provision_flow_templates_ul" class="large-up-3 medium-up-3 small-up-1 text-center"></div>');
|
||||
$("#provision_flow_templates_table").html('<div id="provision_flow_templates_ul" class="large-up-3 medium-up-3 small-up-1"></div>');
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -1099,8 +1099,8 @@ define(function(require) {
|
||||
if (body.roles) {
|
||||
$.each(body.roles, function(index, role) {
|
||||
roles_li +=
|
||||
'<li class="provision-bullet-item text-left">'+
|
||||
'<i class="fa fa-fw fa-cube"/> '+
|
||||
'<li class="provision-bullet-item">'+
|
||||
'<i class="fa fa-fw fa-cube"/> '+
|
||||
role.name+
|
||||
'<span class="right">'+role.cardinality+" VMs</span>"+
|
||||
'</li>';
|
||||
@@ -1169,7 +1169,7 @@ define(function(require) {
|
||||
$(".provision_accordion_flow_template .selected_template").show();
|
||||
$(".provision_accordion_flow_template .select_template").hide();
|
||||
$(".provision_accordion_flow_template .selected_template_name").html(data.DOCUMENT.NAME)
|
||||
$(".provision_accordion_flow_template .selected_template_logo").html('<i class="fa fa-cubes fa-lg"/> ');
|
||||
$(".provision_accordion_flow_template .selected_template_logo").html('<i class="fa fa-cubes fa-lg"/> ');
|
||||
$(".provision_accordion_flow_template a").first().trigger("click");
|
||||
|
||||
var context = $("#provision_create_flow");
|
||||
@@ -1221,7 +1221,7 @@ define(function(require) {
|
||||
'<div class="row">'+
|
||||
'<div class="large-10 large-centered columns">'+
|
||||
'<h2 class="subheader">'+
|
||||
'<i class="fa fa-cube fa-lg"></i> '+
|
||||
'<i class="fa fa-cube fa-lg"></i> '+
|
||||
role.name+
|
||||
'</h2>'+
|
||||
'<br>'+
|
||||
@@ -1262,7 +1262,7 @@ define(function(require) {
|
||||
UserInputs.vmTemplateInsert(
|
||||
$(".provision_custom_attributes_selector", role_context),
|
||||
template_json,
|
||||
{text_header: '<i class="fa fa-gears fa-lg"></i> '+Locale.tr("Custom Attributes")});
|
||||
{text_header: '<i class="fa fa-gears fa-lg"></i> '+Locale.tr("Custom Attributes")});
|
||||
|
||||
} else {
|
||||
$(".provision_custom_attributes_selector", role_context).html("");
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
<span class="selected_template">
|
||||
<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 class="has-tip"> <i class="fa fa-pencil"/></span>
|
||||
</span>
|
||||
</a>
|
||||
<div id="provision_dd_flow_template" class="provision_select_flow_template accordion-content" data-tab-content>
|
||||
<div class="row">
|
||||
<div class="large-12 large-centered columns">
|
||||
<h3 class="subheader text-right">
|
||||
<input type="search" class="provision-search-input right" placeholder="Search" id="provision_create_flow_template_search"/>
|
||||
<h3 class="subheader">
|
||||
<input type="search" class="provision-search-input" placeholder="Search" id="provision_create_flow_template_search"/>
|
||||
</h3>
|
||||
<br></div>
|
||||
</div>
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<div class="large-8 columns">
|
||||
<div class="row">
|
||||
<div class="large-12 columns">
|
||||
<div class="provision_roles_ul large-up-2 medium-up-2 small-up-1 text-center"></div>
|
||||
<div class="provision_roles_ul large-up-2 medium-up-2 small-up-1"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -186,7 +186,7 @@ define(function(require) {
|
||||
'<li class="provision-bullet-item"">'+
|
||||
'<i class="fa fa-fw fa-lg fa-cube"/> '+
|
||||
role.name+
|
||||
'<span class="right">'+rvms.str+" VMs</span>"+
|
||||
'<span>'+rvms.str+" VMs</span>"+
|
||||
'</li>';
|
||||
});
|
||||
}
|
||||
@@ -203,7 +203,7 @@ define(function(require) {
|
||||
'</li>'+
|
||||
roles_li +
|
||||
'<li class="provision-bullet-item-last">'+
|
||||
'<span class="left">'+
|
||||
'<span>'+
|
||||
'<i class="fa fa-fw fa-lg fa-user"/> '+
|
||||
data.UNAME+
|
||||
'</span>'+
|
||||
@@ -325,7 +325,7 @@ define(function(require) {
|
||||
'<i class="fa fa-fw fa-lg fa-user"/> '+
|
||||
data.UNAME+
|
||||
'</span>'+
|
||||
'<span class="right">'+
|
||||
'<span>'+
|
||||
'<i class="fa fa-fw fa-lg fa-clock-o"/> '+
|
||||
(start_time ? Humanize.prettyTimeAgo(start_time) : "...") +
|
||||
' - '+
|
||||
@@ -360,7 +360,7 @@ define(function(require) {
|
||||
'<span class="'+ role_state.color +'-color">'+
|
||||
role_state.str+
|
||||
'</span>'+
|
||||
'<span class="right">'+rvms.str+" VMs</span>"+
|
||||
'<span>'+rvms.str+" VMs</span>"+
|
||||
'</li>'+
|
||||
'<li class="provision-bullet-item">'+
|
||||
'<br>'+
|
||||
@@ -369,7 +369,7 @@ define(function(require) {
|
||||
'<a class="provision_role_vms_button button medium radius">'+
|
||||
'<i class="fa fa-th fa-lg"></i>'+
|
||||
'</a>'+
|
||||
'<a class="provision_role_cardinality_button button medium success right radius">'+
|
||||
'<a class="provision_role_cardinality_button button medium success radius">'+
|
||||
'<i class="fa fa-arrows-h fa-lg"></i>'+
|
||||
'</a>'+
|
||||
'</li>'+
|
||||
@@ -443,8 +443,8 @@ define(function(require) {
|
||||
'<div class="large-8 columns">'+
|
||||
'<div class="cardinality_slider_div">'+
|
||||
'<br>'+
|
||||
'<span class="left">'+min_vms+'</span>'+
|
||||
'<span class="right">'+max_vms+'</span>'+
|
||||
'<span>'+min_vms+'</span>'+
|
||||
'<span>'+max_vms+'</span>'+
|
||||
'<br>'+
|
||||
'<div class="range-slider cardinality_slider" data-slider>'+
|
||||
'<span class="range-slider-handle" role="slider" tabindex="0"></span>'+
|
||||
@@ -516,7 +516,7 @@ define(function(require) {
|
||||
'</span>'+
|
||||
'</div>'+
|
||||
'<div class="large-3 columns">'+
|
||||
'<a href"#" class="provision_delete_button alert button large-12 radius right">'+Locale.tr("Delete")+'</a>'+
|
||||
'<a href"#" class="provision_delete_button alert button large-12 radius">'+Locale.tr("Delete")+'</a>'+
|
||||
'</div>'+
|
||||
'</div>'+
|
||||
'<button class="close-button" aria-label="' + Locale.tr("Dismiss Alert") + ' type="button" data-close>' +
|
||||
@@ -537,7 +537,7 @@ define(function(require) {
|
||||
'</span>'+
|
||||
'</div>'+
|
||||
'<div class="large-3 columns">'+
|
||||
'<a href"#" class="provision_shutdown_button alert button large-12 radius right">'+Locale.tr("Shutdown")+'</a>'+
|
||||
'<a href"#" class="provision_shutdown_button alert button large-12 radius">'+Locale.tr("Shutdown")+'</a>'+
|
||||
'</div>'+
|
||||
'</div>'+
|
||||
'<button class="close-button" aria-label="' + Locale.tr("Dismiss Alert") + ' type="button" data-close>' +
|
||||
|
||||
@@ -140,7 +140,7 @@ define(function(require) {
|
||||
'</span>'+
|
||||
'</div>');
|
||||
} else {
|
||||
$(".provision_templates_table", context).html('<div class="provision_templates_ul large-up-3 medium-up-3 small-up-1 text-center"></div>');
|
||||
$(".provision_templates_table", context).html('<div class="provision_templates_ul large-up-3 medium-up-3 small-up-1"></div>');
|
||||
}
|
||||
return true;
|
||||
},
|
||||
|
||||
@@ -137,10 +137,10 @@ define(function(require) {
|
||||
'<span>' + Locale.tr("INTERFACE") + "</span>" +
|
||||
'<span>' + (options.nic.NETWORK || options.nic.NETWORK_ID) + "</span>" +
|
||||
'</span>' +
|
||||
'<span class="has-tip right provision_remove_nic">' +
|
||||
'<span class="has-tip provision_remove_nic">' +
|
||||
'<i class="fa fa-times"/>' +
|
||||
'</span>' +
|
||||
'<span class="has-tip right">' +
|
||||
'<span class="has-tip">' +
|
||||
'<i class="fa fa-pencil"/>' +
|
||||
'</span>';
|
||||
} else if (options.vnet_attr) {
|
||||
@@ -152,7 +152,7 @@ define(function(require) {
|
||||
'<span class="only-active">' +
|
||||
Locale.tr("Select a Network for this interface") +
|
||||
'</span>' +
|
||||
'<span class="has-tip right only-not-active">' +
|
||||
'<span class="has-tip only-not-active">' +
|
||||
'<i class="fa fa-pencil"/>' +
|
||||
'</span>';
|
||||
} else {
|
||||
@@ -164,10 +164,10 @@ define(function(require) {
|
||||
'<span class="only-active">' +
|
||||
Locale.tr("Select a Network for this interface") +
|
||||
'</span>' +
|
||||
'<span class="has-tip right provision_remove_nic">' +
|
||||
'<span class="has-tip provision_remove_nic">' +
|
||||
'<i class="fa fa-times"/>' +
|
||||
'</span>' +
|
||||
'<span class="has-tip right only-not-active">' +
|
||||
'<span class="has-tip only-not-active">' +
|
||||
'<i class="fa fa-pencil"/>' +
|
||||
'</span>';
|
||||
}
|
||||
@@ -179,8 +179,8 @@ define(function(require) {
|
||||
'<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">' +
|
||||
'<input type="search" class="provision-search-input right" placeholder="Search"/>' +
|
||||
'<h3 class="subheader">' +
|
||||
'<input type="search" class="provision-search-input" placeholder="Search"/>' +
|
||||
'</h3>' +
|
||||
'<br>' +
|
||||
'</div>' +
|
||||
@@ -234,8 +234,8 @@ define(function(require) {
|
||||
'</div>');
|
||||
} else {
|
||||
$(".provision_networks_table", dd_context).html(
|
||||
'<ul class="provision_networks_ul large-block-grid-3 medium-block-grid-3 small-block-grid-1 text-center">' +
|
||||
'</ul>');
|
||||
'<div class="provision_networks_ul large-up-3 medium-up-3 small-up-1 text-center">' +
|
||||
'</div>');
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -243,8 +243,8 @@ define(function(require) {
|
||||
"fnRowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull) {
|
||||
var data = aData.VNET;
|
||||
$(".provision_networks_ul", dd_context).append(
|
||||
'<li>' +
|
||||
'<ul class="provision-pricing-table hoverable more-than-one" opennebula_id="' + data.ID + '" opennebula_name="' + data.NAME + '">' +
|
||||
'<div class="column">' +
|
||||
'<ul class="provision-pricing-table hoverable more-than-one menu vertical" opennebula_id="' + data.ID + '" opennebula_name="' + data.NAME + '">' +
|
||||
'<li class="provision-title" title="' + data.NAME + '">' +
|
||||
data.NAME +
|
||||
'</li>' +
|
||||
@@ -255,7 +255,7 @@ define(function(require) {
|
||||
(data.TEMPLATE.DESCRIPTION || '...') +
|
||||
'</li>' +
|
||||
'</ul>' +
|
||||
'</li>');
|
||||
'</div>');
|
||||
|
||||
return nRow;
|
||||
}
|
||||
@@ -358,7 +358,7 @@ define(function(require) {
|
||||
'<br>' +
|
||||
'<div class="row">' +
|
||||
'<div class="large-12 columns">' +
|
||||
'<h3 class="subheader text-right">' +
|
||||
'<h3 class="subheader">' +
|
||||
'<span class="left">' +
|
||||
'<i class="fa fa-globe fa-lg"></i> ' +
|
||||
Locale.tr("Network") +
|
||||
|
||||
Reference in new issue
Block a user