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:
Pablo Aragon 2023-02-23 10:32:18 +01:00
commit c1342fb6a1
39 changed files with 354 additions and 156 deletions

View File

@ -186,7 +186,7 @@ function mainInsertData()
}
$table = new stdClass();
$table->class = 'databox m2020';
$table->class = 'databox';
$table->style = [];
$table->cellstyle[0][0] = 'width: 0';
$table->cellstyle[0][1] = 'width: 0';

View File

@ -437,7 +437,7 @@ function resource_exportation_extension_main()
);
$table = new stdClass();
$table->class = 'databox m2020';
$table->class = 'databox';
$table->id = 'resource_exportation_table';
$table->style = [];
$table->style[0] = 'width: 0';

View File

@ -1122,7 +1122,7 @@ function resource_registration_extension_main()
);
$table = new stdClass();
$table->class = 'databox m2020';
$table->class = 'databox';
$table->id = 'resource_registration_table';
$table->data = [];

View File

@ -363,7 +363,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
'images/send_feedback@header.svg',
true,
[
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
'title' => __('Feedback'),
'id' => 'feedback-header',
'alt' => __('Feedback'),
@ -417,7 +417,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
true,
[
'title' => __('Edit my user'),
'class' => 'main_menu_icon bot',
'class' => 'main_menu_icon bot invert_filter',
'alt' => 'user',
]
);

View File

@ -63,7 +63,7 @@ if ($id_field) {
}
$table = new stdClass();
$table->class = 'databox m2020';
$table->class = 'databox';
$table->id = 'configure_field';
echo "<div id='message_set_password' title='".__('Agent Custom Fields Information')."' class='invisible'>";

View File

@ -146,7 +146,7 @@ $fields = db_get_all_rows_filter(
);
$table = new stdClass();
$table->class = 'info_table m2020';
$table->class = 'info_table';
if ($fields) {
$table->head = [];
$table->head[0] = __('ID');

View File

@ -654,7 +654,7 @@ if ($agents !== false) {
$tableAgents = new stdClass();
$tableAgents->id = 'agent_list';
$tableAgents->class = 'info_table tactical_table m2020';
$tableAgents->class = 'info_table tactical_table';
$tableAgents->head = [];
$tableAgents->data = [];
// Header.
@ -837,7 +837,7 @@ if ($agents !== false) {
// Operating System icon column.
$osIconColumn = html_print_div(
[
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
'content' => ui_print_os_icon($agent['id_os'], false, true),
],
true
@ -856,7 +856,7 @@ if ($agents !== false) {
// Group icon and name column.
$agentGroupIconColumn = html_print_div(
[
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
'content' => ui_print_group_icon($agent['id_grupo'], true),
],
true

View File

@ -156,7 +156,7 @@ $iterator = 0;
if (empty($result) === false) {
$table = new stdClass();
$table->class = 'info_table m2020';
$table->class = 'info_table';
$table->data = [];
$table->head = [];
@ -188,7 +188,7 @@ if (empty($result) === false) {
true,
[
'title' => __('Edit'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
).'</a>&nbsp;&nbsp;';
$data[1] .= '<a href="index.php?sec=advanced&sec2=godmode/category/category&delete_category='.$category['id'].'&pure='.(int) $config['pure'].'"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">'.html_print_image(
@ -196,7 +196,7 @@ if (empty($result) === false) {
true,
[
'title' => __('Delete'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
).'</a>';
} else {
@ -217,7 +217,7 @@ if (empty($result) === false) {
true,
[
'title' => __('Edit'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
),
],
@ -233,7 +233,7 @@ if (empty($result) === false) {
true,
[
'title' => __('Delete'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
),
],

View File

@ -175,7 +175,7 @@ echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/category/e
$table = new stdClass();
$table->id = 'edit_catagory_table';
$table->class = 'databox m2020';
$table->class = 'databox';
$table->head = [];
if (is_metaconsole() === true) {

View File

@ -77,7 +77,7 @@ if ($id_group) {
}
$table = new stdClass();
$table->class = 'databox m2020';
$table->class = 'databox';
$table->style[0] = 'font-weight: bold';
$table->data = [];
$table->data[0][0] = __('Name');

View File

@ -253,7 +253,7 @@ $sql = 'SELECT *
$groups = db_get_all_rows_sql($sql);
$table = new stdClass();
$table->class = 'info_table m2020';
$table->class = 'info_table';
if (empty($groups) === false) {
$table->head = [];
@ -281,10 +281,10 @@ if (empty($groups) === false) {
if ($is_management_allowed === true) {
$data[1] = '<strong><a href="index.php?sec=gmodules&sec2=godmode/groups/configure_modu_group&id_group='.$id_group['id_mg'].'">'.ui_print_truncate_text($id_group['name'], GENERIC_SIZE_TEXT).'</a></strong>';
if (is_metaconsole() === true) {
$data[2] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=module_group&id_group='.$id_group['id_mg'].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).'</a>';
$data[2] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=module_group&id_group='.$id_group['id_mg'].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
} else {
$table->cellclass[][2] = 'table_action_buttons';
$data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list&id_group='.$id_group['id_mg'].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).'</a>';
$data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list&id_group='.$id_group['id_mg'].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
}
} else {
$data[1] = '<strong>';

View File

@ -260,7 +260,7 @@ foreach ($groups as $group_key => $group_val) {
$groups = component_groups_get_groups_tree_recursive($groups_clean, 0, 0);
$table = new stdClass();
$table->class = 'info_table m2020';
$table->class = 'info_table';
$table->head = [];
$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
$table->head[0] = __('Name');
@ -301,7 +301,7 @@ foreach ($groups as $group) {
[
'onClick' => 'if(confirm(\"'.__('Are you sure?').'\")) return true; else return false;',
'href' => 'index.php?sec='.$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg'].'&offset=0',
'content' => html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon']),
'content' => html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']),
],
true
);

View File

@ -55,7 +55,7 @@ if ($id) {
}
$table = new stdClass();
$table->class = 'databox m2020';
$table->class = 'databox';
if (is_metaconsole() === true) {
$table->class = 'databox data';

View File

@ -89,7 +89,7 @@ if ($update_module === true) {
$table = new stdClass();
$table->id = 'module_type_list';
$table->class = 'info_table m2020';
$table->class = 'info_table';
$table->size = [];
$table->size[0] = '5%';
$table->size[1] = '5%';

View File

@ -1181,7 +1181,7 @@ switch ($action) {
true,
[
'title' => __('Edit'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
);
$tableActionButtons[] = html_print_input_hidden(
@ -1211,7 +1211,7 @@ switch ($action) {
true,
[
'title' => __('Duplicate'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
);
$tableActionButtons[] = '</form> ';
@ -1226,7 +1226,7 @@ switch ($action) {
true,
[
'title' => __('Delete'),
'class' => 'main_menu_icon',
'class' => 'main_menu_icon invert_filter',
]
);
$tableActionButtons[] = html_print_input_hidden(

View File

@ -84,7 +84,7 @@ if (isset($_GET['server']) === true) {
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->class = 'databox m2020';
$table->class = 'databox';
$table->id = 'server_update_form';
$table->data[] = [

View File

@ -493,7 +493,7 @@ if (empty($create) === false || empty($view) === false) {
'title' => __('Save changes'),
'href' => 'index.php?sec=gservers&sec2=godmode/servers/plugin&filemanager=1&tab=Attachments&id_plugin='.$form_id,
'class' => 'mrgn_lft_5px',
'content' => html_print_image('images/validate.svg', true, ['class' => 'main_menu_icon invert_filter'], false, true),
'content' => html_print_image('images/validate.svg', true, ['class' => 'invert_filter main_menu_icon'], false, true),
],
true
);
@ -957,7 +957,7 @@ if (empty($create) === false || empty($view) === false) {
if ($rows !== false) {
$pluginTable = new stdClass();
$pluginTable->id = 'plugin_table';
$pluginTable->class = (is_metaconsole() === true) ? 'databox data' : 'info_table m2020';
$pluginTable->class = (is_metaconsole() === true) ? 'databox data' : 'info_table';
$pluginTable->head = [];
$pluginTable->head[0] = __('Name');
@ -1003,7 +1003,7 @@ if (empty($create) === false || empty($view) === false) {
true,
[
'title' => __('Lock'),
'class' => 'main_menu_icon invert_filter',
'class' => 'invert_filter main_menu_icon',
]
),
],

View File

@ -54,7 +54,7 @@ if ($servers === false) {
}
$table = new StdClass();
$table->class = 'info_table m2020';
$table->class = 'info_table';
$table->cellpadding = 0;
$table->cellspacing = 0;
$table->size = [];

View File

@ -60,11 +60,7 @@ if (is_management_allowed() === false) {
}
$table = new stdClass();
// $table->width = '100%';
// $table->styleTable = 'margin: 10px 10px 0';
$table->class = 'info_table m2020';
$table->class = 'info_table';
$table->head[0] = __('ID');
$table->head[1] = __('Icon');
$table->head[2] = __('Name');
@ -104,7 +100,7 @@ $table->data = [];
foreach ($osList as $os) {
$data = [];
$data[] = $os['id_os'];
$data[] = html_print_div(['class' => 'main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true);
$data[] = html_print_div(['class' => 'invert_filter main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true);
if ($is_management_allowed === true) {
if (is_metaconsole() === true) {
$osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os='.$os['id_os'];

View File

@ -2070,7 +2070,7 @@ if (is_metaconsole() === false) {
json_profile.val(JSON.stringify(data));
profile_text = `<a href="index.php?sec2=godmode/users/configure_profile&id=${profile}">${profile_text}</a>`;
group_img = `<img id="img_group_${aux}" src="" data-title="${group_text}" data-use_title_for_force_title="1" class="bot forced_title" alt="${group_text}"/>`;
group_img = `<img id="img_group_${aux}" src="" data-title="${group_text}" data-use_title_for_force_title="1" class="invert_filter main_menu_icon bot forced_title" alt="${group_text}"/>`;
group_text = `<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=${group}">${group_img}${group_text}</a>`;
$('#table_profiles tr:last').before(

View File

@ -401,7 +401,7 @@ $img = html_print_image(
true,
[
'border' => 0,
'class' => 'main_menu_icon',
'class' => 'invert_filter main_menu_icon',
]
);
@ -444,7 +444,7 @@ foreach ($profiles as $profile) {
true,
[
'title' => __('Edit'),
'class' => 'main_menu_icon',
'class' => 'invert_filter main_menu_icon',
]
).'</a>';
if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) users_is_admin() === true) {
@ -457,7 +457,7 @@ foreach ($profiles as $profile) {
true,
[
'title' => __('Delete'),
'class' => 'main_menu_icon',
'class' => 'invert_filter main_menu_icon',
]
),
],

View File

@ -407,7 +407,7 @@ $select_out = html_print_select(
true,
'',
false,
'width:100%'
'width:100%;'
);
$select_in = html_print_select(
@ -422,7 +422,7 @@ $select_in = html_print_select(
true,
'',
false,
'width:100%'
'width:100%;'
);
// Full list pages generation.

View File

@ -383,12 +383,11 @@ class SnmpConsole extends HTML
5 => __('Other'),
];
$this->tableId = 'snmp_console';
$tableId = 'snmp_console';
// Load datatables user interface.
ui_print_datatable(
[
'id' => $this->tableId,
'id' => $tableId,
'class' => 'info_table',
'style' => 'width: 100%',
'columns' => $columns,
@ -490,16 +489,25 @@ class SnmpConsole extends HTML
echo $e->getMessage();
}
echo '<div class="w98p right">';
html_print_submit_button(__('Validate'), 'updatebt', false, 'class="sub ok"');
echo '&nbsp;';
html_print_submit_button(
$buttons[] = html_print_submit_button(
__('Validate'),
'updatebt',
false,
'class="sub ok"',
true
);
$buttons[] = html_print_submit_button(
__('Delete'),
'deletebt',
false,
'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"'
'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"',
true
);
html_print_action_buttons(
implode('', $buttons),
['type' => 'form_action']
);
echo '</div>';
echo '<div class="snmp_view_div">';
echo '<h3>'.__('Status').'</h3>';

View File

@ -4231,7 +4231,7 @@ function events_page_details($event, $server_id=0)
$data = [];
$data[0] = '<div class="normal_weight mrgn_lft_20px">'.__('OS').'</div>';
$data[1] = '<div style="display:flex"><div class="main_menu_icon">'.ui_print_os_icon($agent['id_os'], false, true).'</div>';
$data[1] = '<div style="display:flex"><div class="main_menu_icon invert_filter">'.ui_print_os_icon($agent['id_os'], false, true).'</div>';
$data[1] .= get_os_name($agent['id_os']);
if (empty($agent['os_version']) === false) {
$data[1] .= ' ('.$agent['os_version'].')';

View File

@ -6731,4 +6731,19 @@ function html_print_menu_button(array $options, bool $return=false)
],
$return
);
}
function html_print_label_input_block(?string $label, $calbackFn):string
{
$output = '<div>';
if ($label !== null) {
$output .= '<label>'.$label.'</label>';
}
$output .= $calbackFn;
$output .= '</div>';
return $output;
}

View File

@ -379,7 +379,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
$messageTable->data = [];
$messageTable->data[0][0] = '<b>'.$text_title.'</b>';
$messageTable->data[0][1] = $closeButton;
$messageTable->data[1][0] = '<span style="color: #000;">'.$text_message.'</b>';
$messageTable->data[1][0] = '<span>'.$text_message.'</b>';
// JavaScript help vars.
$messageCreated = html_print_table($messageTable, true);

View File

@ -257,6 +257,7 @@ function initialiceLayout(data) {
"<h3 style='text-align: center;padding-top: 20px;'>All changes made to this widget will be lost</h3>",
cancel: "Cancel",
ok: "Ok",
size: 400,
onAccept: function() {
// Continue execution.
var nodo = event.target.offsetParent;

View File

@ -620,6 +620,7 @@ form.modal-dashboard
.select2-selection--multiple
.select2-selection__choice {
margin: 0px;
height: 100% !important;
}
.container-tabs {

View File

@ -2,6 +2,12 @@
* Discovery css global
*/
*,
::after,
::before {
box-sizing: unset !important;
}
ul.bigbuttonlist {
min-height: 200px;
}

View File

@ -58,31 +58,32 @@
}
@font-face {
font-family: "lato";
font-family: "lato-light";
src: url("../fonts/Lato-Light.woff") format("woff");
font-weight: 300;
}
@font-face {
font-family: "lato";
font-family: "lato-thin";
src: url("../fonts/Lato-Thin.woff") format("woff");
font-weight: 100;
}
@font-face {
font-family: "lato";
font-family: "lato-bold";
src: url("../fonts/Lato-Bold.woff") format("woff");
font-weight: 700;
}
@font-face {
font-family: "lato";
font-family: "lato-bolder";
src: url("../fonts/Lato-Black.woff") format("woff");
font-weight: 900;
}
/*
@font-face {
font-family: "lato";
font-family: "lato-italic";
src: url("../fonts/Lato-Italic.woff") format("woff");
font-weight: 400;
font-style: italic;
@ -115,6 +116,7 @@
font-weight: 900;
font-style: italic;
}
*/
@font-face {
font-family: "source-code";
@ -153,7 +155,7 @@ html {
}
body {
background-color: #fbfbfb;
background-color: #f6f7fb;
margin: 0 auto;
display: flex;
flex-direction: column;
@ -272,7 +274,7 @@ ul {
fieldset {
background-color: #fff;
border: 1px solid #e2e2e2;
border: 1px solid #e5e9ed;
padding: 0.5em;
margin-bottom: 20px;
position: relative;
@ -282,10 +284,7 @@ fieldset {
fieldset legend {
font-size: 1.1em;
font-weight: bold;
line-height: 20px;
color: #3f3f3f;
display: flex;
align-items: center;
padding: 0px 10px 0px 10px;
}
td input[type="checkbox"] {
@ -891,10 +890,6 @@ select:-internal-list-box {
display: flex;
}
.padding-0 {
padding: 0 !important;
}
.padding-2 {
padding: 2em;
}
@ -1071,15 +1066,11 @@ select:-internal-list-box {
}
div#page {
background: #fbfbfb;
background-image: none;
/* clear: both; */
width: auto;
/* padding-top: 5px; */
/* padding-right: 3em; */
display: flex;
flex-direction: column;
margin-top: 58px;
height: 100%;
}
body.pure {
@ -1092,17 +1083,17 @@ div#container {
text-align: left;
background: #f6f7fb;
width: 100%;
min-height: 100vh;
}
div#main {
display: flex;
/* width: 100%; */
/* margin-left: 3em; */
background-color: #f6f7fb;
padding-bottom: 3em;
position: relative;
/* margin-top: 8.8em; */
flex-direction: column;
height: 100%;
margin: 25px;
}
textarea.conf_editor {
@ -1751,15 +1742,13 @@ div.title_line {
align-items: flex-end;
justify-content: space-between;
border-bottom: 1px solid #eee;
/* width: calc(100% + 3em); */
width: -webkit-fill-available;
width: -moz-available;
padding-right: 0px;
/* margin-bottom: 20px; */
height: 53px;
box-sizing: border-box;
background-color: #fff;
/* margin-left: -3em; */
margin: -25px -25px 25px -25px;
}
/* Breadcrum */
@ -3789,7 +3778,6 @@ div.div_groups_status {
}
.databox.pies fieldset.tactical_set {
width: 100%;
min-height: 285px;
}
@ -7037,8 +7025,9 @@ div.graph div.legend table {
}
.m2020 {
margin: 20px;
margin: 20px 0;
}
.snmp_view_div {
float: left;
padding-left: 30px;
@ -10341,8 +10330,8 @@ button div.sound {
}
button div.add {
mask: url(../../images/plus.svg) no-repeat center / contain;
-webkit-mask: url(../../images/plus.svg) no-repeat center / contain;
mask: url(../../images/wizard@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/wizard@svg.svg) no-repeat center / contain;
}
button div.delete {
@ -10624,7 +10613,7 @@ tr.bring_next_field {
}
.select2-container .select2-selection--multiple {
height: 38px !important;
height: 100% !important;
padding-left: 0px !important;
}
@ -10815,6 +10804,7 @@ tr.bring_next_field {
width: -webkit-fill-available;
width: -moz-available;
padding-right: 10px;
left: 0;
}
.action_buttons_right_content {
@ -10842,7 +10832,7 @@ tr.bring_next_field {
left: 0;
top: 0;
height: 62px;
border: 1px solid #e5e9ed;
border-top: 1px solid #e5e9ed;
background-color: #fff;
/*z-index: 10000;*/
}
@ -10911,12 +10901,17 @@ pre.external_tools_output {
.fixed_filter_bar {
position: sticky;
top: 114px;
/*margin-bottom: 10px;*/
border: 1px solid #e5e9ed;
background-color: #fff;
z-index: 1;
width: -webkit-fill-available;
width: -moz-available;
margin: -25px -25px 25px -25px;
}
.white_table_graph.fixed_filter_bar {
border-radius: 0;
top: 110px;
}
/*
@ -10939,10 +10934,7 @@ pre.external_tools_output {
font-size: 10pt;
}
.fixed_filter_bar input,
.filter_table input,
.fixed_filter_bar .select2-container .select2-selection--single,
.filter_table .select2-container .select2-selection--single,
.table_modal_alternate input,
table.table_modal_alternate
span.select2

View File

@ -37,7 +37,9 @@ select,
.edit_user_comments #textarea_comments,
.discovery_textarea_input,
.selection,
button.sub {
button.sub,
.select2-container .select2-selection--single,
.select2-container .select2-selection--multiple {
background-color: #111 !important;
color: #fff !important;
}
@ -65,6 +67,14 @@ table.agent_info_table tr {
color: #fff !important;
}
div#head,
#menu_tabs {
border-bottom: 1px solid #1a1a1a;
}
#menu_full {
border-right: 1px solid #111;
}
.logo_green {
background-color: #000;
}
@ -89,6 +99,7 @@ table.agent_info_table tr {
font-size: 10pt;
}
.moduleIdBox,
input[readonly] {
background-color: #444 !important;
color: #a2a2a2 !important;
@ -175,6 +186,11 @@ input.pure_full {
background-color: #888;
}
.p-slider:before {
background-color: #fff;
box-shadow: 0px 3px 6px #494949;
border: 1px solid #222;
}
.fileupload_form,
#button-pure {
background-color: #222 !important;
@ -540,21 +556,20 @@ div#form_activate_licence #code {
#menu_tab_frame,
#menu_tab_frame_view,
#menu_tab_frame_view_bc {
/*
display: flex;
align-items: flex-end;
justify-content: space-between;
border-bottom: 2px solid #82b92e;
min-height: 50px;
width: calc(100% + 3em);
*/
border-bottom: 1px solid #82b92e;
/*
width: 100%;
padding-right: 0px;
margin-bottom: 20px;
height: 50px;
height: 53px;
box-sizing: border-box;
*/
background-color: #111 !important;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
box-shadow: 1px 1px 4px rgba(160, 160, 160, 0.514);
margin-left: -3em;
}
.info_box {
@ -661,6 +676,8 @@ div#main_pure {
position: static;
}
div#main,
div#container,
body.pure {
background-color: #111;
}
@ -1007,6 +1024,7 @@ fieldset {
input,
textarea,
select,
.moduleIdBox,
.selection {
border-color: #707070;
}
@ -1024,6 +1042,9 @@ select,
color: #fff !important;
}
.white_table_graph {
background-color: #222 !important;
}
table.databox {
border-color: #707070;
background-color: #222 !important;
@ -1143,6 +1164,13 @@ a.pandora_pagination,
border: 1px solid #707070 !important;
}
a.pandora_pagination {
background-color: #111;
}
a.pandora_pagination:hover {
background-color: #555 !important;
}
.dt-button.buttons-csv.buttons-html5 {
filter: invert(100%);
background-color: transparent;
@ -1299,3 +1327,58 @@ p.trademark-copyright {
height: 80%;
overflow: auto;
}
.action_buttons_background_mask {
background-color: #222;
border-top: 1px solid #82b92e;
}
button.buttonButton,
button.submitButton {
box-shadow: 0px 3px 6px #111;
}
button.buttonButton.secondary,
button.submitButton.secondary {
background-color: #999;
color: #fff;
border-color: #fff;
}
button.buttonButton.secondary:hover,
button.submitButton.secondary:hover {
color: #ddd !important;
border-color: #ddd !important;
}
button.buttonButton.secondary > div,
button.submitButton.secondary > div {
background-color: #fff !important;
}
button.buttonButton.secondary:hover > div,
button.submitButton.secondary:hover > div {
background-color: #ddd !important;
}
.fixed_filter_bar {
background-color: #222;
}
.section_table_title_line {
background-color: #008d86;
}
.section_table_title {
color: #008d86;
}
select[multiple] option:checked,
select[multiple] option:active {
background: #008d86;
}
.select2-results
> .select2-results__options
> .select2-results__option.select2-results__option--highlighted {
background-color: #008d86;
}

View File

@ -12,7 +12,7 @@
height: 28px;
user-select: none;
-webkit-user-select: none;
color: white;
color: white !important;
}
.select2-container .select2-selection--single .select2-selection__rendered {
display: block;
@ -21,9 +21,12 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: white;
color: white !important;
text-align: left;
}
.select2-container--default>.selection>.select2-selection--single {
border-color: #707070 !important;
}
.select2-container .select2-selection--single .select2-selection__clear {
position: relative;
}

View File

@ -94,27 +94,13 @@
border-spacing: 0;
overflow: hidden;
border-radius: 5px;
border: 1px solid #c0ccdc;
border: 1px solid #e5e9ed;
width: -webkit-fill-available;
width: -moz-available;
margin-bottom: 50px;
margin: 15px;
}
.info_table > tbody > tr:nth-child(even) {
/*background-color: #f5f5f5;*/
background-color: #f6f7fb;
}
/*.info_table tr > td,
.info_table tr > th,
.filter_table tr > td,
.filter_table tr > th {
border-bottom: 1px solid #C0CCDC;
}*/
.info_table > tbody > tr > th,
.info_table > thead > tr > th {
/*border-top: 1px solid #c0ccdc;*/
background-color: #e5e9ed;
}
.info_table tr > td:first-child,
@ -145,8 +131,14 @@
cursor: pointer;
}
.info_table tr th {
.info_table > thead > tr > th,
.info_table > thead > tr > th * {
/*border-bottom: 1px solid #e2e2e2;*/
font-family: "lato-bolder";
font-style: normal;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.info_table > thead > tr {
@ -159,7 +151,6 @@
.info_table > thead > tr * {
font-size: 12px;
font-weight: bold;
line-height: 23px;
}
@ -185,20 +176,13 @@
.info_table > thead > tr > th a,
.info_table > thead > tr > th > span {
padding: 0.1em;
font-weight: normal;
color: #000;
/*margin-left: 0.5em;*/
}
.info_table > tbody > tr:last-child {
/*border-bottom: 1px solid #e2e2e2;*/
border-top: 0;
/*border-bottom: 1px solid #c0ccdc;*/
/*
border-left: 1px solid #c0ccdc;
border-right: 1px solid #c0ccdc;
*/
.info_table > tbody > tr:last-child > td {
border-bottom: 0;
}
.info_table > tbody > tr > th,
.info_table > thead > tr > th,
.info_table > tbody > tr > td {
@ -536,3 +520,18 @@ a.pandora_pagination.current:hover {
.datatable_form {
margin: 0 1em;
}
table.nueva-clase td > div {
display: flex;
flex-direction: column;
justify-content: center;
align-items: normal;
}
table.nueva-clase td > div label {
color: #161628;
font-size: 13px;
line-height: 16px;
text-align: left;
margin-bottom: 10px;
}

View File

@ -0,0 +1,16 @@
.white-box-content {
padding: 0px;
border-radius: 5px;
}
.white-box-content table {
border: 0;
}
table.databox {
padding: 5px;
}
.info_table.no-td-borders > tbody > tr > td {
border: 0px;
}

View File

@ -231,25 +231,79 @@ $searchForm = '';
$searchForm .= '<form method="post" action="?sec=view&sec2=operation/agentes/estado_agente&group_id='.$group_id.'">';
$table = new stdClass();
$table->style[0] = 'width: 15%';
$table->style[2] = 'width: 15%';
$table->class[0] = 'databox filters bolder';
$table->width = '100%';
$table->class = 'nueva-clase';
$table->data['group'][0] = __('Group');
$table->data['group'][1] = html_print_select_groups(false, $access, true, 'group_id', $group_id, 'this.form.submit()', '', '', true, false, true, '', false);
$table->data['group'][0] = '<div>';
$table->data['group'][0] .= '<label>'.__('Group').'</label>';
$table->data['group'][0] .= html_print_select_groups(
false,
$access,
true,
'group_id',
$group_id,
'this.form.submit()',
'',
'',
true,
false,
true,
'',
false
);
$table->data['group'][0] .= '</div>';
$table->data['group'][2] = __('Recursion');
$table->data['group'][3] = html_print_checkbox_switch('recursion', 1, $recursion, true);
$table->data['group'][1] = '<div>';
$table->data['group'][1] .= '<label>'.__('Recursion').'</label>';
$table->data['group'][1] .= html_print_checkbox_switch(
'recursion',
1,
$recursion,
true
);
$table->data['group'][1] .= '</div>';
$table->data['status'][0] = __('Status');
$table->data['status'][1] = html_print_select($fields, 'status', $status, 'this.form.submit()', __('All'), AGENT_STATUS_ALL, true, false, true, '', false, 'width: 90px;');
$table->data['group'][2] = html_print_label_input_block(
__('Status'),
html_print_select(
$fields,
'status',
$status,
'this.form.submit()',
__('All'),
AGENT_STATUS_ALL,
true,
false,
true,
'',
false
)
);
$table->data['search_fields'][0] = __('Search');
$table->data['search_fields'][1] = html_print_input_text('search', $search, '', 35, 255, true);
$table->data['search_fields'][0] = html_print_label_input_block(
__('Search'),
html_print_input_text(
'search',
$search,
'',
35,
255,
true
)
);
$table->data['search_fields'][1] = html_print_label_input_block(
__('Search in custom fields'),
html_print_input_text(
'search_custom',
$search_custom,
'',
35,
255,
true
)
);
$table->data['search_fields'][2] = __('Search in custom fields');
$table->data['search_fields'][3] = html_print_input_text('search_custom', $search_custom, '', 35, 255, true);
// $table->colspan['search_fields'][3] = '2';
$searchForm .= html_print_table($table, true);
$searchForm .= html_print_div(
[
@ -267,13 +321,18 @@ $searchForm .= html_print_div(
],
true
);
$searchForm .= '</form>';
ui_toggle(
$searchForm,
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form'
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
if (empty($search) === false) {
@ -708,7 +767,6 @@ $tableAgents = new stdClass();
$tableAgents->cellpadding = 0;
$tableAgents->cellspacing = 0;
$tableAgents->id = 'agent_list';
$tableAgents->styleTable = 'margin: 0 10px';
$tableAgents->class = 'info_table tactical_table';
$tableAgents->head = [];
@ -888,7 +946,7 @@ foreach ($agents as $agent) {
$data[2] = html_print_div(
[
'class' => 'main_menu_icon',
'class' => 'invert_filter main_menu_icon',
'content' => ui_print_os_icon($agent['id_os'], false, true),
],
true
@ -903,7 +961,10 @@ foreach ($agents as $agent) {
true,
'groups_small',
'',
false
false,
false,
false,
'invert_filter main_menu_icon'
);
$data[4] .= '</a>';
$agent['not_init_count'] = $agent['notinit_count'];

View File

@ -172,7 +172,12 @@ function print_filters($sec)
$filters,
__('Interface filter'),
__('Interface filter'),
'ui_toggle_if_filter'
'ui_toggle_if_filter',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
unset($table);

View File

@ -983,7 +983,17 @@ $tableFilter->data[4][2] = html_print_submit_button(
$filters = '<form method="post" action="index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
$filters .= html_print_table($tableFilter, true);
$filters .= '</form>';
ui_toggle($filters, '<span class="subsection_header_title">'.__('Filters').'</span>');
ui_toggle(
$filters,
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
unset($table);
// End Build Search Form.

View File

@ -46,6 +46,8 @@ if (! check_acl($config['id_user'], 0, 'AR') && ! check_acl($config['id_user'],
return;
}
ui_require_css_file('tactical');
$is_admin = check_acl($config['id_user'], 0, 'PM');
$user_strict = (bool) db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
@ -258,13 +260,13 @@ if ($is_admin) {
include $config['homedir'].'/godmode/servers/servers.build_table.php';
}
$out = '<table cellpadding=0 cellspacing=0 class="databox pies mrgn_top_15px" width=100%><tr><td style="width:50%;">';
$out .= '<fieldset class="padding-0 databox tactical_set" id="total_event_graph">';
$out = '<table cellpadding=0 cellspacing=0 class="databox pies" width=100%><tr><td style="width:50%;">';
$out .= '<fieldset class="databox tactical_set" id="total_event_graph">';
$out .= '<legend>'.__('Event graph').'</legend>';
$out .= html_print_image('images/spinner.gif', true, ['id' => 'spinner_total_event_graph']);
$out .= '</fieldset>';
$out .= '</td><td style="width:50%;">';
$out .= '<fieldset class="padding-0 databox tactical_set" id="graphic_event_group">
$out .= '<fieldset class="databox tactical_set" id="graphic_event_group">
<legend>'.__('Event graph by agent').'</legend>'.html_print_image('images/spinner.gif', true, ['id' => 'spinner_graphic_event_group']).'</fieldset>';
$out .= '</td></tr></table>';

View File

@ -301,9 +301,9 @@ if (is_metaconsole() === true) {
false,
true,
false,
'box-flat agent_details_col',
'',
'white-box-content',
'mrgn_lft_20px mrgn_right_20px width_available'
'box-flat white_table_graph fixed_filter_bar'
);
}