mirror of
https://github.com/nicolargo/glances.git
synced 2025-01-06 09:47:09 +03:00
Merge pull request #678 from nclsHart/webui-monitor-long-message
[Web UI] Truncate long message in monitor plugin
This commit is contained in:
commit
792026f41e
@ -102,12 +102,6 @@ body {
|
||||
padding: 0px 10px 0px 10px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
gl-monitor-list {
|
||||
display: block;
|
||||
}
|
||||
gl-monitor-list .table-cell {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#quicklook .progress {
|
||||
margin-bottom: 0px;
|
||||
@ -129,6 +123,13 @@ gl-monitor-list .table-cell {
|
||||
#quicklook .progress-bar-critical {
|
||||
background-color: #A30000;
|
||||
}
|
||||
#monitor .process-result {
|
||||
max-width: 300px;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
padding-left: 10px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
/* Loading page */
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
<div class="table">
|
||||
<div class="table-row" ng-repeat="process in statsMonitor.processes">
|
||||
<div class="table-cell" ng-class="statsMonitor.getDesciptionDecoration(process)">{{ process.description }}</div>
|
||||
<div class="table-cell" ng-class="statsMonitor.getDescriptionDecoration(process)">{{ process.description }}</div>
|
||||
<div class="table-cell">{{ process.count > 1 ? process.count : '' }}</div>
|
||||
<div class="table-cell">{{ process.count > 0 ? 'RUNNING' : 'NOT RUNNING' }}</div>
|
||||
<div class="table-cell">{{ process.result }}</div>
|
||||
<div class="table-cell process-result">{{ process.result }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -6,7 +6,7 @@ glancesApp.service('GlancesPluginMonitor', function() {
|
||||
this.processes = data[_pluginName];
|
||||
};
|
||||
|
||||
this.getDesciptionDecoration = function(process) {
|
||||
this.getDescriptionDecoration = function(process) {
|
||||
var count = process.count;
|
||||
var countMin = process.countmin;
|
||||
var countMax = process.countmax;
|
||||
|
Loading…
Reference in New Issue
Block a user