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

fixed styles

This commit is contained in:
daniel 2023-03-21 14:06:28 +01:00
parent 1f7183c701
commit 64fc4bcd46
6 changed files with 47 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -679,7 +679,7 @@ foreach ($simple_alerts as $alert) {
true, true,
[ [
'id' => 'template-details-'.$alert['id_alert_template'], 'id' => 'template-details-'.$alert['id_alert_template'],
'class' => 'img_help action_button_img invert_filter', 'class' => 'img_help main_menu_icon invert_filter',
] ]
); );
$data[2] .= '</a> '; $data[2] .= '</a> ';
@ -757,7 +757,7 @@ foreach ($simple_alerts as $alert) {
true, true,
[ [
'title' => __('Delete action'), 'title' => __('Delete action'),
'class' => 'action_button_img invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
); );
$data[3] .= html_print_input_hidden('delete_action', 1, true); $data[3] .= html_print_input_hidden('delete_action', 1, true);
@ -772,7 +772,7 @@ foreach ($simple_alerts as $alert) {
true, true,
[ [
'title' => __('Update action'), 'title' => __('Update action'),
'class' => 'action_button_img invert_filter', 'class' => 'main_menu_icon invert_filter',
'onclick' => 'show_display_update_action(\''.$action['id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action_id.'\',\''.$alert['id_agent_module'].'\')', 'onclick' => 'show_display_update_action(\''.$action['id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action_id.'\',\''.$alert['id_agent_module'].'\')',
] ]
); );

4
pandora_console/include/class/SatelliteAgent.class.php
View File

@ -393,7 +393,7 @@ class SatelliteAgent extends HTML
true, true,
[ [
'border' => '0', 'border' => '0',
'class' => 'action_button_img mrgn_lft_05em invert_filter', 'class' => 'main_menu_icon mrgn_lft_05em invert_filter',
'onclick' => 'disable_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $disable.'\',\''.$id_agente.'\')', 'onclick' => 'disable_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $disable.'\',\''.$id_agente.'\')',
] ]
); );
@ -405,7 +405,7 @@ class SatelliteAgent extends HTML
true, true,
[ [
'border' => '0', 'border' => '0',
'class' => 'action_button_img mrgn_lft_05em invert_filter', 'class' => 'main_menu_icon mrgn_lft_05em invert_filter',
'onclick' => 'delete_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $delete.'\',\''.$id_agente.'\')', 'onclick' => 'delete_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $delete.'\',\''.$id_agente.'\')',
] ]
); );

57
pandora_console/include/functions_reporting_html.php
View File

@ -6002,6 +6002,7 @@ function reporting_get_last_activity()
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->data = []; $table->data = [];
$table->class = 'info_table';
$table->size = []; $table->size = [];
$table->size[2] = '150px'; $table->size[2] = '150px';
$table->size[3] = '130px'; $table->size[3] = '130px';
@ -6015,37 +6016,13 @@ function reporting_get_last_activity()
$table->head[5] = __('Comments'); $table->head[5] = __('Comments');
$table->title = '<span>'.__('Last activity in %s console', get_product_name()).'</span>'; $table->title = '<span>'.__('Last activity in %s console', get_product_name()).'</span>';
switch ($config['dbtype']) { $sql = sprintf(
case 'mysql': 'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
$sql = sprintf( FROM tsesion
'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.")
FROM tsesion AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") $config['id_user']
AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5", );
$config['id_user']
);
break;
case 'postgresql':
$sql = sprintf(
"SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp
FROM tsesion
WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_1WEEK.")
AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 5",
$config['id_user']
);
break;
case 'oracle':
$sql = sprintf(
"SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp
FROM tsesion
WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_1WEEK.")
AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC",
$config['id_user']
);
break;
}
$sessions = db_get_all_rows_sql($sql); $sessions = db_get_all_rows_sql($sql);
@ -6056,18 +6033,8 @@ function reporting_get_last_activity()
foreach ($sessions as $session) { foreach ($sessions as $session) {
$data = []; $data = [];
switch ($config['dbtype']) { $session_id_usuario = $session['id_usuario'];
case 'mysql': $session_ip_origen = $session['ip_origen'];
case 'oracle':
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
break;
case 'postgresql':
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
break;
}
$data[0] = '<strong>'.$session_id_usuario.'</strong>'; $data[0] = '<strong>'.$session_id_usuario.'</strong>';
$data[1] = ui_print_session_action_icon($session['accion'], true); $data[1] = ui_print_session_action_icon($session['accion'], true);
@ -6079,10 +6046,6 @@ function reporting_get_last_activity()
array_push($table->data, $data); array_push($table->data, $data);
} }
if (defined('METACONSOLE')) {
$table->class = 'databox_tactical';
}
return html_print_table($table, true); return html_print_table($table, true);
} }

48
pandora_console/include/functions_ui.php
View File

@ -5020,30 +5020,22 @@ function ui_print_standard_header(
$applyBreadcrumbs, $applyBreadcrumbs,
true true
); );
// Create the header.
// if (is_metaconsole() === true) { $output = ui_print_page_header(
// $output = ui_meta_print_header( $title,
// $title, $icon,
// false, true,
// $options $help,
// ); $godmode,
// } else { $options,
$output = ui_print_page_header( false,
$title, '',
$icon, GENERIC_SIZE_TEXT,
true, '',
$help, $headerInformation->printHeader(true),
$godmode, false,
$options, $fav_menu_config
false, );
'',
GENERIC_SIZE_TEXT,
'',
$headerInformation->printHeader(true),
false,
$fav_menu_config
);
// }
if ($return !== true) { if ($return !== true) {
echo $output; echo $output;
} else { } else {
@ -7327,9 +7319,6 @@ function ui_get_inventory_module_add_form(
$table->rowstyle = []; $table->rowstyle = [];
$table->rowstyle['hidden-custom-field-row'] = 'display: none;'; $table->rowstyle['hidden-custom-field-row'] = 'display: none;';
$table->rowstyle['custom-fields-button'] = 'display: none;'; $table->rowstyle['custom-fields-button'] = 'display: none;';
// $table->colspan = [];
// $table->colspan['custom-fields-row'] = [];
// $table->colspan['custom-fields-row']['custom-fields-column'] = 2;
$table->data = []; $table->data = [];
$row = []; $row = [];
@ -7593,13 +7582,10 @@ function ui_get_inventory_module_add_form(
ob_start(); ob_start();
echo '<form name="modulo" method="post" action="'.$form_action.'" class="max_floating_element_size">'; echo '<form id="policy_inventory_module_edit_form" name="modulo" method="post" action="'.$form_action.'" class="max_floating_element_size">';
echo html_print_table($table); echo html_print_table($table);
echo '<div class="action-buttons w100p">';
echo $form_buttons; echo $form_buttons;
echo '</div>';
echo '</form>'; echo '</form>';
?> ?>
<script type="text/javascript"> <script type="text/javascript">

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

@ -707,6 +707,10 @@ select:-internal-list-box {
width: 60%; width: 60%;
} }
.w67p {
width: 67%;
}
.w70p { .w70p {
width: 70%; width: 70%;
} }
@ -970,6 +974,10 @@ select:-internal-list-box {
padding-left: 2em !important; padding-left: 2em !important;
} }
.padding10 {
padding: 10px;
}
.margin-soft { .margin-soft {
margin: 0.3em 1em; margin: 0.3em 1em;
} }
@ -11720,3 +11728,8 @@ div.relative > div > div#ui-datepicker-div {
top: 55px !important; top: 55px !important;
left: 5px !important; left: 5px !important;
} }
.ui-widget-overlay {
background: #aaa;
opacity: 0.3 !important;
}

4
pandora_console/update_manager_client/views/register.php
View File

@ -85,7 +85,7 @@ $product_name = get_product_name(); ?>
__('Cancel'), __('Cancel'),
'cancel_registration', 'cancel_registration',
false, false,
'class="lato ui-widget 'id="submit-cancel_registration" class="lato ui-widget
ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"', ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
true true
); );
@ -97,7 +97,7 @@ $product_name = get_product_name(); ?>
__('OK!'), __('OK!'),
'register', 'register',
false, false,
'class="lato ui-widget 'id="submit-register" class="lato ui-widget
ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"', ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
true true
); );