tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

From merge

This commit is contained in:
jose.gonzalez@pandorafms.com 2022-11-23 13:26:54 +01:00
parent a688182062
commit 251fddacd0
6 changed files with 72 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_ui.php
View File

@ -3432,7 +3432,7 @@ function ui_print_datatable(array $parameters)
'',
true,
false,
'white_box white_box_opened',
'white_box white_box_opened fixed_filter_content',
'no-border'
);
}
@ -3444,7 +3444,7 @@ function ui_print_datatable(array $parameters)
'',
true,
false,
'white_box white_box_opened',
'white_box white_box_opened fixed_filter_bar',
'no-border'
);
}

8
pandora_console/include/styles/discovery.css
View File

@ -113,7 +113,7 @@ div.arrow_box:before {
#menu_tab_frame_view_bc {
display: flex;
justify-content: space-between;
border-bottom: 2px solid #82b92e;
border-bottom: 2px solid #14524f;
max-height: 70px;
min-height: 55px;
width: 100%;
@ -150,14 +150,14 @@ span.breadcrumb_link {
}
.breadcrumb_link.selected {
color: #95b750;
color: #14524f;
}
.breadcrumb_link.selected:hover {
color: #95b750;
color: #14524f;
}
.breadcrumb_link:hover {
color: #95b750;
color: #14524f;
}
/*

2
pandora_console/include/styles/js/datatables.min.css vendored
View File

@ -1847,7 +1847,7 @@ table.dataTable td {
position: relative;
clear: both;
zoom: 1;
margin-left: -3em;
/*margin-left: -3em;*/
}
.dataTables_wrapper .dataTables_length {
float: left;

55
pandora_console/include/styles/pandora.css
View File

@ -1068,10 +1068,11 @@ div#container {
}
div#main {
width: 100%;
/*width: 100%;*/
/*margin-left: 3em;*/
margin-bottom: 3em;
position: relative;
margin-top: 8.8em;
}
textarea.conf_editor {
@ -1349,6 +1350,7 @@ div#menu {
}
div#head {
position: fixed;
font-size: 8pt;
width: 100%;
height: 60px;
@ -1709,21 +1711,23 @@ div.title_line {
#menu_tab_frame,
#menu_tab_frame_view,
#menu_tab_frame_view_bc {
position: fixed;
top: 59px;
z-index: 10;
display: flex;
align-items: flex-end;
justify-content: space-between;
border-bottom: 2px solid #82b92e;
min-height: 50px;
width: calc(100% + 3em);
border-bottom: 4px solid #14524f;
/*width: calc(100% + 3em);*/
width: -webkit-fill-available;
width: -moz-fill-available;
padding-right: 0px;
margin-bottom: 20px;
height: 50px;
height: 56px;
box-sizing: border-box;
background-color: #fafafa;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
background-color: #fff;
box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.1);
margin-left: -3em;
/*margin-left: -3em;*/
}
/* Breadcrum */
@ -1740,17 +1744,24 @@ div.title_line {
flex-direction: column;
display: flex;
justify-content: space-between;
margin-right: 20px;
overflow: hidden;
margin-left: 20px;
}
.breadcrumbs_container {
/*
padding-left: 5em;
padding-top: 4px;
text-indent: 0.25em;
color: #848484;
font-size: 10pt;
font-weight: 500;
*/
padding-left: 0;
text-indent: 0;
color: #848484;
font-size: 10pt;
font-weight: 500;
}
.breadcrumb_active {
@ -1855,8 +1866,10 @@ div#agent_wizard_subtabs {
*/
/* TAB TITLE */
#menu_tab_left {
/*
max-width: 60%;
margin-right: 20px;
*/
}
#menu_tab_left span {
@ -1884,8 +1897,8 @@ div#agent_wizard_subtabs {
#menu_tab_left li.view {
margin-left: 0;
/*padding-left: 14px;*/
padding-left: 6em;
padding-bottom: 4px;
/*padding-left: 6em;*/
padding-bottom: 2px;
white-space: nowrap;
/*text-transform: uppercase;*/
}
@ -2486,7 +2499,8 @@ div#pandora_logo_header {
* ---------------------------------------------------------------------
*/
#header_table {
padding-right: 35px;
/*padding-right: 35px;*/
padding-right: 15px;
}
#header_table_inner {
@ -3735,13 +3749,13 @@ div.div_groups_status {
}
#menu_tab li:hover {
box-shadow: inset 0px 4px #82b92e;
box-shadow: inset 0px 4px #14524f;
}
#menu_tab li.nomn_high,
#menu_tab li.nomn_high span {
color: #fff;
box-shadow: inset 0px 4px #82b92e;
box-shadow: inset 0px 4px #14524f;
background-color: #fff;
}
@ -5998,7 +6012,6 @@ div#status_pie {
/* White tables to show graphs */
.white_table_graph {
margin-bottom: 20px;
max-width: 1064px;
}
.white_table_graph_header {
@ -10526,6 +10539,7 @@ tr.bring_next_field {
.fixed_action_buttons {
position: fixed;
padding: 0px;
bottom: 8px;
z-index: 1;
}
@ -10612,3 +10626,12 @@ pre.external_tools_output {
.tag-editor .tag-editor-delete:hover i:before {
color: #ccc !important;
}
.fixed_filter_bar {
}
.fixed_filter_content {
}
.fixed_filter_bar.fixed_size {
}

14
pandora_console/index.php
View File

@ -1470,7 +1470,7 @@ if ($config['pure'] == 0) {
echo '</div>';
echo '<div id="foot">';
include 'general/footer.php';
// include 'general/footer.php';
}
// Clippy function.
@ -1538,7 +1538,7 @@ require 'include/php_to_js_values.php';
document.getElementById("top_btn").style.display = "none";
}
}
/*
var separationHeight = 10;
// Position of the visible part of document.
var scrollTop = document.documentElement.scrollTop;
@ -1547,24 +1547,28 @@ require 'include/php_to_js_values.php';
// Height of visible window (browser).
var clientHeight = document.documentElement.clientHeight;
// Height of footer (Plus 10px).
var footerHeight = document.getElementById('foot').offsetHeight + separationHeight;
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 - 40)+'px;';
actionButtons.setAttribute('style', $left);
}
// Set the position of principal action buttons.
actionButtons.setAttribute('style', $left+$bottom);
//actionButtons.setAttribute('style', $left+$bottom);
}
}
// When the user clicks on the button, scroll to the top of the document.

38
pandora_console/operation/agentes/estado_agente.php
View File

@ -912,7 +912,7 @@ foreach ($agents as $agent) {
array_push($table->data, $data);
}
if (!empty($table->data)) {
if (empty($table->data) === false) {
html_print_table($table);
ui_pagination(
@ -934,33 +934,29 @@ if (!empty($table->data)) {
'pagination-bottom'
);
if (check_acl($config['id_user'], 0, 'AW') || check_acl($config['id_user'], 0, 'AM')) {
echo '<div class="right float-right">';
echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
html_print_submit_button(
__('Create agent'),
'crt',
false,
[ 'icon' => 'next']
);
echo '</form>';
echo '</div>';
}
unset($table);
} else {
ui_print_info_message([ 'no_close' => true, 'message' => __('There are no defined agents') ]);
echo '<div class="right float-right">';
}
if ((bool) check_acl($config['id_user'], 0, 'AW') === true || (bool) check_acl($config['id_user'], 0, 'AM') === true) {
echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
html_print_submit_button(
__('Create agent'),
'crt',
false,
[ 'icon' => 'next']
html_print_action_buttons(
html_print_submit_button(
__('Create agent'),
'crt',
false,
[ 'icon' => 'next' ],
true
),
[
'type' => 'data_table',
'class' => 'fixed_action_buttons',
]
);
echo '</form>';
echo '</div>';
}
?>
<script type="text/javascript">