Work on settings styles & #618

This commit is contained in:
jokob-sk
2024-05-07 08:03:41 +10:00
parent 78b3228159
commit 28e403356b
6 changed files with 53 additions and 31 deletions

View File

@@ -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;

View File

@@ -71,19 +71,20 @@
includeSettings.forEach((set) => {
includeSettings_html += `
<div class="col-sm-6 overview-setting-value-wrap">
<a href="#${prefix + '_' + set}" onclick="toggleAllSettings()">
<div class="overview-setting-value pointer" title="${prefix + '_' + set}">
<code>${getSetting(prefix + '_' + set)}</code>
</div>
</a>
</div>
`
});
html += `
<div class="col-sm-4 ">
<div class="small-box bg-green " >
<div class="inner ">
<div class="col-sm-4 padding-5px">
<div class="small-box bg-green col-sm-12 " >
<div class="inner col-sm-12">
<a href="#${prefix}_header" onclick="toggleAllSettings('open')">
<h5 class="card-title">
<b>${getString(prefix+"_display_name")}</b>

0
front/php/templates/language/it_it.json Normal file → Executable file
View File

0
front/php/templates/language/zh_cn.json Normal file → Executable file
View File

View File

@@ -63,8 +63,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
<!-- Content header--------------------------------------------------------- -->
<section class="content-header">
<div class="col-sm-5">
<h1 id="pageTitle col-sm-3">
<i class="fa fa-cog"></i>
@@ -77,7 +75,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
</h1>
</div>
<div class="col-sm-7 settingsImportedTimestamp" title="<?= lang("settings_imported");?> ">
<div class="settingsImported ">
<?= lang("settings_imported_label");?>:
@@ -86,8 +83,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
</div>
</div>
</section>
<section class="content-header">
@@ -106,9 +101,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
</div>
</section>
<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" >
@@ -245,7 +237,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
pluginCards(enabledDeviceScanners,['RUN', 'RUN_SCHD']),
pluginCards(enabledOthers, ['RUN', 'RUN_SCHD']),
pluginCards(enabledPublishers, []),
]
index = 0
@@ -282,8 +273,6 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
`)
}
let isIn = ' in '; // to open the active panel in AdminLTE
for (const group of settingGroups) {
@@ -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 = `
<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="table_cell setting_name bold">
<label>${getString(codeName + '_name', set['Display_Name'])}</label>
<div class="small">
<div class="small text-overflow-hidden">
<code>${codeName}</code>${infoIcon}
</div>
</div>

View File

@@ -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):