From 45be722b58fe57ce246d48cf8756a16280008718 Mon Sep 17 00:00:00 2001 From: crcro Date: Fri, 29 Dec 2017 22:10:36 +0200 Subject: [PATCH] fixed missing devices graphs options (#7981) --- html/includes/print-date-selector.inc.php | 6 +++--- html/pages/devices.inc.php | 23 +++++++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/html/includes/print-date-selector.inc.php b/html/includes/print-date-selector.inc.php index f7055b3a48..b429da5047 100644 --- a/html/includes/print-date-selector.inc.php +++ b/html/includes/print-date-selector.inc.php @@ -1,7 +1,6 @@ +echo "
"; @@ -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"}}); }); - + +
'; diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php index 364e3307e8..75b852f73f 100644 --- a/html/pages/devices.inc.php +++ b/html/pages/devices.inc.php @@ -103,19 +103,17 @@ if ($format == "graph") { $graph_array['to'] = $vars['to']; } - echo " -
-
-
-
- "; + echo '
'; + echo '
'; + echo '
'; + echo '
' . $listoptions . '
'; + echo '
' . $headeroptions . '
'; + echo '
'; include_once 'includes/print-date-selector.inc.php'; - echo ' -
-
-
-
- '; + echo '
'; + echo '
'; + echo '
'; + echo '
'; $sql_param = array(); @@ -243,6 +241,7 @@ if ($format == "graph") { } } } + echo '
'; } else { if (is_admin() === true || is_read() === true) { $os = "SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`";