Merge pull request #3117 from richardlawley/app-page-layout

Updated Apps layout to use panels
This commit is contained in:
Neil Lathwood
2016-02-29 22:04:23 +00:00
10 changed files with 93 additions and 49 deletions
+9 -6
View File
@@ -16,11 +16,14 @@ foreach ($graphs as $key => $text) {
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+9 -5
View File
@@ -16,10 +16,14 @@ foreach ($graphs as $key => $text) {
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+9 -6
View File
@@ -19,11 +19,14 @@ foreach ($graphs as $key => $text) {
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+10 -6
View File
@@ -70,11 +70,15 @@ foreach ($graphs[$vars['app_section']] as $key => $text) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+9 -5
View File
@@ -14,11 +14,15 @@ foreach ($graphs as $key => $text) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+10 -5
View File
@@ -14,10 +14,15 @@ foreach ($graphs as $key => $text) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+9 -4
View File
@@ -19,10 +19,15 @@ foreach ($graphs as $key => $text) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+9 -6
View File
@@ -20,11 +20,14 @@ foreach ($graphs as $key => $text) {
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
+9 -4
View File
@@ -30,12 +30,17 @@ if (isset($total) && $total === true) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}
}
+10 -2
View File
@@ -39,7 +39,15 @@ foreach ($graphs as $key => $text) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo "<h3>$text</h3><tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}