cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins UI improvements

Browse Source
This commit is contained in:
Jokob-sk
2023-07-22 08:40:42 +10:00
parent 3315994356
commit cb0a62396f
5 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
front/css/pialert.css
View File

@@ -820,25 +820,35 @@ height: 50px;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.plugin-content .plugin-filters
{ {
padding-bottom: 7px; margin: 7px;
}
.plugin-content #tabs-content-location
{
margin-top: 20px;
margin-left: 7px;
margin-right: 7px; margin-right: 7px;
margin-bottom: 9px; margin-bottom: 9px;
padding-bottom: 8px; padding-bottom: 8px;
} }
.plugin-content
{
padding-bottom: 0px;
}
.plugin-content .left-nav{
width: 100%;
padding-right: 0px;
}
.plugin-content #tabs-content-location
{
margin: 0px;
}
.plugins-description .plugins-description
{ {
padding-top: 20px; padding-top: 20px;
} }
.login-page .login-custom .login-page .login-custom
{ {

1
front/php/templates/language/en_us.php
View File

@@ -507,6 +507,7 @@ $lang['en_us'] = array(
'Plugins_Objects' => 'Plugin Objects', 'Plugins_Objects' => 'Plugin Objects',
'Plugins_DeleteAll' => 'Delete all (filters are ignored)', 'Plugins_DeleteAll' => 'Delete all (filters are ignored)',
'Plugins_History' => 'Events History', 'Plugins_History' => 'Events History',
'Plugins_Filters_Mac' => 'Mac Filter',
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Settings // Settings

16
front/pluginsCore.php
View File

@@ -4,16 +4,18 @@
<!-- Main content ---------------------------------------------------------- --> <!-- Main content ---------------------------------------------------------- -->
<section class="content"> <section class="content">
<div> <div class="plugin-filters">
<div class="input-group"> <div class="input-group col-sm-4">
<input class="form-control" id="txtMacFilter" type="text" value="--"> <label class="control-label col-sm-3"><?= lang('Plugins_Filters_Mac');?></label>
<input class="form-control col-sm-3" id="txtMacFilter" type="text" value="--" readonly>
</div> </div>
</div> </div>
<div class="nav-tabs-custom plugin-content" style="margin-bottom: 0px;"> <div class="nav-tabs-custom plugin-content" style="margin-bottom: 0px;">
<ul id="tabs-location" class="nav nav-tabs">
<ul id="tabs-location" class="nav nav-tabs col-sm-2 ">
<!-- PLACEHOLDER --> <!-- PLACEHOLDER -->
</ul> </ul>
<div id="tabs-content-location" class="tab-content"> <div id="tabs-content-location" class="tab-content col-sm-10">
<!-- PLACEHOLDER --> <!-- PLACEHOLDER -->
</div> </div>
@@ -217,8 +219,8 @@ function generateTabs()
if(pluginObj.data_source != "template") // hiding template-based plugins as they don't produce any output if(pluginObj.data_source != "template") // hiding template-based plugins as they don't produce any output
{ {
$('#tabs-location').append( $('#tabs-location').append(
`<li class=" ${activetab}"> `<li class=" left-nav ${activetab}">
<a href="#${pluginObj.unique_prefix}" data-plugin-prefix="${pluginObj.unique_prefix}" id="${pluginObj.unique_prefix}_id" data-toggle="tab" > <a class=" col-sm-12 " href="#${pluginObj.unique_prefix}" data-plugin-prefix="${pluginObj.unique_prefix}" id="${pluginObj.unique_prefix}_id" data-toggle="tab" >
${localize(pluginObj, 'icon')} ${localize(pluginObj, 'display_name')} ${localize(pluginObj, 'icon')} ${localize(pluginObj, 'display_name')}
</a> </a>
</li>` </li>`

7
pialert/database.py
View File

@@ -10,10 +10,6 @@ from helper import json_struc, initOrSetParam, row_to_json, timeNow #, updateSta
class DB(): class DB():
""" """
DB Class to provide the basic database interactions. DB Class to provide the basic database interactions.
@@ -96,7 +92,7 @@ class DB():
WHERE eve_DateTime <= date('now', '-{str(DAYS_TO_KEEP_EVENTS)} day')""") WHERE eve_DateTime <= date('now', '-{str(DAYS_TO_KEEP_EVENTS)} day')""")
# Cleanup Plugin Events History # Cleanup Plugin Events History
mylog('verbose', ['[DB Cleanup] Plugin Events History: Delete all older than '+str(DAYS_TO_KEEP_EVENTS)+' days (DAYS_TO_KEEP_EVENTS setting)']) mylog('verbose', ['[DB Cleanup] Plugins_History: Delete all older than '+str(DAYS_TO_KEEP_EVENTS)+' days (DAYS_TO_KEEP_EVENTS setting)'])
self.sql.execute (f"""DELETE FROM Plugins_History self.sql.execute (f"""DELETE FROM Plugins_History
WHERE DateTimeChanged <= date('now', '{str(DAYS_TO_KEEP_EVENTS)} day')""") WHERE DateTimeChanged <= date('now', '{str(DAYS_TO_KEEP_EVENTS)} day')""")
@@ -139,7 +135,6 @@ class DB():
);""") );""")
# Shrink DB # Shrink DB
mylog('verbose', ['[DB Cleanup] Shrink Database']) mylog('verbose', ['[DB Cleanup] Shrink Database'])
self.sql.execute ("VACUUM;") self.sql.execute ("VACUUM;")

2
pialert/plugins/unifi_import/config.json
View File

@@ -196,7 +196,7 @@
"localized": ["name"], "localized": ["name"],
"name":[{ "name":[{
"language_code":"en_us", "language_code":"en_us",
"string" : "Is online?" "string" : "Online?"
}] }]
} , } ,
{ {