fixed missing devices graphs options (#7981)

This commit is contained in:
crcro
2017-12-29 22:10:36 +02:00
committed by Tony Murray
parent a2bce2690d
commit 45be722b58
2 changed files with 14 additions and 15 deletions

View File

@@ -1,7 +1,6 @@
<?php
echo "
<center>
echo "<div style='text-align: center;'>
<form class='form-inline' id='customrange'>
<input type=hidden id='selfaction' value='" . $_SERVER['REQUEST_URI'] . "'>
";
@@ -36,5 +35,6 @@ echo '
$("#dtpickerfrom").datetimepicker({useCurrent: true, sideBySide: true, useStrict: false, icons: {time: "fa fa-clock-o", date: "fa fa-calendar", up: "fa fa-chevron-up", down: "fa fa-chevron-down", previous: "fa fa-chevron-left", next: "fa fa-chevron-right", today: "fa fa-calendar-check-o", clear: "fa fa-trash-o", close: "fa fa-close"}});
$("#dtpickerto").datetimepicker({useCurrent: true, sideBySide: true, useStrict: false, icons: {time: "fa fa-clock-o", date: "fa fa-calendar", up: "fa fa-chevron-up", down: "fa fa-chevron-down", previous: "fa fa-chevron-left", next: "fa fa-chevron-right", today: "fa fa-calendar-check-o", clear: "fa fa-trash-o", close: "fa fa-close"}});
});
</script></center>
</script>
</div>
';

View File

@@ -103,19 +103,17 @@ if ($format == "graph") {
$graph_array['to'] = $vars['to'];
}
echo "
<div class='well well-sm'>
<div class='container-fluid'>
<div class='row'>
<div class='col-md-12'>
";
echo '<div class="panel panel-default panel-condensed">';
echo '<div class="panel-heading">';
echo '<div class="row" style="padding: 0px 10px 0px 10px;">';
echo '<div class="pull-left">' . $listoptions . '</div>';
echo '<div class="pull-right">' . $headeroptions . '</div>';
echo '<div class="col-md-12" style="padding: 10px 0px 0px 0px;">';
include_once 'includes/print-date-selector.inc.php';
echo '
</div>
</div>
</div>
</div>
';
echo '</div>';
echo '</div>';
echo '</div>';
echo '<div class="panel-body">';
$sql_param = array();
@@ -243,6 +241,7 @@ if ($format == "graph") {
}
}
}
echo '</div>';
} else {
if (is_admin() === true || is_read() === true) {
$os = "SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`";