Merge pull request #1612 from laf/device-overview-fix

This commit is contained in:
Søren Rosiak
2015-08-07 16:48:14 +02:00
2 changed files with 7 additions and 4 deletions
+1
View File
@@ -157,6 +157,7 @@ echo '
if ($config['vertical_summary']) { if ($config['vertical_summary']) {
echo ' <div class="col-md-3">'; echo ' <div class="col-md-3">';
include_once 'includes/device-summary-vert.inc.php'; include_once 'includes/device-summary-vert.inc.php';
echo implode('',$common_output);
} }
else { else {
echo ' <div class="col-md-4">'; echo ' <div class="col-md-4">';
+6 -4
View File
@@ -131,22 +131,24 @@ $(function () {
</div> </div>
<?php <?php
} }
include_once("includes/object-cache.inc.php"); include_once 'includes/object-cache.inc.php';
echo '<div class="container-fluid"> echo '<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-4">'; <div class="col-md-4">';
include_once("includes/front/boxes.inc.php"); include_once 'includes/front/boxes.inc.php';
echo ' </div> echo ' </div>
<div class="col-md-2"> <div class="col-md-2">
</div> </div>
<div class="col-md-4">'; <div class="col-md-4">';
include_once("includes/device-summary-vert.inc.php"); include_once 'includes/common/device-summary-vert.inc.php';
echo implode('',$common_output);
echo ' </div> echo ' </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12">'; <div class="col-md-12">';
$device['device_id'] = '-1'; $device['device_id'] = '-1';
require_once('includes/print-alerts.php'); require_once 'includes/common/alerts.inc.php';
echo implode('',$common_output);
unset($device['device_id']); unset($device['device_id']);
echo ' </div> echo ' </div>
</div> </div>