fixed styles

This commit is contained in:
daniel 2023-03-09 11:25:43 +01:00
parent 47c67ff131
commit 63d83b3f97
8 changed files with 46 additions and 29 deletions

View File

@ -98,6 +98,7 @@ echo '</div>';
?>
<script type="text/javascript">
$(document).ready(function() {
menuActionButtonResizing();
const menuTypeClass = '<?php echo $menuTypeClass; ?>';
if (menuTypeClass === 'classic' && menuTypeClass !== localStorage.getItem('menuType')) {
localStorage.setItem('menuType', 'classic');

View File

@ -5590,7 +5590,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
);
case 'submit':
$width = (isset($data['width']) === true) ? 'width: '.$data['width'] : 'width: 100%';
$width = (isset($data['width']) === true) ? 'width: '.$data['width'] : '';
$output .= '<'.$wrapper.' class="action-buttons" style="'.$width.'">'.html_print_submit_button(
((isset($data['label']) === true) ? $data['label'] : 'OK'),
((isset($data['name']) === true) ? $data['name'] : ''),

View File

@ -3918,10 +3918,15 @@ function ui_print_datatable(array $parameters)
ordering: '.$ordering.',
initComplete: function(settings, json) {
// 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_length"));
$(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dt-buttons"));
$(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
},
columns: [';

View File

@ -2402,8 +2402,8 @@ function topFunction() {
}
function menuActionButtonResizing() {
$(".action_buttons_right_content").attr(
$("#principal_action_buttons").attr(
"style",
"left: " + $("#menu_full").width() + "px;"
"width: calc(100% - " + $("#menu_full").width() + "px);"
);
}

View File

@ -1053,6 +1053,10 @@ select:-internal-list-box {
border-radius: 8px;
}
.box-flat .action-buttons {
flex-direction: row-reverse;
}
.align-top td {
vertical-align: top;
}
@ -2102,20 +2106,20 @@ table.rounded_cells td {
.action-buttons {
display: flex;
flex-direction: row-reverse;
align-items: center;
}
.action-buttons > *:not(#backgroundMaskId) {
z-index: 5;
}
#principal_action_buttons {
z-index: 6;
background: #ffffff;
display: flex;
flex-direction: row-reverse;
justify-content: space-between;
}
.action-buttons > button {
#principal_action_buttons.action-buttons > button {
margin-left: 16px;
flex: none;
}
.action-buttons-right-forced {
@ -10957,24 +10961,28 @@ tr.bring_next_field {
position: fixed;
padding: 0;
bottom: 0;
z-index: 1;
width: -webkit-fill-available;
right: 0;
width: -moz-available;
padding-right: 10px;
left: 0;
height: 62px;
height: auto;
}
.action_buttons_right_content {
position: fixed;
z-index: 10000;
left: 250px;
flex: 1;
height: auto;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
margin-left: 20px;
}
.action_buttons_right_content div {
#principal_action_buttons > form:first-child,
.action_buttons_right_content > div {
height: 62px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
margin-right: 1em;
margin-left: 1em;
}
@ -10990,14 +10998,14 @@ tr.bring_next_field {
position: absolute;
left: 0;
top: 0;
height: 62px;
height: auto;
border-top: 1px solid #e5e9ed;
background-color: #fff;
}
/*
.fixed_action_buttons_size > .action_buttons_background_mask {
left: -95px !important;
}
}*/
.external_tools_title {
padding: 0 10px;

View File

@ -13,6 +13,10 @@ ul.wizard li {
padding-top: 10px;
}
#principal_action_buttons ul.wizard li {
padding: 0px;
}
ul.wizard.inline li {
display: flex;
flex-direction: row;

View File

@ -1519,7 +1519,6 @@ require 'include/php_to_js_values.php';
<script type="text/javascript" language="javascript">
// Handle the scroll.
$(document).ready(scrollFunction());
$(document).ready(menuActionButtonResizing());
// When there are less than 5 rows, all rows must be white
var theme = "<?php echo $config['style']; ?>";
if (theme === 'pandora') {

View File

@ -1448,7 +1448,7 @@ $url_timestamp_down .= '&sort_field=timestamp&sort=down';
if (empty($result) === false) {
if (is_metaconsole() === true) {
html_print_action_buttons(
html_print_div(['style' => 'float:left; height: 55px;', 'class' => 'mrgn_top_15px'], true),
'',
[
'type' => 'form_action',
'right_content' => $tablePagination,
@ -2229,7 +2229,7 @@ if (empty($result) === false) {
if (is_metaconsole() !== true) {
html_print_action_buttons(
html_print_div(['style' => 'float:left; height: 55px;'], true),
'',
[
'type' => 'form_action',
'right_content' => $tablePagination,