diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index 71a9f7607b..fb11c5cd95 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -6488,7 +6488,7 @@ table.extended_table tbody tr td { } /* line 519, ../sass/app.scss */ -.reveal-modal.large { +.reveal-modal { padding-top: 0px; } @@ -6512,3 +6512,14 @@ table.extended_table tbody tr td { fieldset { margin: 0px; } + +/* line 542, ../sass/app.scss */ +.graph_table table { + border: 0px; + margin: 0px; +} + +/* line 547, ../sass/app.scss */ +.graph_table table tr { + border: 0px; +} diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 787501000b..858c2a04cb 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -94,15 +94,32 @@ var hosts_tab_content = '\ '; var create_host_tmpl = -'
\ +'
\ +
\ +

\ + '+tr("Create Host")+'\ +

\ +
\ + \ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\
\ - ' + tr("Host parameters") + '\ - \ -
\ -

' + tr("Drivers") + '

\ -
\ -
\ - \ + '+tr("Drivers")+'\ +
\ +
\ + \ +
\ +
\
\ +
\ +
\ +
\ +
\
\ -
\ - \ - \ \ \ \ @@ -125,40 +149,60 @@ var create_host_tmpl = \ \ \ - \ -
\ - \ - \ + \ +
\ + \ + \ +
\ +
\ +
\ +
\
\
\ -
\ - \ - \ -
\ - \ - \ -
\ -
\ -
\ - \ - \ +
\ +
\ + \ +
\ +
\ + \ +
\ + \ + \ +
\ +
\ +
\ +
\ +
\
\
\ -
\ -
\ -
\ -
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\
\ -
\ +
\ +
\ + \ + \ + \ +
\ + ×\
'; var hosts_select=""; @@ -692,70 +736,77 @@ function updateHostInfo(request,host){ var info_tab = { title : tr("Information"), content : - '\ + '
\ +
\ +
\ \ - \ + \ \ \ \ \ - \ + \ \ \ \ - \ + \ \ ' + insert_cluster_dropdown("Host",host_info.ID,host_info.CLUSTER,host_info.CLUSTER_ID) + '\ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ -
' + tr("Information for Host") + ' - '+host_info.NAME+'
' + tr("Host") + ' - '+host_info.NAME+'
' + tr("id") + ''+host_info.ID+''+host_info.ID+'
' + tr("Name") + ''+host_info.NAME+''+host_info.NAME+'
' + tr("State") + ''+tr(OpenNebula.Helper.resource_state("host",host_info.STATE))+''+tr(OpenNebula.Helper.resource_state("host",host_info.STATE))+'
' + tr("IM MAD") + ''+host_info.IM_MAD+''+host_info.IM_MAD+'
' + tr("VM MAD") + ''+host_info.VM_MAD+''+host_info.VM_MAD+'
'+ tr("VN MAD") +''+host_info.VN_MAD+''+host_info.VN_MAD+'
' + tr("Total Mem") + ''+humanize_size(host_info.HOST_SHARE.MAX_MEM)+''+humanize_size(host_info.HOST_SHARE.MAX_MEM)+'
' + tr("Used Mem (real)") + ''+humanize_size(host_info.HOST_SHARE.USED_MEM)+''+humanize_size(host_info.HOST_SHARE.USED_MEM)+'
' + tr("Used Mem (allocated)") + ''+humanize_size(host_info.HOST_SHARE.MEM_USAGE)+''+humanize_size(host_info.HOST_SHARE.MEM_USAGE)+'
' + tr("Total CPU") + ''+host_info.HOST_SHARE.MAX_CPU+''+host_info.HOST_SHARE.MAX_CPU+'
' + tr("Used CPU (real)") + ''+host_info.HOST_SHARE.USED_CPU+''+host_info.HOST_SHARE.USED_CPU+'
' + tr("Used CPU (allocated)") + ''+host_info.HOST_SHARE.CPU_USAGE+''+host_info.HOST_SHARE.CPU_USAGE+'
' + tr("Running VMs") + ''+host_info.HOST_SHARE.RUNNING_VMS+''+host_info.HOST_SHARE.RUNNING_VMS+'
' + insert_extended_template_table(host_info.TEMPLATE, + \ +
\ +
' + + insert_extended_template_table(host_info.TEMPLATE, "Host", - host_info.ID) + host_info.ID) + + '
\ +
' } diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 4ca73e29a5..88169e2dd0 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -631,8 +631,7 @@ function updateImageInfo(request,img){
\ \ \ - \ + \ \ \ \ diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 27ac5f4f45..9b92cfbf3c 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -655,21 +655,35 @@ function generateMonitoringDivs(graphs, id_prefix, options){ var id=""; var omit_title = options && options.omit_title; + var columns = "six"; + graphs_length = graphs.length; + if (graphs_length == 2) { + columns = "six"; + } + else if (graphs_length == 4) { + columns = "four"; + } + + str += '
' + $.each(graphs,function(){ label = this.monitor_resources; id_suffix=label.replace(/,/g,'_'); id_suffix=id_suffix.replace(/\//g,'_'); id = id_prefix+id_suffix; - str+='
'+tr("Image")+' "'+img_info.NAME+'" '+ - tr("information")+'
'+tr("Image")+' "'+img_info.NAME+'"/th>
'+tr("ID")+'
'+ + str += '
' + str +='
'+ (!omit_title ? '' : '') + '\
'+this.title+'
\
'+ spinner+ '
\ -
'; +
'; }); + str += '' + return str; } @@ -1888,7 +1902,7 @@ function insert_cluster_dropdown(resource_type, resource_id, cluster_value, clus '+(cluster_value.length ? cluster_value : "-")+'\ \
\ - e\ + \
\ '; diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index 6a54dbc6ae..480ed088aa 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -516,7 +516,7 @@ table.extended_table tbody tr td { width: 80%; } -.reveal-modal.large { +.reveal-modal { padding-top: 0px; } @@ -535,4 +535,15 @@ table.extended_table tbody tr td { fieldset { margin: 0px; +} + + + +.graph_table table { + border: 0px; + margin: 0px; +} + +.graph_table table tr { + border: 0px; } \ No newline at end of file