Merge branch 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme' into 'develop'

merge conflict

See merge request artica/pandorafms!4452
This commit is contained in:
Daniel Rodriguez 2021-10-07 14:11:43 +00:00
commit c69f418093
7 changed files with 12 additions and 9 deletions

View File

@ -910,7 +910,7 @@ if ($agents !== false) {
echo ' onClick="if (!confirm(\' '.__('You are going to enable a cluster agent. Are you sure?').'\')) return false;">'; echo ' onClick="if (!confirm(\' '.__('You are going to enable a cluster agent. Are you sure?').'\')) return false;">';
} }
echo html_print_image('images/lightbulb_off.png', true, ['alt' => __('Enable agent'), 'title' => __('Enable agent')]).'</a>'; echo html_print_image('images/lightbulb_off.png', true, ['alt' => __('Enable agent'), 'title' => __('Enable agent'), 'class' => 'filter_none']).'</a>';
} else { } else {
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente& echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
disable_agent=".$agent['id_agente']."&group_id=$ag_group&recursion=$recursion&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort&disabled=$disabled'"; disable_agent=".$agent['id_agente']."&group_id=$ag_group&recursion=$recursion&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort&disabled=$disabled'";

View File

@ -1130,6 +1130,7 @@ foreach ($modules as $module) {
[ [
'alt' => __('Enable module'), 'alt' => __('Enable module'),
'title' => __('Enable module'), 'title' => __('Enable module'),
'class' => 'filter_none',
] ]
).'</a>'; ).'</a>';
} else { } else {
@ -1139,7 +1140,6 @@ foreach ($modules as $module) {
[ [
'alt' => __('Disable module'), 'alt' => __('Disable module'),
'title' => __('Disable module'), 'title' => __('Disable module'),
'class' => 'invert_filter',
] ]
).'</a>'; ).'</a>';
} }

View File

@ -811,7 +811,7 @@ foreach ($simple_alerts as $alert) {
1, 1,
'padding:0px', 'padding:0px',
true, true,
['class' => 'invert_filter'] ['class' => 'filter_none']
); );
$data[4] .= html_print_input_hidden('enable_alert', 1, true); $data[4] .= html_print_input_hidden('enable_alert', 1, true);
} else { } else {
@ -998,7 +998,7 @@ if (! $id_agente) {
echo '"'.html_print_image( echo '"'.html_print_image(
'images/lightbulb_off.png', 'images/lightbulb_off.png',
true, true,
false, ['class' => 'filter_none'],
true true
).'"'; ).'"';
?> ?>
@ -1037,7 +1037,7 @@ if (! $id_agente) {
echo '"'.html_print_image( echo '"'.html_print_image(
'images/lightbulb_off.png', 'images/lightbulb_off.png',
true, true,
false, ['class' => 'filter_none'],
true true
).'"'; ).'"';
?> ?>

View File

@ -254,7 +254,7 @@ foreach ($extensions as $file => $extension) {
if ($file != 'update_manager.php') { if ($file != 'update_manager.php') {
$table->cellclass[][10] = 'action_buttons'; $table->cellclass[][10] = 'action_buttons';
if (!$extension['enabled']) { if (!$extension['enabled']) {
$data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.disabled.png', true).'</a>'.' <a title="'.__('Enable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&enabled='.$file.'" class="mn">'.html_print_image('images/lightbulb_off.png', true).'</a>'; $data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.disabled.png', true, ['class' => 'filter_none']).'</a>'.' <a title="'.__('Enable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&enabled='.$file.'" class="mn">'.html_print_image('images/lightbulb_off.png', true, ['class' => 'filter_none']).'</a>';
} else { } else {
$data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>'.' <a title="'.__('Disable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&disabled='.$file.'" class="mn">'.html_print_image('images/lightbulb.png', true).'</a>'; $data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>'.' <a title="'.__('Disable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&disabled='.$file.'" class="mn">'.html_print_image('images/lightbulb.png', true).'</a>';
} }

View File

@ -961,7 +961,10 @@ class DiscoveryTaskList extends HTML
).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image( ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
'images/lightbulb_off.png', 'images/lightbulb_off.png',
true, true,
['title' => __('enable task')] [
'title' => __('enable task'),
'class' => 'filter_none',
]
).'</a>'; ).'</a>';
} else if ($task['disabled'] == 0) { } else if ($task['disabled'] == 0) {
$data[9] .= '<a href="'.ui_get_full_url( $data[9] .= '<a href="'.ui_get_full_url(

View File

@ -52,7 +52,7 @@ if ($alerts === false || $totalAlerts == 0 || !$searchAlerts) {
$table->data = []; $table->data = [];
foreach ($alerts as $alert) { foreach ($alerts as $alert) {
if ($alert['disabled']) { if ($alert['disabled']) {
$disabledCell = html_print_image('images/lightbulb_off.png', true, ['title' => 'disable', 'alt' => 'disable']); $disabledCell = html_print_image('images/lightbulb_off.png', true, ['title' => 'disable', 'alt' => 'disable', 'class' => 'filter_none']);
} else { } else {
$disabledCell = html_print_image('images/lightbulb.png', true, ['alt' => 'enable', 'title' => 'enable']); $disabledCell = html_print_image('images/lightbulb.png', true, ['alt' => 'enable', 'title' => 'enable']);
} }