tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Jonathan 2023-03-08 13:45:29 +01:00
parent 91a708dfb8 78eccfd73b
commit 862e1c0ad3
4 changed files with 1007 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/godmode/alerts/alert_commands.php
View File

@ -174,7 +174,7 @@ if (is_ajax()) {
5, 5,
1, 1,
'', '',
'class="fields"', 'class="fields w100p"',
true, true,
'', '',
$is_management_allowed $is_management_allowed
@ -307,7 +307,8 @@ if (is_ajax()) {
false, false,
false, false,
'fields', 'fields',
$is_management_allowed $is_management_allowed,
'width: 100%;'
); );
$rfield .= html_print_select( $rfield .= html_print_select(
@ -321,7 +322,8 @@ if (is_ajax()) {
false, false,
false, false,
'fields', 'fields',
$is_management_allowed $is_management_allowed,
'width: 100%;'
); );
$ffield .= html_print_input_text('field'.$i.'_value[]', '', '', 10, 10, true, false, false, '', 'datepicker'); $ffield .= html_print_input_text('field'.$i.'_value[]', '', '', 10, 10, true, false, false, '', 'datepicker');
@ -487,7 +489,7 @@ if (is_ajax()) {
5, 5,
1, 1,
$fv[0], $fv[0],
'style="'.$style.'" class="fields min-height-40px"', 'style="'.$style.'" class="fields min-height-40px w100p"',
true, true,
'', '',
$is_management_allowed $is_management_allowed
@ -497,7 +499,7 @@ if (is_ajax()) {
5, 5,
1, 1,
$fv[0], $fv[0],
'style="'.$style.'" class="fields_recovery min-height-40px', 'style="'.$style.'" class="fields_recovery min-height-40px w100p',
true, true,
'', '',
$is_management_allowed $is_management_allowed
@ -510,7 +512,7 @@ if (is_ajax()) {
5, 5,
1, 1,
'', '',
'style="'.$style.'" class="fields min-height-40px"', 'style="'.$style.'" class="fields min-height-40px w100p"',
true, true,
'', '',
$is_management_allowed $is_management_allowed
@ -520,7 +522,7 @@ if (is_ajax()) {
5, 5,
1, 1,
'', '',
'style="'.$style.'" class="fields_recovery min-height-40px"', 'style="'.$style.'" class="fields_recovery min-height-40px w100p"',
true, true,
'', '',
$is_management_allowed $is_management_allowed

1292
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

File diff suppressed because it is too large Load Diff

12
pandora_console/include/styles/pandora.css
View File

@ -682,6 +682,10 @@ select:-internal-list-box {
width: 80%; width: 80%;
} }
.w88p {
width: 88%;
}
.w90p { .w90p {
width: 90%; width: 90%;
} }
@ -2377,7 +2381,7 @@ ol.steps li.visited span {
} }
ol.steps li.current { ol.steps li.current {
border-left: 5px solid #778866; border-left: 5px solid var(--primary-color);
margin-left: 0; margin-left: 0;
font-weight: bold; font-weight: bold;
background-color: #e9f3d2; background-color: #e9f3d2;
@ -7848,6 +7852,10 @@ div.graph div.legend table {
height: 10px; height: 10px;
} }
.height_15px {
height: 15px;
}
.height_20px { .height_20px {
height: 20px; height: 20px;
} }
@ -11540,5 +11548,5 @@ ul.tag-editor {
} }
.max-width-100p { .max-width-100p {
max-width: 100% !important; max-width: 100%;
} }

4
pandora_console/include/styles/wizard.css
View File

@ -236,3 +236,7 @@ form.alert-correlation > div > ul > li.flex-flex-end > input {
form.alert-correlation > div > ul > li.flex-flex-end > label { form.alert-correlation > div > ul > li.flex-flex-end > label {
width: 50px !important; width: 50px !important;
} }
form.alert-correlation > div > ul > li.display-grid > textarea {
width: 100% !important;
}