Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

This commit is contained in:
Jonathan 2023-02-24 12:00:12 +01:00
commit 84e3f11b7b
7 changed files with 17 additions and 18 deletions

View File

@ -448,10 +448,8 @@ function mainAgentsModules()
$filter_update = html_print_submit_button(__('Update item'), 'edit_item', false, 'class="sub upd"', true); $filter_update = html_print_submit_button(__('Update item'), 'edit_item', false, 'class="sub upd"', true);
$onheader = [ $onheader = [
'updated_time' => $updated_time, 'updated_time' => $updated_time,
'fullscreen' => $fullscreen, 'fullscreen' => $fullscreen,
'combo_module_groups' => $filter_module_groups,
'combo_groups' => $filter_groups,
]; ];
/* /*
@ -467,7 +465,7 @@ function mainAgentsModules()
false, false,
'', '',
false, false,
(array) $updated_time, $onheader,
[ [
[ [
'link' => '', 'link' => '',
@ -479,12 +477,6 @@ function mainAgentsModules()
], ],
] ]
); );
echo '<table class="w100p">';
echo '<tr>';
echo "<td> <span class='float-right'>".$fullscreen['text'].'</span> </td>';
echo '</tr>';
echo '</table>';
} else { } else {
if ($full_agents_id[0]) { if ($full_agents_id[0]) {
$full_modules = urlencode(implode(';', $full_modules_selected)); $full_modules = urlencode(implode(';', $full_modules_selected));
@ -600,6 +592,7 @@ function mainAgentsModules()
$show_filters .= '</tr>'; $show_filters .= '</tr>';
$show_filters .= '</table>'; $show_filters .= '</table>';
$show_filters .= '</form>'; $show_filters .= '</form>';
ui_toggle( ui_toggle(
$show_filters, $show_filters,
__('Filters ').ui_print_help_tip(__('Secondary groups and agent subgroups will be taken into account.'), true), __('Filters ').ui_print_help_tip(__('Secondary groups and agent subgroups will be taken into account.'), true),
@ -758,7 +751,7 @@ function mainAgentsModules()
return; return;
} }
echo '<table cellpadding="4" cellspacing="4" border="0" class="agents_modules_table w100p">'; echo '<table cellpadding="4" cellspacing="4" border="0" class="agents_modules_table w100p mrgn_btn_20px">';
echo '<tr>'; echo '<tr>';

View File

@ -786,7 +786,7 @@ class AgentsAlerts extends HTML
'name' => 'show-modules-without-alerts', 'name' => 'show-modules-without-alerts',
'checked' => $this->showWithoutAlertModules, 'checked' => $this->showWithoutAlertModules,
'input_class' => 'flex-row', 'input_class' => 'flex-row',
'type' => 'switch', 'type' => 'checkbox',
'class' => '', 'class' => '',
'disabled_hidden' => true, 'disabled_hidden' => true,
'return' => true, 'return' => true,

View File

@ -3784,7 +3784,8 @@ function ui_print_datatable(array $parameters)
} }
// Move elements to table_action_buttons bar. // Move elements to table_action_buttons bar.
$(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers")); $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
$(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > #table_events_length")); $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_length"));
$(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dt-buttons"));
if (json.error) { if (json.error) {
console.error(json.error); console.error(json.error);

View File

@ -1659,6 +1659,10 @@ td.datos2_id {
padding-bottom: 1px; padding-bottom: 1px;
} }
.p020 {
padding: 0 20px;
}
.w130, .w130,
#table-agent-configuration select { #table-agent-configuration select {
width: 130px; width: 130px;
@ -10826,6 +10830,7 @@ tr.bring_next_field {
width: -moz-available; width: -moz-available;
padding-right: 10px; padding-right: 10px;
left: 0; left: 0;
height: 62px;
} }
.action_buttons_right_content { .action_buttons_right_content {
@ -10856,7 +10861,6 @@ tr.bring_next_field {
height: 62px; height: 62px;
border-top: 1px solid #e5e9ed; border-top: 1px solid #e5e9ed;
background-color: #fff; background-color: #fff;
/*z-index: 10000;*/
} }
.fixed_action_buttons_size > .action_buttons_background_mask { .fixed_action_buttons_size > .action_buttons_background_mask {

View File

@ -358,7 +358,7 @@ a.pandora_pagination.current:hover {
/* CSV button datatables */ /* CSV button datatables */
.dt-button.buttons-csv.buttons-html5 { .dt-button.buttons-csv.buttons-html5 {
background-image: url(../../images/csv_mc.png); background-image: url(../../images/file-csv.svg);
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
color: #000; color: #000;

View File

@ -63,7 +63,7 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
$table = new StdClass(); $table = new StdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'filter-table-adv'; $table->class = 'filter-table-adv p020';
$table->size = []; $table->size = [];
$table->size[0] = '33%'; $table->size[0] = '33%';
$table->size[1] = '33%'; $table->size[1] = '33%';

View File

@ -439,7 +439,7 @@ if ($agent_view_page === true) {
[ [
'id' => 'alerts_status_datatable', 'id' => 'alerts_status_datatable',
'class' => 'info_table', 'class' => 'info_table',
'style' => 'width: 100%', 'style' => 'width: 99%',
'columns' => $columns, 'columns' => $columns,
'column_names' => $column_names, 'column_names' => $column_names,
'no_sortable_columns' => $no_sortable_columns, 'no_sortable_columns' => $no_sortable_columns,
@ -457,6 +457,7 @@ if ($agent_view_page === true) {
'zeroRecords' => __('No alerts found'), 'zeroRecords' => __('No alerts found'),
'emptyTable' => __('No alerts found'), 'emptyTable' => __('No alerts found'),
'search_button_class' => 'sub filter float-right', 'search_button_class' => 'sub filter float-right',
'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
'form' => [ 'form' => [
'html' => printFormFilterAlert( 'html' => printFormFilterAlert(
$id_group, $id_group,