tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 05:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Fix performance data table markup

Browse Source 
refs #5543
This commit is contained in:
Eric Lippmann 2015-11-11 15:13:54 +01:00
parent 75091d0eaa
commit dbec2741f9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/monitoring/application/views/helpers/Perfdata.php
View File

@ -61,14 +61,14 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
$headers[$column] = $labels[$column]; $headers[$column] = $labels[$column];
} }
} }
$table = array('<td><b>' . implode('</b></td><td><b>', $headers) . '<b></td>'); $table = array('<thead><tr><th>' . implode('</th><th>', $headers) . '</th></tr></thead>');
foreach ($pieChartData as $perfdata) { foreach ($pieChartData as $perfdata) {
if ($compact && $perfdata->isVisualizable()) { if ($compact && $perfdata->isVisualizable()) {
$results[] = $perfdata->asInlinePie($color)->render(); $results[] = $perfdata->asInlinePie($color)->render();
} else { } else {
$data = array(); $data = array();
if ($perfdata->isVisualizable()) { if ($perfdata->isVisualizable()) {
$data []= $perfdata->asInlinePie($color)->render() . '&nbsp;'; $data []= $perfdata->asInlinePie($color)->render();
} elseif (isset($columns[''])) { } elseif (isset($columns[''])) {
$data []= ''; $data []= '';
} }
@ -85,7 +85,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
); );
} }
} }
$table []= '<tr><td>' . implode('</td><td>', $data) . '</td></tr>'; $table []= '<tbody><tr><td class="sparkline-col">' . implode('</td><td>', $data) . '</td></tr></tbody>';
} }
} }
if ($limit > 0) { if ($limit > 0) {
@ -107,8 +107,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
return ''; return '';
} }
return sprintf( return sprintf(
'<table class="perfdata %s">%s</table>', '<table class="performance-data-table">%s</table>',
isset($columns['']) ? 'perfdata-piecharts' : '',
implode("\n", $table) implode("\n", $table)
); );
} }