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-15 15:31:04 +01:00
commit fa4d686f4f
12 changed files with 203 additions and 143 deletions

View File

@ -214,6 +214,7 @@ echo '</div>';
$('div#page').toggleClass('page_classic page_collapsed'); $('div#page').toggleClass('page_classic page_collapsed');
$('#header_table').toggleClass('header_table_classic header_table_collapsed'); $('#header_table').toggleClass('header_table_classic header_table_collapsed');
$('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed"); $('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed");
menuActionButtonResizing();
}); });
const id_selected = '<?php echo $menu1_selected; ?>'; const id_selected = '<?php echo $menu1_selected; ?>';

View File

@ -278,7 +278,7 @@ if ($create_module_inventory === true) {
$total_modules = db_get_sql('SELECT COUNT(*) FROM tmodule_inventory'); $total_modules = db_get_sql('SELECT COUNT(*) FROM tmodule_inventory');
$table = new stdClass(); $table = new stdClass();
$table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available'; $table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available; width: -moz-available';
$table->class = 'info_table'; $table->class = 'info_table';
$table->size = []; $table->size = [];
$table->size[0] = '140px'; $table->size[0] = '140px';

View File

@ -743,7 +743,7 @@ if ($components === false) {
} }
$table = new stdClass(); $table = new stdClass();
$table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available'; $table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available; width: -moz-available';
$table->head = []; $table->head = [];
$table->class = 'info_table'; $table->class = 'info_table';
if ($is_management_allowed === true) { if ($is_management_allowed === true) {

View File

@ -63,6 +63,7 @@ function dialog_message(message_id) {
.parent() .parent()
.addClass('checkselected'); .addClass('checkselected');
$(".check_delete").prop("checked", true); $(".check_delete").prop("checked", true);
console.log($('.check_delete'));
$('.check_delete').each(function(){ $('.check_delete').each(function(){
$('#hidden-id_report_'+$(this).val()).prop("disabled", false); $('#hidden-id_report_'+$(this).val()).prop("disabled", false);
}); });
@ -73,6 +74,7 @@ function dialog_message(message_id) {
.parent() .parent()
.parent() .parent()
.removeClass('checkselected'); .removeClass('checkselected');
console.log($('.check_delete'));
$(".check_delete").prop("checked", false); $(".check_delete").prop("checked", false);
} }
}); });
@ -253,7 +255,7 @@ if ($idReport != 0) {
// Despite its permissions. // Despite its permissions.
$delete_report_bypass = false; $delete_report_bypass = false;
if ($action == 'delete_report') { if ($action === 'delete_report') {
if ($config['id_user'] == $report['id_user'] if ($config['id_user'] == $report['id_user']
|| is_user_admin($config['id_user']) || is_user_admin($config['id_user'])
) { ) {
@ -887,11 +889,10 @@ switch ($action) {
$filtersStr = http_build_query($filters, '', '&amp;'); $filtersStr = http_build_query($filters, '', '&amp;');
$url = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder'; $url = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder';
$url .= '&'.$filtersStr; $url .= '&'.$filtersStr;
ui_pagination($total_reports, $url, $offset, $pagination); // ui_pagination($total_reports, $url, $offset, $pagination);
$table = new stdClass(); $table = new stdClass();
$table->id = 'report_list'; $table->id = 'report_list';
$table->width = '100%'; $table->styleTable = 'margin: 0 10px;';
$table->class = 'info_table'; $table->class = 'info_table';
$table->cellpadding = 0; $table->cellpadding = 0;
$table->cellspacing = 0; $table->cellspacing = 0;
@ -1044,37 +1045,55 @@ switch ($action) {
['title' => __('This report exceeds the item limit for realtime operations')] ['title' => __('This report exceeds the item limit for realtime operations')]
); );
$data[3] = null; $data[3] = null;
} else if (!$report['non_interactive']) { } else if ((bool) $report['non_interactive'] === false) {
$data[2] = '<a href="'.$config['homeurl'].'index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'&pure='.$pure.'">'; $data[2] = html_print_anchor(
$data[2] .= html_print_image(
'images/html.png',
true,
[ [
'title' => __('HTML view'), 'href' => $config['homeurl'].'index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'&pure='.$pure,
'class' => 'invert_filter', 'content' => html_print_image(
] 'images/file-html.svg',
true,
[
'title' => __('HTML view'),
'class' => 'invert_filter main_menu_icon',
]
),
],
true
); );
$data[2] .= '</a>';
$data[3] = '<a onclick="blockResubmit($(this))" href="'.ui_get_full_url(false, false, false, false).'ajax.php?page='.$config['homedir'].'/operation/reporting/reporting_xml&id='.$report['id_report'].'">'; $data[3] = html_print_anchor(
$data[3] .= html_print_image(
'images/xml.png',
true,
[ [
'title' => __('Export to XML'), 'onClick' => 'blockResubmit($(this))',
'class' => 'invert_filter', 'href' => ui_get_full_url(false, false, false, false).'ajax.php?page='.$config['homedir'].'/operation/reporting/reporting_xml&id='.$report['id_report'],
] 'content' => html_print_image(
'images/file-xml.svg',
true,
[
'title' => __('Export to XML'),
'class' => 'invert_filter main_menu_icon',
]
),
],
true
); );
$data[3] .= '</a>';
// I chose ajax.php because it's supposed // I chose ajax.php because it's supposed
// to give XML anyway. // to give XML anyway.
} else { } else {
$data[2] = html_print_image( $data[2] = html_print_image(
'images/html_disabled.png', 'images/file-html.svg',
true true,
[
'title' => __('HTML view'),
'class' => 'invert_filter main_menu_icon alpha50',
]
); );
$data[3] = html_print_image( $data[3] = html_print_image(
'images/xml_disabled.png', 'images/file-xml.svg',
true true,
[
'title' => __('Export to XML'),
'class' => 'invert_filter main_menu_icon alpha50',
]
); );
} }
@ -1145,89 +1164,103 @@ switch ($action) {
if ($edit || $delete) { if ($edit || $delete) {
$columnview = true; $columnview = true;
$table->cellclass[][$next] = 'table_action_buttons'; // $table->cellclass[][$next] = 'table_action_buttons';
$tableActionButtons = [];
if (!isset($table->head[$next])) { if (!isset($table->head[$next])) {
$table->head[$next] = '<span title="Operations">'.__('Op.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false); $table->head[$next] = '<span title="Operations">'.__('Op.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
$table->size = []; $table->size = [];
// $table->size[$next] = '80px';
} }
if ($edit) { if ($edit) {
$data[$next] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&pure='.$pure.'" class="inline_line">'; $tableActionButtons[] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&pure='.$pure.'" class="inline_line">';
$data[$next] .= html_print_input_image( $tableActionButtons[] = html_print_input_image(
'edit', 'edit',
'images/config.png', 'images/edit.svg',
1, 1,
'', '',
true, true,
['title' => __('Edit')] [
'title' => __('Edit'),
'class' => 'main_menu_icon',
]
); );
$data[$next] .= html_print_input_hidden( $tableActionButtons[] = html_print_input_hidden(
'id_report', 'id_report',
$report['id_report'], $report['id_report'],
true true
); );
$data[$next] .= '</form>'; $tableActionButtons[] = '</form>';
} }
$data[$next] .= '<form method="post" style="display: inline"; onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">'; $tableActionButtons[] = '<form method="post" style="display: inline"; onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
$data[$next] .= html_print_input_hidden( $tableActionButtons[] = html_print_input_hidden(
'id_report', 'id_report',
$report['id_report'], $report['id_report'],
true true
); );
$data[$next] .= html_print_input_hidden( $tableActionButtons[] = html_print_input_hidden(
'action', 'action',
'copy_report', 'copy_report',
true true
); );
$data[$next] .= html_print_input_image( $tableActionButtons[] = html_print_input_image(
'dup', 'dup',
'images/copy.png', 'images/copy.svg',
1, 1,
'', '',
true, true,
['title' => __('Duplicate')] [
'title' => __('Duplicate'),
'class' => 'main_menu_icon',
]
); );
$data[$next] .= '</form> '; $tableActionButtons[] = '</form> ';
if ($delete) { if ($delete) {
$data[$next] .= '<form method="post" class="inline_line" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">'; $tableActionButtons[] = '<form method="post" class="inline_line" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
$data[$next] .= html_print_input_image( $tableActionButtons[] = html_print_input_image(
'delete', 'delete',
'images/cross.png', 'images/delete.svg',
1, 1,
'margin-right: 10px;', 'margin-right: 10px;',
true, true,
[ [
'title' => __('Delete'), 'title' => __('Delete'),
'class' => 'invert_filter', 'class' => 'main_menu_icon',
] ]
); );
$data[$next] .= html_print_input_hidden( $tableActionButtons[] = html_print_input_hidden(
'id_report', 'id_report',
$report['id_report'], $report['id_report'],
true true
); );
$data[$next] .= html_print_input_hidden( $tableActionButtons[] = html_print_input_hidden(
'action', 'action',
'delete_report', 'delete_report',
true true
); );
$data[$next] .= html_print_checkbox_extended( $tableActionButtons[] = html_print_checkbox_extended(
'massive_report_check', 'massive_report_check',
$report['id_report'], $report['id_report'],
false, false,
false, false,
'', '',
'class="check_delete"', [ 'input_class' => 'check_delete' ],
true true
); );
$data[$next] .= '</form>'; $tableActionButtons[] = '</form>';
} }
$data[$next] = html_print_div(
[
'class' => 'table_action_buttons',
'style' => 'padding-top: 8px;',
'content' => implode('', $tableActionButtons),
],
true
);
} else { } else {
if ($op_column) { if ($op_column) {
$data[$next] = ''; $data[$next] = '';
@ -1237,18 +1270,15 @@ switch ($action) {
array_push($table->data, $data); array_push($table->data, $data);
} }
html_print_table($table); html_print_table($table);
ui_pagination( $tablePagination = ui_pagination(
$total_reports, $total_reports,
$url, $url,
$offset, $offset,
$pagination, $pagination,
false,
'offset',
true, true,
'pagination-bottom' 'offset',
false,
); );
} else { } else {
ui_print_info_message( ui_print_info_message(
@ -1262,25 +1292,28 @@ switch ($action) {
if (check_acl($config['id_user'], 0, 'RW') if (check_acl($config['id_user'], 0, 'RW')
|| check_acl($config['id_user'], 0, 'RM') || check_acl($config['id_user'], 0, 'RM')
) { ) {
$output = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">'; $buttonsOutput = [];
$buttonsOutput .= html_print_submit_button( // Create form.
$buttonsOutput[] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">';
$buttonsOutput[] = html_print_submit_button(
__('Create report'), __('Create report'),
'create', 'create',
false, false,
[ 'icon' => 'next' ], [ 'icon' => 'next' ],
true true
); );
$output .= '</form>'; $buttonsOutput[] = '</form>';
$output .= '<form class="inline_line" id="massive_report_form" method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=delete">'; // Delete form.
$buttonsOutput[] = '<form class="inline_line mrgn_right_10px" id="massive_report_form" method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=delete">';
foreach ($reports as $report) { foreach ($reports as $report) {
$output .= '<input class="massive_report_form_elements" id="hidden-id_report_'.$report['id_report'].'" name="id_report[]" type="hidden" disabled value="'.$report['id_report'].'">'; $buttonsOutput[] = '<input class="massive_report_form_elements" id="hidden-id_report_'.$report['id_report'].'" name="id_report[]" type="hidden" disabled value="'.$report['id_report'].'">';
} }
if (empty($report) === false) { if (empty($report) === false) {
$output .= '<input id="hidden-action" name="action" type="hidden" value="delete_report">'; $buttonsOutput[] = html_print_input_hidden('action', 'delete_report', true);
$buttonsOutput .= html_print_submit_button( $buttonsOutput[] = html_print_submit_button(
__('Delete'), __('Delete'),
'delete_btn', 'delete_btn',
false, false,
@ -1292,17 +1325,16 @@ switch ($action) {
); );
} }
$output .= html_print_div( $buttonsOutput[] = '</form>';
echo html_print_action_buttons(
implode('', $buttonsOutput),
[ [
'class' => 'action-buttons', 'type' => 'form_action',
'content' => $buttonsOutput, 'right_content' => $tablePagination,
], ],
true true
); );
$output .= '</form>';
echo $output;
} }
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / radial-disable@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-radial-disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" fill="#C0CCDC">
<rect id="Rectangle-2" x="0" y="0" width="20" height="20" rx="4"></rect>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 565 B

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / radial-off@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-radial-off" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Group" transform="translate(1.000000, 1.000000)" stroke="#95A3BF" stroke-width="2">
<rect id="Rectangle" x="0" y="0" width="18" height="18" rx="4"></rect>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 663 B

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / radial-on@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-radial-on" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" fill="#1D7873">
<g id="Rectangle-2">
<path d="M16,0 C18.209139,-4.05812251e-16 20,1.790861 20,4 L20,16 C20,18.209139 18.209139,20 16,20 L4,20 C1.790861,20 2.705415e-16,18.209139 0,16 L0,4 C-2.705415e-16,1.790861 1.790861,4.05812251e-16 4,0 L16,0 Z M15.7777439,6.37135141 C15.4305323,5.94186038 14.8008905,5.87515972 14.3713994,6.22237132 L14.3713994,6.22237132 L7.77861597,11.5510307 L5.81650513,8.77747883 L5.73770948,8.67956758 C5.40260169,8.31264068 4.83884178,8.24412234 4.42262802,8.53850895 C3.97172977,8.85742777 3.86473931,9.48148781 4.18365814,9.93238606 L4.18365814,9.93238606 L6.76182606,13.5774872 L6.83812914,13.672688 C7.18888164,14.0598005 7.78987666,14.114854 8.20693177,13.7776959 L8.20693177,13.7776959 L15.6287639,7.77769594 L15.7214138,7.69277628 C16.0660673,7.33480068 16.098247,6.76780467 15.7777439,6.37135141 Z"></path>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -4144,10 +4144,34 @@ function html_print_checkbox_extended(
$idcounter[$name] = 0; $idcounter[$name] = 0;
} }
$inputClass = 'custom_checkbox_input';
$labelClass = 'custom_checkbox';
if (is_array($attributes) === true) {
$tmpAttributes = [];
foreach ($attributes as $key => $value) {
switch ($key) {
case 'input_class':
$inputClass .= ' '.$value;
break;
case 'label_class':
$labelClass .= ' '.$value;
break;
default:
$tmpAttributes[] = $key.'="'.$value.'"';
break;
}
}
$attributes = implode(' ', $tmpAttributes);
}
$id_aux = preg_replace('/[^a-z0-9\:\;\-\_]/i', '', $name.($idcounter[$name] ? $idcounter[$name] : '')); $id_aux = preg_replace('/[^a-z0-9\:\;\-\_]/i', '', $name.($idcounter[$name] ? $idcounter[$name] : ''));
$output = '<label class="custom_checkbox">'; $output = '<label class="'.$labelClass.'">';
$output .= '<input class="custom_checkbox_input" name="'.$name.'" type="checkbox" value="'.$value.'" '.($checked ? 'checked="checked"' : ''); $output .= '<input class="'.$inputClass.'" name="'.$name.'" type="checkbox" value="'.$value.'" '.($checked ? 'checked="checked"' : '');
$output .= (empty($id) === true) ? ' id="checkbox-'.$id_aux.'"' : ' id="'.$id.'"'; $output .= (empty($id) === true) ? ' id="checkbox-'.$id_aux.'"' : ' id="'.$id.'"';
$output .= (empty($script) === false) ? ' onclick="'.$script.'"' : ''; $output .= (empty($script) === false) ? ' onclick="'.$script.'"' : '';
$output .= ((bool) $disabled === true) ? ' disabled="disabled"' : ''; $output .= ((bool) $disabled === true) ? ' disabled="disabled"' : '';

View File

@ -4231,25 +4231,18 @@ function ui_toggle(
$image_a = html_print_image( $image_a = html_print_image(
$img_a, $img_a,
true, true,
[ [ 'style' => 'rotate: 90deg;' ],
'style' => 'rotate: 45deg;',
'class' => 'main_menu_icon',
],
true true
); );
} else { } else {
$image_a = ''; $image_a = '';
} }
hd($image_a, true);
if (empty($img_b) === false) { if (empty($img_b) === false) {
$image_b = html_print_image( $image_b = html_print_image(
$img_b, $img_b,
true, true,
[ [ 'style' => 'rotate: 180deg;' ],
'style' => 'rotate: 90deg;',
'class' => 'main_menu_icon',
],
true true
); );
} else { } else {
@ -4257,14 +4250,14 @@ function ui_toggle(
} }
// Options. // Options.
$style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-fill-available;'; $style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-available;';
$style = 'overflow:hidden;'; $style = 'overflow:hidden;';
if ($hidden_default === true) { if ($hidden_default === true) {
$imageRotate = '90deg'; $imageRotate = '180deg';
$style .= 'height:0;position:absolute;'; $style .= 'height:0;position:absolute;';
$original = $img_b; $original = $img_b;
} else { } else {
$imageRotate = '180deg'; $imageRotate = '90deg';
$style .= 'height:auto;position:relative;'; $style .= 'height:auto;position:relative;';
$original = $img_a; $original = $img_a;
} }
@ -4390,8 +4383,7 @@ function ui_toggle(
$output .= " $('#tgl_div_".$uniqid."').css('height', 'auto');\n"; $output .= " $('#tgl_div_".$uniqid."').css('height', 'auto');\n";
$output .= " $('#tgl_div_".$uniqid."').css('position', 'relative');\n"; $output .= " $('#tgl_div_".$uniqid."').css('position', 'relative');\n";
$output .= " $('#image_".$uniqid."').attr({src: '".$image_a."'});\n"; $output .= " $('#image_".$uniqid."').attr({src: '".$image_a."'});\n";
$output .= " $('#image_".$uniqid."').addClass('main_menu_icon');\n"; $output .= " $('#image_".$uniqid."').css('rotate','90deg');\n";
$output .= " $('#image_".$uniqid."').css('rotate','180deg');\n";
$output .= " $('#checkbox-".$switch_name."').prop('checked', true);\n"; $output .= " $('#checkbox-".$switch_name."').prop('checked', true);\n";
$output .= " }\n"; $output .= " }\n";
$output .= " else {\n"; $output .= " else {\n";
@ -4399,8 +4391,7 @@ function ui_toggle(
$output .= " $('#tgl_div_".$uniqid."').css('height', 0);\n"; $output .= " $('#tgl_div_".$uniqid."').css('height', 0);\n";
$output .= " $('#tgl_div_".$uniqid."').css('position', 'absolute');\n"; $output .= " $('#tgl_div_".$uniqid."').css('position', 'absolute');\n";
$output .= " $('#image_".$uniqid."').attr({src: '".$image_b."'});\n"; $output .= " $('#image_".$uniqid."').attr({src: '".$image_b."'});\n";
$output .= " $('#image_".$uniqid."').addClass('main_menu_icon');\n"; $output .= " $('#image_".$uniqid."').css('rotate','180deg');\n";
$output .= " $('#image_".$uniqid."').css('rotate','90deg');\n";
$output .= " $('#checkbox-".$switch_name."').prop('checked', false);\n"; $output .= " $('#checkbox-".$switch_name."').prop('checked', false);\n";
$output .= " }\n"; $output .= " }\n";
$output .= " });\n"; $output .= " });\n";

View File

@ -528,12 +528,12 @@ ul li {
} }
.header_table_classic { .header_table_classic {
padding-left: 315px; padding-left: 300px;
/* 280 + 35 */ /* 280 + 35 */
} }
.header_table_collapsed { .header_table_collapsed {
padding-left: 115px; padding-left: 100px;
/* 80 + 35 */ /* 80 + 35 */
} }

View File

@ -160,6 +160,8 @@ body {
min-height: 100%; min-height: 100%;
font-weight: 400; font-weight: 400;
font-family: "Pandora-Regular"; font-family: "Pandora-Regular";
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
} }
body.body-report { body.body-report {
@ -1748,7 +1750,7 @@ div.title_line {
border-bottom: 1px solid #c1ccdc; border-bottom: 1px solid #c1ccdc;
/* width: calc(100% + 3em); */ /* width: calc(100% + 3em); */
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-fill-available; width: -moz-available;
padding-right: 0px; padding-right: 0px;
/* margin-bottom: 20px; */ /* margin-bottom: 20px; */
height: 53px; height: 53px;
@ -2080,7 +2082,7 @@ table.rounded_cells td {
align-items: center; align-items: center;
} }
.action-buttons > * { .action-buttons > *:not(#backgroundMaskId) {
z-index: 5; z-index: 5;
} }
@ -2757,6 +2759,7 @@ td.cellBig {
.info_box_container.info_box_information { .info_box_container.info_box_information {
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-available;
position: relative; position: relative;
top: 0 !important; top: 0 !important;
right: 0; right: 0;
@ -10073,8 +10076,8 @@ button.submitButton.onlyIcon {
button.buttonButton.onlyIcon.pending, button.buttonButton.onlyIcon.pending,
button.submitButton.onlyIcon.pending { button.submitButton.onlyIcon.pending {
mask: url(../../images/arrow.svg) no-repeat right / contain; mask: url(../../images/validate.svg) no-repeat right / contain;
-webkit-mask: url(../../images/arrow.svg) no-repeat right / contain; -webkit-mask: url(../../images/validate.svg) no-repeat right / contain;
} }
button.buttonButton.onlyIcon.completed, button.buttonButton.onlyIcon.completed,
@ -10292,8 +10295,8 @@ button div.ok {
button div.pending, button div.pending,
button div.next { button div.next {
mask: url(../../images/arrow.svg) no-repeat center / contain; mask: url(../../images/validate.svg) no-repeat center / contain;
-webkit-mask: url(../../images/arrow.svg) no-repeat center / contain; -webkit-mask: url(../../images/validate.svg) no-repeat center / contain;
} }
button div.search { button div.search {
@ -10602,12 +10605,12 @@ tr.bring_next_field {
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
border: 0 !important; border: 0 !important;
height: 17px !important; height: 20px !important;
margin-left: -4px !important; margin-left: -8px !important;
margin-top: 12px !important; margin-top: 10px !important;
position: absolute !important; position: absolute !important;
width: 17px !important; width: 20px !important;
background: url(../../images/down.svg) no-repeat content-box !important; background: url(../../images/dropdown-down.svg) no-repeat content-box !important;
} }
.select2-container--default .select2-container--default
@ -10762,6 +10765,9 @@ tr.bring_next_field {
padding: 0px; padding: 0px;
bottom: 8px; bottom: 8px;
z-index: 1; z-index: 1;
width: -webkit-fill-available;
width: -moz-available;
padding-right: 10px;
} }
.action_buttons_right_content { .action_buttons_right_content {
@ -10778,14 +10784,15 @@ tr.bring_next_field {
.fixed_action_buttons_size { .fixed_action_buttons_size {
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-fill-available; width: -moz-available;
margin-right: 20px; /*margin-right: 20px;*/
} }
.action_buttons_background_mask { .action_buttons_background_mask {
width: 3000px; width: -webkit-fill-available;
width: -moz-available;
position: absolute; position: absolute;
right: -45px; left: 0;
height: 58px; height: 58px;
top: -8px; top: -8px;
border: 1px solid #e5e9ed; border: 1px solid #e5e9ed;
@ -10857,7 +10864,7 @@ pre.external_tools_output {
background-color: #fff; background-color: #fff;
z-index: 1; z-index: 1;
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-fill-available; width: -moz-available;
} }
/* /*
@ -11017,7 +11024,7 @@ span.subsection_header_title {
.width_available { .width_available {
width: -webkit-fill-available !important; width: -webkit-fill-available !important;
width: -moz-fill-available !important; width: -moz-available !important;
} }
.snmp-td { .snmp-td {

View File

@ -1513,7 +1513,7 @@ require 'include/php_to_js_values.php';
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
// Handle the scroll. // Handle the scroll.
$(document).ready(scrollFunction()); $(document).ready(scrollFunction());
$(document).ready(menuResizing()); $(document).ready(menuActionButtonResizing());
// When there are less than 5 rows, all rows must be white // When there are less than 5 rows, all rows must be white
var theme = "<?php echo $config['style']; ?>"; var theme = "<?php echo $config['style']; ?>";
if (theme === 'pandora') { if (theme === 'pandora') {
@ -1522,7 +1522,7 @@ require 'include/php_to_js_values.php';
} }
} }
//$('.button_collapse').on('click', menuResizing()); //$('.button_collapse').on('click', menuActionButtonResizing());
// Cursor change for show a spinner. Experimental. // Cursor change for show a spinner. Experimental.
/* /*
@ -1543,8 +1543,8 @@ require 'include/php_to_js_values.php';
scrollFunction() scrollFunction()
}; };
function menuResizing() { function menuActionButtonResizing() {
$('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width() + 36)+'px;'); $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width())+'px;');
} }
function scrollFunction() { function scrollFunction() {
@ -1557,36 +1557,6 @@ require 'include/php_to_js_values.php';
document.getElementById("top_btn").style.display = "none"; document.getElementById("top_btn").style.display = "none";
} }
} }
/*
var separationHeight = 10;
// Position of the visible part of document.
var scrollTop = document.documentElement.scrollTop;
// Height of all document.
var scrollHeight = document.documentElement.scrollHeight;
// Height of visible window (browser).
var clientHeight = document.documentElement.clientHeight;
// Height of footer (Plus 10px).
var footerHeight = document.getElementById('foot').offsetHeight + separationHeight;*/
// Fixed action buttons element.
var actionButtons = document.getElementById('principal_action_buttons');
// Handle the position of principal_action_buttons.
if (actionButtons) {
var $bottom = '', $left = '';
/*
if ((scrollHeight - clientHeight - scrollTop) < footerHeight) {
$bottom = 'bottom:'+(footerHeight - (scrollHeight - clientHeight - window.scrollY))+'px;';
} else {
$bottom = 'bottom:'+separationHeight+'px;';
}
*/
if (actionButtons.classList.contains('fixed_action_buttons_size') === false) {
$left = 'left:'+(document.documentElement.offsetWidth - document.getElementById('principal_action_buttons').offsetWidth - 20)+'px;';
actionButtons.setAttribute('style', $left);
}
// Set the position of principal action buttons.
//actionButtons.setAttribute('style', $left+$bottom);
}
} }
// When the user clicks on the button, scroll to the top of the document. // When the user clicks on the button, scroll to the top of the document.