diff --git a/app/Http/Controllers/Widgets/AlertlogController.php b/app/Http/Controllers/Widgets/AlertlogController.php index 4a374dd375..787c21e032 100644 --- a/app/Http/Controllers/Widgets/AlertlogController.php +++ b/app/Http/Controllers/Widgets/AlertlogController.php @@ -34,7 +34,8 @@ class AlertlogController extends WidgetController 'title' => null, 'device_id' => '', 'state' => -1, - 'min_severity' => null + 'min_severity' => null, + 'hidenavigation' => 0, ]; public function getView(Request $request) diff --git a/app/Http/Controllers/Widgets/AlertlogStatsController.php b/app/Http/Controllers/Widgets/AlertlogStatsController.php index 883fa7437b..d163421d3d 100644 --- a/app/Http/Controllers/Widgets/AlertlogStatsController.php +++ b/app/Http/Controllers/Widgets/AlertlogStatsController.php @@ -34,7 +34,8 @@ class AlertlogStatsController extends WidgetController 'title' => null, 'device_id' => '', 'min_severity' => 2, - 'time_interval' => 7 + 'time_interval' => 7, + 'hidenavigation' => 0, ]; public function getView(Request $request) diff --git a/app/Http/Controllers/Widgets/AlertsController.php b/app/Http/Controllers/Widgets/AlertsController.php index ca265943cb..98daa7e871 100644 --- a/app/Http/Controllers/Widgets/AlertsController.php +++ b/app/Http/Controllers/Widgets/AlertsController.php @@ -41,6 +41,7 @@ class AlertsController extends WidgetController 'proc' => 0, 'location' => 1, 'sort' => 1, + 'hidenavigation' => 0, ]; public function getView(Request $request) diff --git a/app/Http/Controllers/Widgets/EventlogController.php b/app/Http/Controllers/Widgets/EventlogController.php index a11c0d0a7f..c2bb9c0525 100644 --- a/app/Http/Controllers/Widgets/EventlogController.php +++ b/app/Http/Controllers/Widgets/EventlogController.php @@ -36,6 +36,7 @@ class EventlogController extends WidgetController 'device' => null, 'device_group' => null, 'eventtype' => null, + 'hidenavigation' => 0, ]; public function getSettingsView(Request $request) diff --git a/app/Http/Controllers/Widgets/GraylogController.php b/app/Http/Controllers/Widgets/GraylogController.php index 394fb006c9..5fab3ddbf5 100644 --- a/app/Http/Controllers/Widgets/GraylogController.php +++ b/app/Http/Controllers/Widgets/GraylogController.php @@ -39,6 +39,7 @@ class GraylogController extends WidgetController 'range' => null, 'limit' => 15, 'loglevel' => null, + 'hidenavigation' => 0, ]; /** diff --git a/app/Http/Controllers/Widgets/SyslogController.php b/app/Http/Controllers/Widgets/SyslogController.php index fd7cc4c304..55229f6417 100644 --- a/app/Http/Controllers/Widgets/SyslogController.php +++ b/app/Http/Controllers/Widgets/SyslogController.php @@ -35,6 +35,7 @@ class SyslogController extends WidgetController 'title' => null, 'device' => null, 'device_group' => null, + 'hidenavigation' => 0, ]; public function getSettingsView(Request $request) diff --git a/resources/views/widgets/alertlog.blade.php b/resources/views/widgets/alertlog.blade.php index e651a1710c..23573285c0 100644 --- a/resources/views/widgets/alertlog.blade.php +++ b/resources/views/widgets/alertlog.blade.php @@ -20,6 +20,7 @@ var grid = $("#alertlog_{{ $id }}").bootgrid({ ajax: true, rowCount: [50, 100, 250, -1], + navigation: ! {{ $hidenavigation }}, post: function () { return { id: "alertlog", diff --git a/resources/views/widgets/alertlog_stats.blade.php b/resources/views/widgets/alertlog_stats.blade.php index 9cac5b30c5..6def906aaa 100644 --- a/resources/views/widgets/alertlog_stats.blade.php +++ b/resources/views/widgets/alertlog_stats.blade.php @@ -18,6 +18,7 @@ $("#alertlog-stats_{{ $id }}").bootgrid({ ajax: true, rowCount: [50, 100, 250, -1], + navigation: ! {{ $hidenavigation }}, post: function () { return { id: "alertlog-stats", diff --git a/resources/views/widgets/alerts.blade.php b/resources/views/widgets/alerts.blade.php index 0aa5c04bee..31f153d1fd 100644 --- a/resources/views/widgets/alerts.blade.php +++ b/resources/views/widgets/alerts.blade.php @@ -37,6 +37,7 @@ } }, url: "ajax_table.php", + navigation: ! {{ $hidenavigation }}, rowCount: [50, 100, 250, -1] }).on("loaded.rs.jquery.bootgrid", function() { alerts_grid = $(this); diff --git a/resources/views/widgets/eventlog.blade.php b/resources/views/widgets/eventlog.blade.php index db5edab8e4..1f97777d63 100644 --- a/resources/views/widgets/eventlog.blade.php +++ b/resources/views/widgets/eventlog.blade.php @@ -15,6 +15,7 @@ $("#eventlog").bootgrid({ ajax: true, rowCount: [50, 100, 250, -1], + navigation: ! {{ $hidenavigation }}, post: function () { return { diff --git a/resources/views/widgets/graylog.blade.php b/resources/views/widgets/graylog.blade.php index 718fbbe3d9..4175661d44 100644 --- a/resources/views/widgets/graylog.blade.php +++ b/resources/views/widgets/graylog.blade.php @@ -17,6 +17,7 @@ $("#graylog-{{ $id }}").bootgrid({ ajax: true, rowCount: ['{{ $limit }}', 25,50,100,250,-1], + navigation: ! {{ $hidenavigation }}, formatters: { "browserTime": function(column, row) { @config('graylog.timezone') diff --git a/resources/views/widgets/settings/alertlog.blade.php b/resources/views/widgets/settings/alertlog.blade.php index 8715e4d98b..a20b5ba5ef 100644 --- a/resources/views/widgets/settings/alertlog.blade.php +++ b/resources/views/widgets/settings/alertlog.blade.php @@ -1,11 +1,11 @@ @extends('widgets.settings.base') @section('form') -
+
-
+
-
+
+
+ + +
+@endsection + +@section('javascript') + @endsection diff --git a/resources/views/widgets/settings/alertlog_stats.blade.php b/resources/views/widgets/settings/alertlog_stats.blade.php index 175a2a9268..803552cba9 100644 --- a/resources/views/widgets/settings/alertlog_stats.blade.php +++ b/resources/views/widgets/settings/alertlog_stats.blade.php @@ -1,11 +1,11 @@ @extends('widgets.settings.base') @section('form') -
+
-
+
+
+ + +
@endsection + +@section('javascript') + +@endsection + diff --git a/resources/views/widgets/settings/alerts.blade.php b/resources/views/widgets/settings/alerts.blade.php index c72b7a4a45..4d96cfbe04 100644 --- a/resources/views/widgets/settings/alerts.blade.php +++ b/resources/views/widgets/settings/alerts.blade.php @@ -1,11 +1,11 @@ @extends('widgets.settings.base') @section('form') -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+ + +
+ @endsection @section('javascript') @endsection diff --git a/resources/views/widgets/settings/eventlog.blade.php b/resources/views/widgets/settings/eventlog.blade.php index f79e3775a4..ccb6450b33 100644 --- a/resources/views/widgets/settings/eventlog.blade.php +++ b/resources/views/widgets/settings/eventlog.blade.php @@ -29,6 +29,10 @@ @endif
+
+ + +
@endsection @section('javascript') @@ -43,5 +47,12 @@ page: params.page || 1 } }, '{{ $eventtype ?: "" }}'); + + $('#hidenavigation-{{ $id }}') + .bootstrapSwitch('offColor','danger') + .on('switchChange.bootstrapSwitch', function (e, data) { + var hidenav = $(this).is(':checked') ? "1": "0"; + $('#hidenavigation-{{ $id }}').val(hidenav); + }); @endsection diff --git a/resources/views/widgets/settings/graylog.blade.php b/resources/views/widgets/settings/graylog.blade.php index d5b4e52854..d5a3b935c1 100644 --- a/resources/views/widgets/settings/graylog.blade.php +++ b/resources/views/widgets/settings/graylog.blade.php @@ -63,11 +63,22 @@
+
+ + +
@endsection @section('javascript') @endsection diff --git a/resources/views/widgets/settings/syslog.blade.php b/resources/views/widgets/settings/syslog.blade.php index e222be636d..10d815638f 100644 --- a/resources/views/widgets/settings/syslog.blade.php +++ b/resources/views/widgets/settings/syslog.blade.php @@ -21,11 +21,22 @@ @endif
+
+ + +
@endsection @section('javascript') @endsection diff --git a/resources/views/widgets/syslog.blade.php b/resources/views/widgets/syslog.blade.php index 7bf70c277b..de52a552f8 100644 --- a/resources/views/widgets/syslog.blade.php +++ b/resources/views/widgets/syslog.blade.php @@ -17,6 +17,7 @@ $("#syslog").bootgrid({ ajax: true, rowCount: [50, 100, 250, -1], + navigation: ! {{ $hidenavigation }}, post: function () { return {