shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-12 08:58:17 +03:00
Code Releases Wiki Activity

M #~: add charters in cloud view (#4633)

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
This commit is contained in:
Jorge Lobo 2020-04-30 13:27:40 +02:00 committed by GitHub
parent 603d672fcb
commit 449c7a7151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/sunstone/public/app/tabs/provision-tab/vms/list.js
View File

@ -29,6 +29,7 @@ define(function(require) {
var StateActions = require("tabs/vms-tab/utils/state-actions"); var StateActions = require("tabs/vms-tab/utils/state-actions");
var Vnc = require("utils/vnc"); var Vnc = require("utils/vnc");
var Spice = require("utils/spice"); var Spice = require("utils/spice");
var VMsTableUtils = require('../../vms-tab/utils/datatable-common');
var TemplateVmsList = require("hbs!./list"); var TemplateVmsList = require("hbs!./list");
var TemplateConfirmSaveAsTemplate = require("hbs!./confirm_save_as_template"); var TemplateConfirmSaveAsTemplate = require("hbs!./confirm_save_as_template");
@ -170,53 +171,55 @@ define(function(require) {
}, },
"fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var data = aData.VM; var data = aData.VM;
if(data == undefined){ if(data == undefined){
return nRow; return nRow;
} }
var state = get_provision_vm_state(data); var state = get_provision_vm_state(data);
var monitoring = ""; var monitoring = "";
if(data.MONITORING.GUEST_IP){ if(data.MONITORING.GUEST_IP){
monitoring = "<li class=\"provision-bullet-item\"><span class=\"\"><i class=\"fas fa-fw fa-lg fa-server\"/>" + data.MONITORING.GUEST_IP + "</span></li>"; monitoring = "<li class=\"provision-bullet-item\"><span class=\"\"><i class=\"fas fa-fw fa-lg fa-server\"/>" + data.MONITORING.GUEST_IP + "</span></li>";
} }
var charter = VMsTableUtils.leasesClock(data);
$(".provision_vms_ul", context).append("<div class=\"column\">"+ var addStyle = charter && charter.length && 'style="padding-left:.5rem;"'
"<ul class=\"provision-pricing-table menu vertical\" opennebula_id=\""+data.ID+"\" datatable_index=\""+iDisplayIndexFull+"\">"+ $(".provision_vms_ul", context).append("<div class='column'>\
"<li class=\"provision-title\">"+ <ul class='8 provision-pricing-table menu vertical' opennebula_id='"+data.ID+"' datatable_index='"+iDisplayIndexFull+"'>\
"<a class=\"provision_info_vm_button\">"+ <li class='provision-title'>\
"<span class=\""+ state.color +"-color right\" title=\""+state.str+"\">"+ <div style='display: inline-flex;justify-content:space-between;width:100%;align-items: baseline;'>\
"<i class=\"fas fa-square\"/>"+ <a class='provision_info_vm_button' style='flex-grow:1;'>\
"</span>"+ <span class='"+ state.color +"-color right' title='"+state.str+"'>\
data.NAME + "</a>"+ <i class='fas fa-square'/>\
"</li>"+ </span>"+
"<li class=\"provision-bullet-item\" >"+ data.NAME +
"<i class=\"fas fa-fw fa-lg fa-laptop\"/> "+ "</a>\
"x"+data.TEMPLATE.CPU+" - "+ <div class='charter' "+addStyle+">"+charter+"</div> \
</div>\
</li>\
<li class='provision-bullet-item' >\
<i class='fas fa-fw fa-lg fa-laptop'/> "+"x"+data.TEMPLATE.CPU+" - "+
((data.TEMPLATE.MEMORY > 1000) ? ((data.TEMPLATE.MEMORY > 1000) ?
(Math.floor(data.TEMPLATE.MEMORY/1024)+"GB") : (Math.floor(data.TEMPLATE.MEMORY/1024)+"GB") :
(TemplateUtils.htmlEncode(data.TEMPLATE.MEMORY)+"MB"))+ (TemplateUtils.htmlEncode(data.TEMPLATE.MEMORY)+"MB"))+
" - "+ " - "+
get_provision_disk_image(data) + get_provision_disk_image(data) +
"</li>"+ "</li>\
"<li class=\"provision-bullet-item\" >"+ <li class='provision-bullet-item' >\
"<span class=\"\">"+ <span class=''>"+
get_provision_ips(data) + get_provision_ips(data) +
"</span>"+ "</span>\
"</li>"+ monitoring + </li>"+ monitoring +
"<li class=\"provision-bullet-item-last\" >"+ "<li class='provision-bullet-item-last' >\
"<span class=\"\">"+ <span class=''>\
"<i class=\"fas fa-fw fa-lg fa-user\"/> "+ <i class='fas fa-fw fa-lg fa-user'/> "+
data.UNAME+ data.UNAME+
"</span>"+ "</span>"+
"<span class=\"right\">"+ "<span class='right'>"+
Humanize.prettyTimeAgo(data.STIME)+ Humanize.prettyTimeAgo(data.STIME)+
"</span>"+ "</span>\
"</li>"+ </li>\
"</ul>"+ </ul>\
"</div>"); </div>"
);
VMsTableUtils.tooltipCharters();
return nRow; return nRow;
} }
}); });

6
src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
View File

@ -50,7 +50,8 @@ define(function(require) {
'elementArray': _elementArray, 'elementArray': _elementArray,
'emptyElementArray': _emptyElementArray, 'emptyElementArray': _emptyElementArray,
'tooltipCharters': showCharterInfo, 'tooltipCharters': showCharterInfo,
'columns': _columns 'columns': _columns,
'leasesClock': leasesClock
}; };
function checkTime(startTime, addedEndTime, warningTime, rtnTime){ function checkTime(startTime, addedEndTime, warningTime, rtnTime){
@ -107,7 +108,8 @@ define(function(require) {
"z-index":"1", "z-index":"1",
"min-width":"8rem", "min-width":"8rem",
"font-family": '"Lato","Helvetica Neue",Helvetica,Roboto,Arial,sans-serif', "font-family": '"Lato","Helvetica Neue",Helvetica,Roboto,Arial,sans-serif',
"font-weight": "100" "font-weight": "100",
"color":"#000"
}; };
$(".describeCharter").off("mouseenter").on("mouseenter",function(e){ $(".describeCharter").off("mouseenter").on("mouseenter",function(e){
$(this).find(".charterInfo").remove(); $(this).find(".charterInfo").remove();