diff --git a/front/css/app.css b/front/css/app.css index 2d9af0cd..ba3dc1e6 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -830,7 +830,28 @@ height: 50px; #settingsPage .overview-setting-value{ display:unset; + } + +.overview-setting-value-wrap +{ + padding-left: 1px; + text-overflow: clip ; + overflow: hidden; +} + +#settingsPage .small-box +{ + padding-left: 10px; + padding-right: 10px; +} + +#settingsPage .small-box .inner +{ + padding-left: 0px; + padding-right: 0px; +} + #settingsPage .panel-title{ /* display: inline-block; */ /* width: 120px; */ @@ -839,6 +860,17 @@ height: 50px; text-overflow: ellipsis; } +.padding-5px +{ + padding: 5px; +} + +.text-overflow-hidden +{ + overflow: hidden; + text-overflow: clip; +} + .settings_content { padding: 10px; diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js index 3e5cc81e..99a9b1cd 100755 --- a/front/js/settings_utils.js +++ b/front/js/settings_utils.js @@ -71,26 +71,27 @@ includeSettings.forEach((set) => { includeSettings_html += ` - -
- ${getSetting(prefix + '_' + set)} -
-
+
+ +
+ ${getSetting(prefix + '_' + set)} +
+
+
` - }); html += ` -
-
- +
+
+
${getString(prefix+"_icon")}
diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json old mode 100644 new mode 100755 diff --git a/front/settings.php b/front/settings.php index 522ed0d0..332eff15 100755 --- a/front/settings.php +++ b/front/settings.php @@ -62,8 +62,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
- -

@@ -76,7 +74,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {

-
">
@@ -85,9 +82,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
- -
@@ -106,9 +101,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
- - -
@@ -244,8 +236,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { overviewSectionsHtml = [ pluginCards(enabledDeviceScanners,['RUN', 'RUN_SCHD']), pluginCards(enabledOthers, ['RUN', 'RUN_SCHD']), - pluginCards(enabledPublishers, []), - + pluginCards(enabledPublishers, []), ] index = 0 @@ -281,8 +272,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { `) } - - let isIn = ' in '; // to open the active panel in AdminLTE @@ -295,7 +284,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { { let isEnabled = ["once", "schedule", "always_after_scan", "on_new_device", "on_notification", "before_config_save", "before_name_updates" ].includes(getSetting(group+"_RUN")); - isEnabled ? onOff = 'circle-check' : onOff = 'circle'; + isEnabled ? onOff = 'dot-circle' : onOff = 'circle'; enabledHtml = `
@@ -373,7 +362,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
-
+
${codeName}${infoIcon}
diff --git a/server/device.py b/server/device.py index 3e393e9b..647e4d9c 100755 --- a/server/device.py +++ b/server/device.py @@ -421,7 +421,7 @@ def query_MAC_vendor (pMAC): mac_start_string9 = mac[0:9] try: - with open(vendorsPath, 'r') as f: + with open(filePath, 'r') as f: for line in f: line_lower = line.lower() # Convert line to lowercase for case-insensitive matching if line_lower.startswith(mac_start_string6):