Feature #4363: Fix service info

This commit is contained in:
Daniel Molina committed 2016-03-10 18:16:29 +01:00
1 parent d309cb6e30
commit 4e4e7dd6da
5 files changed
+54 -50

No files matched your search

@@ -15,16 +15,16 @@
{{! -------------------------------------------------------------------------- }}
<div class="text-center provision_info_flow_loading">
<span class="fa-stack fa-5x" style="color: #dfdfdf"> <i class="fa fa-cloud fa-stack-2x"></i> <i class="fa fa-spinner fa-spin fa-stack-1x fa-inverse"></i>
<span class="fa-stack fa-5x"> <i class="fa fa-cloud fa-stack-2x"></i> <i class="fa fa-spinner fa-spin fa-stack-1x fa-inverse"></i>
</span>
<br>
<br>
<span style="font-size: 18px; color: #999"></span>
<span></span>
</div>
<div class="provision_info_flow">
<div class="row">
<div class="large-12 large-centered columns">
<ul class="inline-list provision_action_icons">
<ul class="menu provision_action_icons">
<li>
<a href"#" title="{{tr "Recover a failed service, cleaning the failed VMs"}}" class="left button small radius success provision_recover_button">
<i class="fa fa-fw fa-lg fa-wrench"/></a>
@@ -45,12 +45,12 @@
<br>
<div class="row">
<div class="large-4 columns">
<ul class="provision-pricing-table_flow_info provision-pricing-table" style="border: 0px !important; background: #fff;"></ul>
<ul class="provision-pricing-table_flow_info provision-pricing-table menu vertical"></ul>
</div>
<div class="large-8 columns">
<div class="row">
<div class="large-12 columns">
<ul class="provision_roles_ul large-block-grid-2 medium-block-grid-2 small-block-grid-1 text-center"></ul>
<div class="provision_roles_ul large-up-2 medium-up-2 small-up-1 text-center"></div>
</div>
</div>
</div>
@@ -162,7 +162,7 @@ define(function(require) {
'<br>'+
'</div>');
} else {
$(".provision_flows_table", context).html('<div class="provision_flows_ul large-up-3 medium-up-3 small-up-1 text-center"></div>');
$(".provision_flows_table", context).html('<div class="provision_flows_ul large-up-3 medium-up-3 small-up-1"></div>');
}
return true;
@@ -183,7 +183,7 @@ define(function(require) {
}
roles_li +=
'<li class="provision-bullet-item text-left"">'+
'<li class="provision-bullet-item"">'+
'<i class="fa fa-fw fa-lg fa-cube"/>&emsp;'+
role.name+
'<span class="right">'+rvms.str+" VMs</span>"+
@@ -193,7 +193,7 @@ define(function(require) {
$(".provision_flows_ul", context).append('<div class="column">'+
'<ul class="provision-pricing-table menu vertical" opennebula_id="'+data.ID+'" datatable_index="'+iDisplayIndexFull+'">'+
'<li class="provision-title text-left">'+
'<li class="provision-title">'+
'<a class="provision_info_flow_button" href="#">'+
'<span class="'+ state.color +'-color" title="'+ state.str +'">'+
'<i class="fa fa-fw fa-lg fa-square"/>&emsp;'+
@@ -202,7 +202,7 @@ define(function(require) {
'</a>'+
'</li>'+
roles_li +
'<li class="provision-bullet-item-last text-right">'+
'<li class="provision-bullet-item-last">'+
'<span class="left">'+
'<i class="fa fa-fw fa-lg fa-user"/>&emsp;'+
data.UNAME+
@@ -311,16 +311,16 @@ define(function(require) {
$(".provision_info_flow_name", context).text(data.NAME);
$(".provision-pricing-table_flow_info", context).html(
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<span class="'+ state.color +'-color">'+
'<i class="fa fa-fw fa-lg fa-square"/>&emsp;'+
state.str+
'</span>'+
'</li>'+
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<hr>'+
'</li>'+
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<span>'+
'<i class="fa fa-fw fa-lg fa-user"/>&emsp;'+
data.UNAME+
@@ -345,27 +345,27 @@ define(function(require) {
}
var li = $(
'<li>'+
'<ul class="provision_role_ul provision-pricing-table">'+
'<li class="provision-title text-left">'+
'<div class="column">'+
'<ul class="provision_role_ul provision-pricing-table menu vertical">'+
'<li class="provision-title">'+
'<i class="fa fa-fw fa-cube"/>&emsp;'+
role.name+
'</li>'+
'<li class="provision-bullet-item text-left">'+
'<li class="provision-bullet-item">'+
'<div class="progress small radius">'+
' <span class="meter" style="width: '+rvms.percentage+'%;"></span>'+
'</div>'+
'</li>'+
'<li class="provision-bullet-item text-left">'+
'<li class="provision-bullet-item">'+
'<span class="'+ role_state.color +'-color">'+
role_state.str+
'</span>'+
'<span class="right">'+rvms.str+" VMs</span>"+
'</li>'+
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<br>'+
'</li>'+
'<li class="provision-bullet-item text-left">'+
'<li class="provision-bullet-item">'+
'<a class="provision_role_vms_button button medium radius">'+
'<i class="fa fa-th fa-lg"></i>'+
'</a>'+
@@ -374,7 +374,7 @@ define(function(require) {
'</a>'+
'</li>'+
'</ul>'+
'</li>').appendTo($(".provision_roles_ul", context));
'</div>').appendTo($(".provision_roles_ul", context));
$(".provision_role_ul", li).data("role", role);
if (role_id && role_id == role.name) {
@@ -435,7 +435,7 @@ define(function(require) {
'<div class="row">'+
'<div class="large-12 large-centered columns">'+
'<div class="row">'+
'<div class="large-4 text-center columns">'+
'<div class="large-4 columns">'+
'<span class="cardinality_value">'+role.cardinality+'</span>'+
'<br>'+
'<span>'+role.name + ' ' + Locale.tr("VMs")+'</span>'+
@@ -15,26 +15,26 @@
{{! -------------------------------------------------------------------------- }}
<div class="text-center provision_info_vm_loading">
<span class="fa-stack fa-5x" style="color: #dfdfdf"> <i class="fa fa-cloud fa-stack-2x"></i> <i class="fa fa-spinner fa-spin fa-stack-1x fa-inverse"></i>
<span class="fa-stack fa-5x"> <i class="fa fa-cloud fa-stack-2x"></i> <i class="fa fa-spinner fa-spin fa-stack-1x fa-inverse"></i>
</span>
<br>
<br>
<span style="font-size: 18px; color: #999"></span>
<span></span>
</div>
<div class="provision_info_vm">
<div class="row">
<div class="large-12 large-centered columns">
<ul class="inline-list provision_action_icons">
<ul class="menu provision_action_icons">
<li>
<a href"#" title="{{tr "Open a remote console in a new window"}}" class="left button small radius provision_vnc_button tip-top">
<i class="fa fa-fw fa-lg fa-desktop"/></a>
<a title="{{tr "You have to boot the Virtual Machine first"}}" class="left button small radius white provision_vnc_button_disabled tip-top" style="color: #999">
<a title="{{tr "You have to boot the Virtual Machine first"}}" class="left button small radius white provision_vnc_button_disabled tip-top">
<i class="fa fa-fw fa-lg fa-desktop"/></a>
{{#isProvisionTabEnabled "provision-tab" "templates"}}
<a href"#" title="{{tr "The main disk of the Virtual Machine will be saved in a new Image"}}" class="left button small radius success provision_snapshot_button tip-top">
<i class="fa fa-fw fa-lg fa-save"/>
</a>
<a title="{{tr "You have to power-off the virtual machine first"}}" class="left button small radius white provision_snapshot_button_disabled tip-top" style="color: #999">
<a title="{{tr "You have to power-off the virtual machine first"}}" class="left button small radius white provision_snapshot_button_disabled tip-top">
<i class="fa fa-fw fa-lg fa-save"/>
</a>
{{/isProvisionTabEnabled}}
@@ -79,21 +79,21 @@
</div>
<div class="row">
<div class="large-5 columns">
<ul class="provision-pricing-table_vm_info provision-pricing-table" style="border: 0px !important; margin-top: 20px;"></ul>
<ul class="provision-pricing-table_vm_info provision-pricing-table menu vertical"></ul>
</div>
<div class="large-6 columns right">
<div class="row">
<div class="large-6 medium-6 columns">
<div class="row text-center">
<div class="large-12 columns">
<h4 class="subheader" style="margin: 0px">
<h4 class="subheader">
<small>{{tr "CPU"}}</small>
</h4>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns centered graph vm_cpu_provision_graph" style="height: 100px;"></div>
<div class="large-12 columns centered graph vm_cpu_provision_graph"></div>
</div>
</div>
<div class="row graph_legend">
@@ -103,14 +103,14 @@
<div class="large-6 medium-6 columns">
<div class="row text-center">
<div class="large-12 columns">
<h4 class="subheader" style="margin: 0px">
<h4 class="subheader">
<small>{{tr "Memory"}}</small>
</h4>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns centered graph vm_memory_provision_graph" style="height: 100px;"></div>
<div class="large-12 columns centered graph vm_memory_provision_graph"></div>
</div>
</div>
<div class="row graph_legend">
@@ -125,14 +125,14 @@
<div class="large-3 medium-6 columns">
<div class="row text-center">
<div class="large-12 columns">
<h4 class="subheader" style="margin: 0px">
<h4 class="subheader">
<small>{{tr "Net RX"}}</small>
</h4>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns centered graph vm_net_rx_provision_graph" style="height: 100px;"></div>
<div class="large-12 columns centered graph vm_net_rx_provision_graph"></div>
</div>
</div>
<div class="row graph_legend">
@@ -142,14 +142,14 @@
<div class="large-3 medium-6 columns">
<div class="row text-center">
<div class="large-12 columns">
<h4 class="subheader" style="margin: 0px">
<h4 class="subheader">
<small>{{tr "Net TX"}}</small>
</h4>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns centered graph vm_net_tx_provision_graph" style="height: 100px;"></div>
<div class="large-12 columns centered graph vm_net_tx_provision_graph"></div>
</div>
</div>
<div class="row graph_legend">
@@ -159,14 +159,14 @@
<div class="large-3 medium-6 columns">
<div class="row text-center">
<div class="large-12 columns">
<h4 class="subheader" style="margin: 0px">
<h4 class="subheader">
<small>{{tr "Net Download Speed"}}</small>
</h4>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns centered graph vm_net_rx_speed_provision_graph" style="height: 100px;"></div>
<div class="large-12 columns centered graph vm_net_rx_speed_provision_graph"></div>
</div>
</div>
<div class="row graph_legend">
@@ -176,14 +176,14 @@
<div class="large-3 medium-6 columns">
<div class="row text-center">
<div class="large-12 columns">
<h4 class="subheader" style="margin: 0px">
<h4 class="subheader">
<small>{{tr "Net Upload Speed"}}</small>
</h4>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns centered graph vm_net_tx_speed_provision_graph" style="height: 100px;"></div>
<div class="large-12 columns centered graph vm_net_tx_speed_provision_graph"></div>
</div>
</div>
<div class="row graph_legend">
@@ -150,7 +150,7 @@ define(function(require) {
'</span>'+
'</div>');
} else {
$(".provision_vms_table", context).html('<div class="provision_vms_ul large-up-3 medium-up-3 small-up-1 text-center"></div>');
$(".provision_vms_table", context).html('<div class="provision_vms_ul large-up-3 medium-up-3 small-up-1"></div>');
}
return true;
@@ -161,14 +161,14 @@ define(function(require) {
$(".provision_vms_ul", context).append('<div class="column">'+
'<ul class="provision-pricing-table menu vertical" opennebula_id="'+data.ID+'" datatable_index="'+iDisplayIndexFull+'">'+
'<li class="provision-title text-left">'+
'<li class="provision-title">'+
'<a class="provision_info_vm_button">'+
'<span class="'+ state.color +'-color" title="'+state.str+'">'+
'<i class="fa fa-fw fa-square"/> '+
'</span>'+
data.NAME + '</a>'+
'</li>'+
'<li class="provision-bullet-item text-left" >'+
'<li class="provision-bullet-item" >'+
'<i class="fa fa-fw fa-lg fa-laptop"/> '+
'x'+data.TEMPLATE.CPU+' - '+
((data.TEMPLATE.MEMORY > 1000) ?
@@ -177,12 +177,12 @@ define(function(require) {
' - '+
get_provision_disk_image(data) +
'</li>'+
'<li class="provision-bullet-item text-left" >'+
'<li class="provision-bullet-item" >'+
'<span class="">'+
get_provision_ips(data) +
'</span>'+
'</li>'+
'<li class="provision-bullet-item-last text-left" >'+
'<li class="provision-bullet-item-last" >'+
'<span class="">'+
'<i class="fa fa-fw fa-lg fa-user"/> '+
data.UNAME+
@@ -371,16 +371,16 @@ define(function(require) {
}
$(".provision-pricing-table_vm_info", context).html(
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<span class="'+ state.color +'-color">'+
'<i class="fa fa-fw fa-lg fa-square"/>&emsp;'+
state.str+
'</span>'+
'</li>'+
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<hr>'+
'</li>'+
'<li class="text-left provision-bullet-item" >'+
'<li class="provision-bullet-item" >'+
'<span>'+
'<i class="fa fa-fw fa-lg fa-laptop"/>&emsp;'+
'x'+data.TEMPLATE.CPU+' - '+
@@ -393,15 +393,15 @@ define(function(require) {
get_provision_disk_image(data) +
'</span>'+
'</li>'+
'<li class="text-left provision-bullet-item" >'+
'<li class="provision-bullet-item" >'+
'<span>'+
get_provision_ips(data) +
'</span>'+
'</li>'+
'<li class="text-left provision-bullet-item">'+
'<li class="provision-bullet-item">'+
'<hr>'+
'</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"/>&emsp;'+
data.UNAME+
+4
View File
@@ -30,4 +30,8 @@ table {
input {
margin-bottom: 0px !important;
}
}
.graph {
height: rem-calc(100px);
}