diff --git a/README.md b/README.md index d3c69f5d..7c722835 100755 --- a/README.md +++ b/README.md @@ -2,11 +2,12 @@ Get visibility of what's going on on your WIFI/LAN network. Schedule scans for devices, port changes and get alerts if unknown devices or changes are found. Write your own [Plugins](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins#readme) with auto-generated UI and in-build notification system. Build out and easily maintain your network source of truth (NSoT). -[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/NetAlertX) -[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx) -[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx) -[![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub)](https://github.com/jokob-sk/NetAlertX/releases) -[![GitHub Sponsors](https://img.shields.io/github/sponsors/jokob-sk?style=social)](https://github.com/sponsors/jokob-sk) +[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX) +[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx) +[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx) +[![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX/releases) +![Discord](https://img.shields.io/discord/1274490466481602755?color=0aa8d2&logoColor=fff&logo=Discord&style=for-the-badge) +[![GitHub Sponsors](https://img.shields.io/github/sponsors/jokob-sk?style=for-the-badge)](https://github.com/sponsors/jokob-sk) | 🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/netalertx) | 📑 [Docker guide](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md) |🆕 [Release notes](https://github.com/jokob-sk/NetAlertX/releases) | 📚 [All Docs](https://github.com/jokob-sk/NetAlertX/tree/main/docs) | |----------------------|----------------------| ----------------------| ----------------------| diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 08d3e30a..c29a0af0 100755 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -1,8 +1,10 @@ -[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/NetAlertX) -[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx) -[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx) -![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub) -[![GitHub Sponsors](https://img.shields.io/github/sponsors/jokob-sk?style=social)](https://github.com/sponsors/jokob-sk) +[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX) +[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx) +[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx) +[![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX/releases) +![Discord](https://img.shields.io/discord/1274490466481602755?color=0aa8d2&logoColor=fff&logo=Discord&style=for-the-badge) +[![GitHub Sponsors](https://img.shields.io/github/sponsors/jokob-sk?style=for-the-badge)](https://github.com/sponsors/jokob-sk) + # NetAlertX 🖧🔍 Network scanner & notification framework diff --git a/front/css/app.css b/front/css/app.css index c2d9e74b..a6a1561b 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1390,7 +1390,7 @@ input[readonly] { opacity: 0.8; background-color: #fff; - z-index: 1000; + z-index: 800; } .pa_spinner { @@ -1403,7 +1403,7 @@ input[readonly] { padding: 15px; width: 200px; background-color: #fff; - z-index: 1001; + z-index: 801; } #loadingSpinner diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js index 52ae1b81..c64f1c69 100755 --- a/front/js/settings_utils.js +++ b/front/js/settings_utils.js @@ -604,6 +604,7 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => { let inputType = "text"; let readOnly = ""; let isMultiSelect = false; + let isOrdeable = false; let cssClasses = ""; let placeholder = ""; let suffix = ""; @@ -627,6 +628,9 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => { if (option.multiple === "true") { isMultiSelect = true; } + if (option.ordeable === "true") { + isOrdeable = true; + } if (option.editable === "true") { editable = true; } @@ -663,6 +667,7 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => { inputType, readOnly, isMultiSelect, + isOrdeable, cssClasses, placeholder, suffix, diff --git a/front/maintenance.php b/front/maintenance.php index dc1a4228..936969ac 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -142,10 +142,6 @@ while ($row = $result->fetchArray(SQLITE3_ASSOC)) { $db->close(); - - -// Language selector ----------------------------------------------------------------- - ?>
diff --git a/front/multiEditCore.php b/front/multiEditCore.php index 987327ab..030e09f7 100755 --- a/front/multiEditCore.php +++ b/front/multiEditCore.php @@ -118,6 +118,7 @@ inputType, readOnly, isMultiSelect, + isOrdeable, cssClasses, placeholder, suffix, diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json old mode 100644 new mode 100755 diff --git a/front/plugins/_publisher_webhook/Discord_Config.png b/front/plugins/_publisher_webhook/Discord_Config.png new file mode 100755 index 00000000..812e404b Binary files /dev/null and b/front/plugins/_publisher_webhook/Discord_Config.png differ diff --git a/front/plugins/_publisher_webhook/README.md b/front/plugins/_publisher_webhook/README.md index e9982a25..7f51b834 100755 --- a/front/plugins/_publisher_webhook/README.md +++ b/front/plugins/_publisher_webhook/README.md @@ -6,3 +6,7 @@ A plugin to publish a notification via the Webhook gateway. Webhooks help you to - Go to settings and fill in relevant details. +#### Sample Discord Setup + +![image](Discord_Config.png) + diff --git a/front/plugins/ui_settings/config.json b/front/plugins/ui_settings/config.json index 93390b2d..b00a8a68 100755 --- a/front/plugins/ui_settings/config.json +++ b/front/plugins/ui_settings/config.json @@ -26,6 +26,66 @@ ], "params": [], "settings": [ + { + "function": "device_columns", + "type": { + "dataType": "array", + "elements": [ + { + "elementType": "select", + "elementOptions": [{ "multiple": "true", "ordeable": "true" }], + "transformers": [] + } + ] + }, + "maxLength": 50, + "default_value": [ + "getString-Device_TableHead_Icon-value-3", + "getString-Device_TableHead_Name-value-0", + "getString-Device_TableHead_Type-value-2", + "getString-Device_TableHead_LastIP-value-8", + "getString-Device_TableHead_Status-value-10", + "getString-Device_TableHead_MAC_full-value-11" + ], + "options": [ + "getString-Device_TableHead_Name-value-0", + "getString-Device_TableHead_Owner-value-1", + "getString-Device_TableHead_Type-value-2", + "getString-Device_TableHead_Icon-value-3", + "getString-Device_TableHead_Favorite-value-4", + "getString-Device_TableHead_Group-value-5", + "getString-Device_TableHead_FirstSession-value-6", + "getString-Device_TableHead_LastSession-value-7", + "getString-Device_TableHead_LastIP-value-8", + "getString-Device_TableHead_MAC-value-9", + "getString-Device_TableHead_Status-value-10", + "getString-Device_TableHead_MAC_full-value-11", + "getString-Device_TableHead_LastIPOrder-value-12", + "getString-Device_TableHead_Rowid-value-13", + "getString-Device_TableHead_Parent_MAC-value-14", + "getString-Device_TableHead_Connected_Devices-value-15", + "getString-Device_TableHead_Location-value-16", + "getString-Device_TableHead_Vendor-value-17", + "getString-Device_TableHead_Port-value-18", + "getString-Device_TableHead_GUID-value-19", + "getString-Device_TableHead_SyncHubNodeName-value-20", + "getString-Device_TableHead_NetworkSite-value-21", + "getString-Device_TableHead_SSID-value-22" + ], + "localized": ["name", "description"], + "name": [ + { + "language_code": "en_us", + "string": "Device Columns" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Which columns to show on the Devices page." + } + ] + }, { "function": "shown_cards", "type": { @@ -67,7 +127,7 @@ "description": [ { "language_code": "en_us", - "string": "Which tiles to show on teh top of the Devices page." + "string": "Which tiles to show on the top of the Devices page." } ] }, diff --git a/front/settings.php b/front/settings.php index 03f3b3a5..cc77f116 100755 --- a/front/settings.php +++ b/front/settings.php @@ -476,6 +476,7 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX inputType, readOnly, isMultiSelect, + isOrdeable, cssClasses, placeholder, suffix, @@ -494,8 +495,10 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX switch (elementType) { case 'select': let multi = isMultiSelect ? "multiple" : ""; + let addCss = isOrdeable ? "select2 select2-hidden-accessible" : ""; - inputHtml += ` `; @@ -645,6 +648,7 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX inputType, readOnly, isMultiSelect, + isOrdeable, cssClasses, placeholder, suffix,