Merge branch 'ent-10848-mejorar-aspecto-de-formulario-de-graficas-de-interfaces-y-de-las-graficas-de-modulo' into 'develop'

Ent 10848 mejorar aspecto de formulario de graficas de interfaces y de las graficas de modulo

See merge request artica/pandorafms!5669
This commit is contained in:
Matias Didier 2023-04-17 14:50:32 +00:00
commit e468c306b9
3 changed files with 90 additions and 19 deletions

View File

@ -11896,6 +11896,42 @@ td[id^="table_info_box"] a {
border-bottom: 1px solid #dedede !important;
}
.small-input-select2 > div > input,
.small-input-select2 > div > select,
.small-input {
height: 30px;
border: 1px solid #8a96a6;
margin: 3px 2px;
}
.small-input-select2 > div > a > img {
padding-top: 5px !important;
}
.small-input-select2
.select2-container
.select2-selection--single
.select2-selection__rendered,
.small-input-select2
div
.select2-container
.select2-selection--single
.select2-selection__rendered {
line-height: 30px !important;
}
.small-input-select2 .select2-container .select2-selection--single,
.small-input-select2 div .select2-container .select2-selection--single {
height: 30px !important;
border: 1px solid #8a96a6 !important;
margin: 3px 2px;
}
.small-input-select2 .select2-selection__arrow,
.small-input-select2 div .select2-selection__arrow {
top: -1px !important;
}
.break-word {
word-wrap: break-word;
}

View File

@ -167,7 +167,7 @@ $table->class = 'table_modal_alternate';
$data = [];
$data[0] = __('Refresh time');
$data[1] = html_print_extended_select_for_time(
$data[1] = '<div class="small-input-select2">'.html_print_extended_select_for_time(
'refresh',
$refresh,
'',
@ -175,7 +175,7 @@ $data[1] = html_print_extended_select_for_time(
0,
7,
true
);
).'</div>';
$table->data[] = $data;
$table->rowclass[] = '';
@ -187,7 +187,11 @@ $data[1] = html_print_input_text(
'',
15,
255,
true
true,
false,
false,
'',
'small-input'
);
$data[1] .= html_print_image(
'/images/calendar_view_day.png',
@ -196,6 +200,7 @@ $data[1] .= html_print_image(
'onclick' => "scwShow(scwID('text-start_date'),this);",
'style' => 'vertical-align: bottom;',
'class' => 'invert_filter',
'style' => 'vertical-align: middle;',
],
false,
false,
@ -207,13 +212,24 @@ $table->rowclass[] = '';
$data = [];
$data[0] = __('Begin time');
$data[1] = html_print_input_text('start_time', $start_time, '', 10, 10, true);
$data[1] = html_print_input_text(
'start_time',
$start_time,
'',
10,
10,
true,
false,
false,
'',
'small-input'
);
$table->data[] = $data;
$table->rowclass[] = '';
$data = [];
$data[0] = __('Time range');
$data[1] = html_print_extended_select_for_time(
$data[1] = '<div class="small-input-select2">'.html_print_extended_select_for_time(
'period',
$period,
'',
@ -221,7 +237,7 @@ $data[1] = html_print_extended_select_for_time(
0,
7,
true
);
).'</div>';
$table->data[] = $data;
$table->rowclass[] = '';
@ -278,7 +294,10 @@ $form_table .= html_print_submit_button(
__('Reload'),
'submit',
false,
'class="sub upd"',
[
'class' => 'float-right mini',
'icon' => 'upd',
],
true
);
$form_table .= '</div>';

View File

@ -265,7 +265,7 @@ ui_print_message_dialog(
);
$table->data[0][0] = __('Refresh time');
$table->data[0][1] = html_print_extended_select_for_time(
$table->data[0][1] = '<div class="small-input-select2">'.html_print_extended_select_for_time(
'refresh',
$refresh,
'',
@ -273,7 +273,7 @@ ui_print_message_dialog(
0,
7,
true
);
).'</div>';
$table->data[0][2] = __('Show events');
$disabled = false;
@ -293,7 +293,11 @@ ui_print_message_dialog(
'',
10,
20,
true
true,
false,
false,
'',
'small-input'
);
$table->data[1][2] = __('Show alerts');
@ -311,7 +315,11 @@ ui_print_message_dialog(
'',
10,
10,
true
true,
false,
false,
'',
'small-input'
);
$table->data[2][2] = __('Show unknown graph');
@ -323,7 +331,7 @@ ui_print_message_dialog(
);
$table->data[3][0] = __('Time range');
$table->data[3][1] = html_print_extended_select_for_time(
$table->data[3][1] = '<div class="small-input-select2">'.html_print_extended_select_for_time(
'period',
$period,
'',
@ -331,7 +339,7 @@ ui_print_message_dialog(
0,
7,
true
);
).'</div>';
$table->data[3][2] = '';
$table->data[3][3] = '';
@ -345,7 +353,7 @@ ui_print_message_dialog(
$options[3] = 'x3';
$options[4] = 'x4';
$options[5] = 'x5';
$table->data[4][1] = html_print_select(
$table->data[4][1] = '<div class="small-input-select2">'.html_print_select(
$options,
'zoom',
$zoom,
@ -355,7 +363,7 @@ ui_print_message_dialog(
true,
false,
false
);
).'</div>';
$table->data[4][2] = __('Show percentil');
$table->data[4][3] = html_print_checkbox_switch(
@ -412,7 +420,11 @@ ui_print_message_dialog(
'',
10,
20,
true
true,
false,
false,
'',
'small-input'
);
$table->data[0][2] = __('Begin time');
@ -422,11 +434,15 @@ ui_print_message_dialog(
'',
10,
10,
true
true,
false,
false,
'',
'small-input'
);
$table->data[1][0] = __('Time range');
$table->data[1][1] = html_print_extended_select_for_time(
$table->data[1][1] = '<div class="small-input-select2">'.html_print_extended_select_for_time(
'period',
$period,
'',
@ -434,7 +450,7 @@ ui_print_message_dialog(
0,
7,
true
);
).'</div>';
$table->data[1][2] = __('Time compare (Separated)');
$table->data[1][3] = html_print_checkbox_switch(