nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-25 08:33:22 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #825 from nclsHart/webui-cpu-name

Browse Source 
[Web UI] add cpu name in quicklook plugin
This commit is contained in:
Nicolas Hennion 2016-03-27 22:29:51 +02:00
commit f5cc721360
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glances/outputs/static/css/style.css
View File

@ -7,6 +7,7 @@ body {
.table {
display: table;
width: 100%;
max-width:100%;
}
.table-row-group {
display: table-row-group
@ -51,7 +52,7 @@ body {
/* Theme */
.title{
.title {
font-weight: bold;
color: white;
}
@ -126,6 +127,12 @@ body {
#quicklook .progress-bar-critical {
background-color: #A30000;
}
#quicklook .cpu-name {
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
}
#monitor .process-result {
max-width: 300px;
overflow: hidden;

3
glances/outputs/static/html/plugins/quicklook.html
View File

@ -1,3 +1,6 @@
<div class="cpu-name">
{{ statsQuicklook.cpu_name }}
</div>
<div class="table">
<div class="table-row" ng-show="!arguments.percpu">
<div class="table-cell text-left">CPU</div>

6
glances/outputs/static/js/services/plugins/glances_quicklook.js
View File

@ -4,6 +4,9 @@ glancesApp.service('GlancesPluginQuicklook', function() {
this.mem = null;
this.cpu = null;
this.cpu_name = null;
this.cpu_hz_current = null;
this.cpu_hz = null;
this.swap = null;
this.percpus = [];
@ -13,6 +16,9 @@ glancesApp.service('GlancesPluginQuicklook', function() {
this.mem = data.mem;
this.cpu = data.cpu;
this.cpu_name = data.cpu_name;
this.cpu_hz_current = data.cpu_hz_current;
this.cpu_hz = data.cpu_hz;
this.swap = data.swap;
this.percpus = [];