mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2025-12-07 01:26:11 -08:00
Work on settings styles & #618
This commit is contained in:
@@ -830,7 +830,28 @@ height: 50px;
|
|||||||
|
|
||||||
#settingsPage .overview-setting-value{
|
#settingsPage .overview-setting-value{
|
||||||
display:unset;
|
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{
|
#settingsPage .panel-title{
|
||||||
/* display: inline-block; */
|
/* display: inline-block; */
|
||||||
/* width: 120px; */
|
/* width: 120px; */
|
||||||
@@ -839,6 +860,17 @@ height: 50px;
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.padding-5px
|
||||||
|
{
|
||||||
|
padding: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text-overflow-hidden
|
||||||
|
{
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: clip;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.settings_content {
|
.settings_content {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
|||||||
@@ -71,26 +71,27 @@
|
|||||||
includeSettings.forEach((set) => {
|
includeSettings.forEach((set) => {
|
||||||
|
|
||||||
includeSettings_html += `
|
includeSettings_html += `
|
||||||
<a href="#${prefix + '_' + set}" onclick="toggleAllSettings()">
|
<div class="col-sm-6 overview-setting-value-wrap">
|
||||||
<div class="overview-setting-value pointer" title="${prefix + '_' + set}">
|
<a href="#${prefix + '_' + set}" onclick="toggleAllSettings()">
|
||||||
<code>${getSetting(prefix + '_' + set)}</code>
|
<div class="overview-setting-value pointer" title="${prefix + '_' + set}">
|
||||||
</div>
|
<code>${getSetting(prefix + '_' + set)}</code>
|
||||||
</a>
|
</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
`
|
`
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
html += `
|
html += `
|
||||||
<div class="col-sm-4 ">
|
<div class="col-sm-4 padding-5px">
|
||||||
<div class="small-box bg-green " >
|
<div class="small-box bg-green col-sm-12 " >
|
||||||
<div class="inner ">
|
<div class="inner col-sm-12">
|
||||||
<a href="#${prefix}_header" onclick="toggleAllSettings('open')">
|
<a href="#${prefix}_header" onclick="toggleAllSettings('open')">
|
||||||
<h5 class="card-title">
|
<h5 class="card-title">
|
||||||
<b>${getString(prefix+"_display_name")}</b>
|
<b>${getString(prefix+"_display_name")}</b>
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
${includeSettings_html}
|
${includeSettings_html}
|
||||||
</div>
|
</div>
|
||||||
<a href="#${prefix}_header" onclick="toggleAllSettings('open')">
|
<a href="#${prefix}_header" onclick="toggleAllSettings('open')">
|
||||||
<div class="icon"> ${getString(prefix+"_icon")} </div>
|
<div class="icon"> ${getString(prefix+"_icon")} </div>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
0
front/php/templates/language/it_it.json
Normal file → Executable file
0
front/php/templates/language/it_it.json
Normal file → Executable file
0
front/php/templates/language/zh_cn.json
Normal file → Executable file
0
front/php/templates/language/zh_cn.json
Normal file → Executable file
@@ -62,8 +62,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
|
|
||||||
<!-- Content header--------------------------------------------------------- -->
|
<!-- Content header--------------------------------------------------------- -->
|
||||||
<section class="content-header">
|
<section class="content-header">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<h1 id="pageTitle col-sm-3">
|
<h1 id="pageTitle col-sm-3">
|
||||||
@@ -76,7 +74,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
</a>
|
</a>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-sm-7 settingsImportedTimestamp" title="<?= lang("settings_imported");?> ">
|
<div class="col-sm-7 settingsImportedTimestamp" title="<?= lang("settings_imported");?> ">
|
||||||
<div class="settingsImported ">
|
<div class="settingsImported ">
|
||||||
@@ -85,9 +82,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
<span id="lastImportedTime"></span>
|
<span id="lastImportedTime"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
<section class="content-header">
|
<section class="content-header">
|
||||||
|
|
||||||
@@ -106,9 +101,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="content settingswrap " id="accordion_gen">
|
<div class="content settingswrap " id="accordion_gen">
|
||||||
|
|
||||||
<div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" id="core_content_header" >
|
<div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" id="core_content_header" >
|
||||||
@@ -244,8 +236,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
overviewSectionsHtml = [
|
overviewSectionsHtml = [
|
||||||
pluginCards(enabledDeviceScanners,['RUN', 'RUN_SCHD']),
|
pluginCards(enabledDeviceScanners,['RUN', 'RUN_SCHD']),
|
||||||
pluginCards(enabledOthers, ['RUN', 'RUN_SCHD']),
|
pluginCards(enabledOthers, ['RUN', 'RUN_SCHD']),
|
||||||
pluginCards(enabledPublishers, []),
|
pluginCards(enabledPublishers, []),
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
index = 0
|
index = 0
|
||||||
@@ -281,8 +272,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
</small>
|
</small>
|
||||||
`)
|
`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let isIn = ' in '; // to open the active panel in AdminLTE
|
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"));
|
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 = `
|
enabledHtml = `
|
||||||
<div class="enabled-disabled-icon">
|
<div class="enabled-disabled-icon">
|
||||||
@@ -373,7 +362,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
|
|||||||
<div class="row table_row ${metadataClass}" id="row_${codeName}">
|
<div class="row table_row ${metadataClass}" id="row_${codeName}">
|
||||||
<div class="table_cell setting_name bold">
|
<div class="table_cell setting_name bold">
|
||||||
<label>${getString(codeName + '_name', set['Display_Name'])}</label>
|
<label>${getString(codeName + '_name', set['Display_Name'])}</label>
|
||||||
<div class="small">
|
<div class="small text-overflow-hidden">
|
||||||
<code>${codeName}</code>${infoIcon}
|
<code>${codeName}</code>${infoIcon}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -421,7 +421,7 @@ def query_MAC_vendor (pMAC):
|
|||||||
mac_start_string9 = mac[0:9]
|
mac_start_string9 = mac[0:9]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with open(vendorsPath, 'r') as f:
|
with open(filePath, 'r') as f:
|
||||||
for line in f:
|
for line in f:
|
||||||
line_lower = line.lower() # Convert line to lowercase for case-insensitive matching
|
line_lower = line.lower() # Convert line to lowercase for case-insensitive matching
|
||||||
if line_lower.startswith(mac_start_string6):
|
if line_lower.startswith(mac_start_string6):
|
||||||
|
|||||||
Reference in New Issue
Block a user