From ea90af043425efe85d597a9681a1ba4ed805ed5c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 20 Mar 2024 11:50:07 +0100 Subject: [PATCH] src: style sweep --- .../OPNsense/Core/Api/DashboardController.php | 11 +++++++---- src/opnsense/www/css/dashboard.css | 6 +++--- src/opnsense/www/js/opnsense_widget_manager.js | 4 ++-- src/opnsense/www/js/smoothie.js | 7 +++---- src/opnsense/www/js/widgets/BaseTableWidget.js | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/DashboardController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/DashboardController.php index 26df759f8..d212ac53b 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/DashboardController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/DashboardController.php @@ -82,8 +82,9 @@ class DashboardController extends ApiControllerBase } } - $widgetModules = array_filter(glob('/usr/local/opnsense/www/js/widgets/*.js'), - function($element) { + $widgetModules = array_filter( + glob('/usr/local/opnsense/www/js/widgets/*.js'), + function ($element) { $base = basename($element); if (str_contains($base, '.js') && !str_contains($base, 'Base')) { return $this->canAccessEndpoints($element); @@ -93,7 +94,9 @@ class DashboardController extends ApiControllerBase } ); - $widgetModules = array_map(function($element) {return basename($element);}, $widgetModules); + $widgetModules = array_map(function ($element) { + return basename($element); + }, $widgetModules); $result['modules'] = []; foreach ($widgetModules as $module) { @@ -154,4 +157,4 @@ class DashboardController extends ApiControllerBase return json_encode($result); } -} \ No newline at end of file +} diff --git a/src/opnsense/www/css/dashboard.css b/src/opnsense/www/css/dashboard.css index 5af7e58cc..9b6c7d91b 100644 --- a/src/opnsense/www/css/dashboard.css +++ b/src/opnsense/www/css/dashboard.css @@ -195,7 +195,7 @@ div { flex-flow: row wrap; transition: 0.5s; padding: 0.5em 0.5em; - border-top: solid 1px rgba(217, 79, 0, 0.15); + border-top: solid 1px rgba(217, 79, 0, 0.15); } .flextable-row { @@ -203,7 +203,7 @@ div { flex-flow: row wrap; transition: 0.5s; padding: 0.5em 0.5em; - border-top: solid 1px rgba(217, 79, 0, 0.15); + border-top: solid 1px rgba(217, 79, 0, 0.15); align-items: center } @@ -246,4 +246,4 @@ div { .column .flex-row:not(:last-child) { border-bottom: solid 1px rgba(217, 79, 0, 0.15); -} \ No newline at end of file +} diff --git a/src/opnsense/www/js/opnsense_widget_manager.js b/src/opnsense/www/js/opnsense_widget_manager.js index 3227860dd..2d310a64d 100644 --- a/src/opnsense/www/js/opnsense_widget_manager.js +++ b/src/opnsense/www/js/opnsense_widget_manager.js @@ -217,7 +217,7 @@ class WidgetManager { $('#save-grid').show(); }); } - + // render to the DOM this.grid.load(Object.values(this.widgetConfigurations)); @@ -359,4 +359,4 @@ class WidgetManager { return $panel; } -} \ No newline at end of file +} diff --git a/src/opnsense/www/js/smoothie.js b/src/opnsense/www/js/smoothie.js index 2af8f1580..911965655 100644 --- a/src/opnsense/www/js/smoothie.js +++ b/src/opnsense/www/js/smoothie.js @@ -236,7 +236,7 @@ // Reject NaN if (isNaN(timestamp) || isNaN(value)){ return - } + } var lastI = this.data.length - 1; if (lastI >= 0) { @@ -609,7 +609,7 @@ SmoothieChart.prototype.updateTooltip = function () { if(!this.options.tooltip){ - return; + return; } var el = this.getTooltipEl(); @@ -658,7 +658,7 @@ this.mousePageX = evt.pageX; this.mousePageY = evt.pageY; if(!this.options.tooltip){ - return; + return; } var el = this.getTooltipEl(); el.style.top = Math.round(this.mousePageY) + 'px'; @@ -1173,4 +1173,3 @@ exports.SmoothieChart = SmoothieChart; })(typeof exports === 'undefined' ? this : exports); - diff --git a/src/opnsense/www/js/widgets/BaseTableWidget.js b/src/opnsense/www/js/widgets/BaseTableWidget.js index 540a9643b..fd4e85909 100644 --- a/src/opnsense/www/js/widgets/BaseTableWidget.js +++ b/src/opnsense/www/js/widgets/BaseTableWidget.js @@ -143,7 +143,7 @@ export default class BaseTableWidget extends BaseWidget { } } } - + } }