diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 2d070944db..46ead7da19 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -35,6 +35,7 @@ enterprise_include_once('include/functions_modules.php'); require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_cron.php'; ui_require_javascript_file('encode_decode_base64'); +ui_require_css_file('agent_manager'); check_login(); diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index c94fa7500d..8cfb587eb2 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1146,7 +1146,7 @@ function events_print_event_table( $data[5] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']); // Status. - $data[6] = ui_print_event_priority($event['criticity'], true); + $data[6] = ui_print_event_type($event['event_type'], true); /* $class = get_priority_class($event['criticity']); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 006ef0a8d0..05e93df661 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2748,14 +2748,90 @@ function ui_progress( } +/** + * Returns a div wich represents the type received. + * + * Requires ui_require_css_file('events');. + * + * @param integer $type Event type. + * @param boolean $return Or print. + * @param boolean $mini Show mini div. + * + * @return string HTML. + */ +function ui_print_event_type( + $type, + $return=false, + $mini=false +) { + global $config; + + $output = ''; + switch ($type) { + case EVENTS_ALERT_FIRED: + case EVENTS_ALERT_RECOVERED: + case EVENTS_ALERT_CEASED: + case EVENTS_ALERT_MANUAL_VALIDATION: + $text = __('ALERT'); + $color = COL_ALERTFIRED; + break; + + case EVENTS_RECON_HOST_DETECTED: + case EVENTS_SYSTEM: + case EVENTS_ERROR: + case EVENTS_NEW_AGENT: + case EVENTS_CONFIGURATION_CHANGE: + $text = __('SYSTEM'); + $color = COL_MAINTENANCE; + break; + + case EVENTS_GOING_UP_WARNING: + case EVENTS_GOING_DOWN_WARNING: + $color = COL_WARNING; + $text = __('WARNING'); + break; + + case EVENTS_GOING_DOWN_NORMAL: + case EVENTS_GOING_UP_NORMAL: + $color = COL_NORMAL; + $text = __('NORMAL'); + break; + + case EVENTS_GOING_DOWN_CRITICAL: + case EVENTS_GOING_UP_CRITICAL: + $color = COL_CRITICAL; + $text = __('CRITICAL'); + break; + + case EVENTS_UNKNOWN: + case EVENTS_GOING_UNKNOWN: + default: + $color = COL_UNKNOWN; + $text = __('UNKNOWN'); + break; + } + + if ($mini === false) { + $output = '
'; + $output .= $text; + $output .= '
'; + } else { + $output = '
'; + $output .= '
'; + } + + return $output; +} + + /** * Returns a div wich represents the priority received. * * Requires ui_require_css_file('events');. * - * @param integer $priority priority level. + * @param integer $priority Priority level. * @param boolean $return Or print. - * @param boolean $min Show mini div. + * @param boolean $mini Show mini div. * * @return string HTML. */ diff --git a/pandora_console/include/styles/agent_manager.css b/pandora_console/include/styles/agent_manager.css new file mode 100644 index 0000000000..fc648aefba --- /dev/null +++ b/pandora_console/include/styles/agent_manager.css @@ -0,0 +1,158 @@ +/* + * --------------------------------------------------------------------- + * - Create/Update Agent - agent_manager.php + * --------------------------------------------------------------------- + */ +.agent_options { + width: 100%; + margin-right: 0px; + display: flex; + flex-flow: row wrap; + flex-direction: row; + justify-content: space-between; + box-sizing: border-box; +} + +.agent_options_update { + width: 85%; + margin-right: 20px; +} + +.agent_options_column_left, +.agent_options_column_right { + width: 50%; + box-sizing: border-box; +} + +.agent_options_column_left { + padding-right: 50px; +} + +.agent_qr { + width: 15%; + text-align: center; + box-sizing: border-box; + padding: 20px 0px; + display: flex; + justify-content: center; + flex-direction: column; + min-width: 150px; +} + +a#qr_code_agent_view { + margin-top: 5px; +} + +.first_row .agent_options_column_right select, +.first_row .agent_options_column_right input, +.first_row .agent_options_column_left select#grupo { + width: 95%; + box-sizing: border-box; +} + +.first_row .agent_options_column_left .p-switch { + margin-right: 5px; + margin-left: 10px; +} + +.agent_options_column_left input#text-direccion, +.agent_options_column_left select#address_list, +.agent_options_column_left input#text-agente, +.agent_options_column_left input#text-alias { + width: 100%; + box-sizing: border-box; +} + +.agent_options_agent_name > * { + margin-left: 5px; +} + +.custom_fields_table { + border-spacing: 0px; +} + +.custom_fields_table tr.datos { + background-color: #f7f7f7; + display: none; +} + +.custom_fields_table tr.datos2 { + cursor: pointer; +} + +.custom_fields_table tr td { + border: 1px solid #e0e0e0; +} + +.custom_fields_table tr.datos2 td div.field_title { + padding: 10px; +} + +.custom_fields_table tr.datos2 td { + border-radius: 4px; + padding: 0px; +} + +.custom_fields_table tr.datos td { + padding: 15px 10px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + +.custom_fields_table .custom_field_row_opened td { + border-bottom-left-radius: 0px !important; + border-bottom-right-radius: 0px !important; +} + +.secondary_groups_select { + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 15px; +} + +.secondary_groups_select .secondary_groups_select_arrows input { + display: grid; + margin: 0 auto; +} + +.secondary_groups_select .secondary_groups_list_left { + text-align: right; + width: 50%; +} + +.secondary_groups_select .secondary_groups_list_right { + text-align: left; + width: 50%; +} + +.secondary_groups_select .secondary_groups_select_arrows { + padding: 0 50px; +} + +.secondary_groups_select_arrows a { + display: block; +} + +.agent_options_adv .agent_options_column_right .label_select select, +.agent_options_adv .agent_options_column_right .label_select input[type="text"], +.agent_options_adv #text-custom_id, +.agent_options_adv #cps { + width: 100%; + box-sizing: border-box; +} + +.agent_options_adv .label_select_simple.label_simple_one_item .p-switch { + margin-right: 5px; +} + +.agent_description { + min-height: 4.8em !important; +} +.agent_custom_id { + padding-bottom: 0.7em; + padding-top: 0.5em; + display: inline-block; + border-radius: 5px !important; + border: 1px solid #ccc; +} diff --git a/pandora_console/include/styles/agent_view.css b/pandora_console/include/styles/agent_view.css new file mode 100644 index 0000000000..713ff5ad7f --- /dev/null +++ b/pandora_console/include/styles/agent_view.css @@ -0,0 +1,7 @@ +text.text-tooltip { + font-family: "lato-bolder", "Open Sans", sans-serif !important; +} + +div#bullets_modules span { + font-family: "lato-bolder", "Open Sans", sans-serif !important; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 8582484509..320c4289ef 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -5660,165 +5660,6 @@ table.info_table.policy_sub_table { margin-bottom: 4px; } -/* - * --------------------------------------------------------------------- - * - Create/Update Agent - agent_manager.php - * --------------------------------------------------------------------- - */ -.agent_options { - width: 100%; - margin-right: 0px; - display: flex; - flex-flow: row wrap; - flex-direction: row; - justify-content: space-between; - box-sizing: border-box; -} - -.agent_options_update { - width: 85%; - margin-right: 20px; -} - -.agent_options_column_left, -.agent_options_column_right { - width: 50%; - box-sizing: border-box; -} - -.agent_options_column_left { - padding-right: 50px; -} - -.agent_qr { - width: 15%; - text-align: center; - box-sizing: border-box; - padding: 20px 0px; - display: flex; - justify-content: center; - flex-direction: column; - min-width: 150px; -} - -a#qr_code_agent_view { - margin-top: 5px; -} - -.first_row .agent_options_column_right select, -.first_row .agent_options_column_right input, -.first_row .agent_options_column_left select#grupo { - width: 95%; - box-sizing: border-box; -} - -.first_row .agent_options_column_left .p-switch { - margin-right: 5px; - margin-left: 10px; -} - -.agent_options_column_left input#text-direccion, -.agent_options_column_left select#address_list, -.agent_options_column_left input#text-agente, -.agent_options_column_left input#text-alias { - width: 100%; - box-sizing: border-box; -} - -.agent_options_agent_name > * { - margin-left: 5px; -} - -.custom_fields_table { - border-spacing: 0px; -} - -.custom_fields_table tr.datos { - background-color: #f7f7f7; - display: none; -} - -.custom_fields_table tr.datos2 { - cursor: pointer; -} - -.custom_fields_table tr td { - border: 1px solid #e0e0e0; -} - -.custom_fields_table tr.datos2 td div.field_title { - padding: 10px; -} - -.custom_fields_table tr.datos2 td { - border-radius: 4px; - padding: 0px; -} - -.custom_fields_table tr.datos td { - padding: 15px 10px; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; -} - -.custom_fields_table .custom_field_row_opened td { - border-bottom-left-radius: 0px !important; - border-bottom-right-radius: 0px !important; -} - -.secondary_groups_select { - display: flex; - align-items: center; - justify-content: center; - margin-bottom: 15px; -} - -.secondary_groups_select .secondary_groups_select_arrows input { - display: grid; - margin: 0 auto; -} - -.secondary_groups_select .secondary_groups_list_left { - text-align: right; - width: 50%; -} - -.secondary_groups_select .secondary_groups_list_right { - text-align: left; - width: 50%; -} - -.secondary_groups_select .secondary_groups_select_arrows { - padding: 0 50px; -} - -.secondary_groups_select_arrows a { - display: block; -} - -.agent_options_adv .agent_options_column_right .label_select select, -.agent_options_adv .agent_options_column_right .label_select input[type="text"], -.agent_options_adv #text-custom_id, -.agent_options_adv #cps { - width: 100%; - box-sizing: border-box; -} - -.agent_options_adv .label_select_simple.label_simple_one_item .p-switch { - margin-right: 5px; -} - -.agent_description { - min-height: 4.8em !important; -} -.agent_custom_id { - padding-bottom: 0.7em; - padding-top: 0.5em; - display: inline-block; - border-radius: 5px !important; - border: 1px solid #ccc; -} - /* * --------------------------------------------------------------------- * - CLASSES FOR THE NEW TOGGLES - diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index de8a5e6c79..7aa48d3006 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -82,6 +82,7 @@ if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR') return; } + /* * START: TABLE AGENT BUILD. */ diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 12ebe35082..557f9d78b6 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -37,6 +37,7 @@ require_once $config['homedir'].'/include/functions_users.php'; enterprise_include_once('include/functions_metaconsole.php'); ui_require_javascript_file('openlayers.pandora'); +ui_require_css_file('agent_view'); enterprise_include_once('operation/agentes/ver_agente.php');