diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php index 904c2f8f51..b6177a1b0b 100644 --- a/pandora_console/extensions/module_groups.php +++ b/pandora_console/extensions/module_groups.php @@ -167,7 +167,9 @@ function mainModuleGroups() { ui_print_page_header (__("Combined table of agent group and module group"), "images/module_group.png", false, "", false, ''); - echo "

" . __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") . "

"; + echo "

" . + __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") . + "

"; $agentGroups = users_get_groups ($config['id_user'], "AR", false); @@ -187,7 +189,7 @@ function mainModuleGroups() { $table = null; $table->align[0] = 'right'; //Align to right the first column. $table->style[0] = 'color: #ffffff; '. - 'background-color: #778866; font-weight: bolder;'; + 'background-color: #373737; font-weight: bolder; padding-right: 10px;'; $table->head = $head; $table->width = '98%'; diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php index 917844c649..b7569a0250 100644 --- a/pandora_console/general/login_help_dialog.php +++ b/pandora_console/general/login_help_dialog.php @@ -38,53 +38,49 @@ if (is_ajax()) { echo '
'; - echo '
'; - echo '' . - __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora!') . ''; + echo '
'; + echo __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora FMS!'); echo '
'; - echo '
'; + echo '
'; echo ''; echo ''; - echo ''; + + echo ''; + echo ''; - echo ''; - echo ''; - echo ''; + echo ''; echo ''; echo '
'; - echo ''; - echo '
'; - echo '' . __('Online help') . ''; - echo '
'; + echo '		'; + echo '' . + html_print_image('images/online_help.png', true, + array("alt" => __('Online help'), "border" => 0)) . ''; + echo '
'; + echo '' . __('Online help') . ''; echo '		'; + echo '' . + html_print_image('images/enterprise_version.png', true, + array("alt" => __('Enterprise version'), "border" => 0)) . ''; + echo '
'; + echo '' . __('Enterprise version') . ''; + echo '		'; - echo ''; - echo ''; - echo '
'; - echo ''; - echo '
'; - echo '' . __('Enterprise version') . ''; - echo '
'; + echo '' . + html_print_image('images/support.png', true, + array("alt" => __('Support'), "border" => 0)) . ''; + echo '
'; + echo '' . __('Support') . ' / ' . __('Forums') . ''; echo '		'; - echo ''; - echo '
'; - echo '' . __('Documentation') . ''; - echo '
'; + echo '' . + html_print_image('images/documentation.png', true, + array("alt" => __('Documentation'), "border" => 0)) . ''; + echo '
'; + echo '' . __('Documentation') . ''; echo '
'; echo '
'; - echo '
'; + echo '
'; echo '
'; html_print_checkbox('skip_login_help', 1, false, false, false, 'cursor: \'pointer\''); echo ' ' .__("Click here to don't show again this message") . ''; @@ -106,7 +102,7 @@ $(document).ready (function () { resizable: true, draggable: true, modal: true, - height: 450, + height: 350, width: 630, overlay: { opacity: 0.5, diff --git a/pandora_console/images/close_button_dialog.png b/pandora_console/images/close_button_dialog.png new file mode 100644 index 0000000000..a2722e0c0a Binary files /dev/null and b/pandora_console/images/close_button_dialog.png differ diff --git a/pandora_console/images/documentation.png b/pandora_console/images/documentation.png index 03fbc917d6..0c870be4c5 100644 Binary files a/pandora_console/images/documentation.png and b/pandora_console/images/documentation.png differ diff --git a/pandora_console/images/enterprise_version.png b/pandora_console/images/enterprise_version.png index 578c1e7cde..8a17e051da 100644 Binary files a/pandora_console/images/enterprise_version.png and b/pandora_console/images/enterprise_version.png differ diff --git a/pandora_console/images/error_login.png b/pandora_console/images/error_login.png index 2678b61528..60c563d31c 100644 Binary files a/pandora_console/images/error_login.png and b/pandora_console/images/error_login.png differ diff --git a/pandora_console/images/online_help.png b/pandora_console/images/online_help.png index bcb2206368..0b600a1506 100644 Binary files a/pandora_console/images/online_help.png and b/pandora_console/images/online_help.png differ diff --git a/pandora_console/images/support.png b/pandora_console/images/support.png index d70c63a967..891ba31fee 100644 Binary files a/pandora_console/images/support.png and b/pandora_console/images/support.png differ diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index dd5e2bf49a..3a62e68bb8 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -290,7 +290,7 @@ if ($get_extended_event) { } // Tabs - $tabs = "
    "; + $tabs = "
      "; $tabs .= "
    • ".html_print_image('images/lightning_go.png',true).__('General')."
      • "; $tabs .= "
    • ".html_print_image('images/zoom.png',true).__('Details')."
      • "; $tabs .= "
    • ".html_print_image('images/custom_field_col.png',true).__('Agent fields')."
      • "; @@ -349,13 +349,13 @@ if ($get_extended_event) { } $details = events_page_details($event, $server); - + // Juanma (09/05/2014) Fix: Needs to reconnect to node, in previous funct node connection was lost if ($meta) { $server = metaconsole_get_connection_by_id ($server_id); - metaconsole_connect($server); + metaconsole_connect($server); } - + $custom_fields = events_page_custom_fields($event); $custom_data = events_page_custom_data($event); @@ -434,8 +434,8 @@ if ($get_events_details) { $out = ''; $out .= ''; - foreach($events as $event) { - switch($event["estado"]) { + foreach ($events as $event) { + switch ($event["estado"]) { case 0: $img = ui_get_full_url("images/star.png", false, false, false); $title = __('New event'); diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 98144a7157..d3bc9437c5 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -119,8 +119,8 @@ switch ($config["dbtype"]) { /* Color constants */ -define('COL_CRITICAL','#FF4040'); -define('COL_WARNING','#F2D400'); +define('COL_CRITICAL','#f85858'); +define('COL_WARNING','#ffea59'); define('COL_WARNING_DARK','#FFB900'); define('COL_NORMAL','#6EB432'); define('COL_NOTINIT','#3BA0FF'); diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 49052a6dd0..e425c603ea 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1521,12 +1521,14 @@ function events_page_responses ($event) { // Responses ///////// + $table_responses->cellspacing = 2; + $table_responses->cellpadding = 2; $table_responses->id = 'responses_table'; $table_responses->width = '100%'; $table_responses->data = array (); $table_responses->head = array (); - $table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left;'; - $table_responses->style[1] = 'text-align: left;'; + $table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;'; + $table_responses->style[1] = 'text-align: left; height: 23px; text-align: right;'; $table_responses->class = "alternate rounded_cells"; if (tags_check_acl ($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags'])) { @@ -1541,7 +1543,7 @@ function events_page_responses ($event) { // Juanma (05/05/2014) Fix : Propagate ACL hell! $_user_groups = array_keys(users_get_groups($config['id_user'], 'ER', users_can_manage_group_all())); $users = groups_get_users($_user_groups, array('id_perfil' => $profiles_view_events), true, true); - + foreach($users as $u) { $owners[$u['id_user']] = $u['fullname']; } @@ -1586,9 +1588,9 @@ function events_page_responses ($event) { $status = array(1 => __('Validated')); break; } - + } - + // The change status option will be enabled only when is possible change the status $data[1] = html_print_select($status, 'estado', $event['estado'], '', '', 0, true, false, false, '', $status_blocked); @@ -1621,22 +1623,24 @@ function events_page_responses ($event) { // Custom responses $data = array(); $data[0] = __('Custom responses'); - + $id_groups = array_keys(users_get_groups(false, "EW")); $event_responses = db_get_all_rows_filter('tevent_response', array('id_group' => $id_groups)); - - if(empty($event_responses)) { + + if (empty($event_responses)) { $data[1] = ''.__('N/A').''; } else { $responses = array(); - foreach($event_responses as $v) { + foreach ($event_responses as $v) { $responses[$v['id']] = $v['name']; } - $data[1] = html_print_select($responses,'select_custom_response','','','','',true, false, false); + $data[1] = html_print_select( + $responses, + 'select_custom_response','','','','',true, false, false); - if(isset($event['server_id'])) { + if (isset($event['server_id'])) { $server_id = $event['server_id']; } else { @@ -1648,6 +1652,7 @@ function events_page_responses ($event) { $table_responses->data[] = $data; + $responses_js = ""; - $responses = '
      '.html_print_table($table_responses, true).$responses_js.'
      '; + $responses = '
      ' . + html_print_table($table_responses, true) . + $responses_js . + '
      '; return $responses; } @@ -1733,11 +1743,13 @@ function events_page_custom_fields ($event) { // Custom fields //////////////////////////////////////////////////////////////////// + $table->cellspacing = 2; + $table->cellpadding = 2; $table->width = '100%'; $table->data = array (); $table->head = array (); - $table->style[0] = 'width:35%; font-weight: bold; text-align: left;'; - $table->style[1] = 'text-align: left;'; + $table->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;'; + $table->style[1] = 'text-align: left; height: 23px;'; $table->class = "alternate rounded_cells"; $all_customs_fields = (bool)check_acl($config["id_user"], @@ -1804,8 +1816,10 @@ function events_page_details ($event, $server = "") { $table_details->width = '100%'; $table_details->data = array (); $table_details->head = array (); - $table_details->style[0] = 'width:35%; font-weight: bold; text-align: left;'; - $table_details->style[1] = 'text-align: left;'; + $table_details->cellspacing = 2; + $table_details->cellpadding = 2; + $table_details->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;'; + $table_details->style[1] = 'text-align: left; height: 23px;'; $table_details->class = "alternate rounded_cells"; switch ($event['event_type']) { @@ -2093,12 +2107,13 @@ function events_page_general ($event) { //////////////////////////////////////////////////////////////////// // General //////////////////////////////////////////////////////////////////// - + $table_general->cellspacing = 2; + $table_general->cellpadding = 2; $table_general->width = '100%'; $table_general->data = array (); $table_general->head = array (); - $table_general->style[0] = 'width:35%; font-weight: bold; text-align: left;'; - $table_general->style[1] = 'text-align: left;'; + $table_general->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;'; + $table_general->style[1] = 'text-align: left; height: 23px;'; $table_general->class = "alternate rounded_cells"; $data = array(); @@ -2234,7 +2249,9 @@ function events_page_general ($event) { } $table_general->data[] = $data; - $general = '
      '.html_print_table($table_general,true).'
      '; + $general = '
      ' . + html_print_table($table_general,true) . + '
      '; return $general; } diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 4e326526a4..f7a2a3dd1d 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -47,7 +47,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) { background: "black" }, width: 725, - height: 510 + height: 530 }) .show (); @@ -71,7 +71,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) { $('#notification_owner_error').show(); break; } - + forced_title_callback(); }, "html" diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css index 50ed39c442..a1b1b23020 100644 --- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css +++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css @@ -406,6 +406,9 @@ button.ui-button::-moz-focus-inner { } .ui-dialog .ui-dialog-titlebar { padding: .4em 1em; + padding-top: 5px; + padding-bottom: 5px; + margin: 3px; position: relative; } .ui-dialog .ui-dialog-title { @@ -1194,7 +1197,7 @@ body .ui-tooltip { } .ui-dialog .ui-widget-header { - background-color: transparent !important; + background-color: #82b92e !important; } .ui_tpicker_hour, @@ -1221,3 +1224,39 @@ body .ui-tooltip { .ui-icon { } + +/* + * Pandora Styles + */ + +.ui-dialog .ui-widget-content { + border: 0px; +} + +.ui-dialog { + border: 0px; +} + +.ui-dialog-titlebar { + border: 0px; +} + +.ui-dialog-titlebar .ui-icon-closethick, +.ui-dialog-titlebar .ui-state-default, +.ui-dialog-titlebar .ui-state-hover, +.ui-dialog-titlebar button { + background: transparent; + border: 0px; +} + +.ui-dialog-titlebar .ui-icon-closethick { + background-image: url("../../images/close_button_dialog.png"); + width: 14px; + height: 13px; + margin-top: -5px; +} + +.ui-dialog-title { + color: #ffffff; + font-size: 9pt; +} \ No newline at end of file diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 3e8b4d5860..0df8f66d40 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -924,7 +924,7 @@ tr.disabled_row_user * { } .error *{ - color: #FF4040; + color: #f85858; } .help { @@ -2005,14 +2005,14 @@ div.cellNormal { div.cellCritical { width: 100%; height: 100%; - background: #FF4040; + background: #f85858; color: #fff; } div.cellWarning { width: 100%; height: 100%; - background: #F2D400; + background: #ffea59; color: #111; } @@ -2085,7 +2085,7 @@ tr.group_view_data, .group_view_data { } tr.group_view_crit, .group_view_crit { - background-color: #FF4040; + background-color: #f85858; color: #fff; } @@ -2098,7 +2098,7 @@ tr.group_view_ok, .group_view_ok { } tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, tr.a.group_view_warn { - background-color: #F2D400; + background-color: #ffea59; color: #3F3F3F !important; } @@ -2122,12 +2122,12 @@ tr.group_view_unk, .group_view_unk { color: #fff; } .datos_red, .datos_redf9, .datos_red a, .datos_redf9 a, .datos_red *{ - background-color: #FF4040; + background-color: #f85858; color: #fff !important; } .datos_yellow, .datos_yellowf9, .datos_yellow * { - background-color: #F2D400; + background-color: #ffea59; color: #111; } @@ -2142,7 +2142,7 @@ a.datos_blue, .datos_bluef9, .datos_blue, .datos_blue * { } .datos_pink, .datos_pinkf9, .datos_pink * { - background-color: #F099A2; + background-color: #fdc4ca; color: #111; } diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 8c047ac6fa..c91baaedac 100644 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -96,7 +96,7 @@ tr.group_view_crit, .group_view_crit { color: #000000 !important; } .ui-btn-up-group_view_crit, .ui-btn-hover-group_view_crit { - background-color: #FF4040; + background-color: #f85858; color: #fff; border: 1px solid #111111; font-weight: bold; @@ -146,7 +146,7 @@ a.group_view_warn { color: #000000 !important; } .ui-btn-up-group_view_warn, .ui-btn-hover-group_view_warn { - background-color: #F2D400; + background-color: #ffea59; color: #111; border: 1px solid #111111; font-weight: bold; @@ -483,7 +483,7 @@ table.event_details td.cell_event_name { /*INIT-----------Agents styles----------------------------------------*/ .red, .redb, .redi, .error { - background: #FF4040 !important; + background: #f85858 !important; } .green { @@ -495,7 +495,7 @@ table.event_details td.cell_event_name { } .yellow { - background: #F2D400 !important; + background: #ffea59 !important; } .grey { diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index e3ebd59221..10697b0154 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -567,7 +567,7 @@ else { if (!empty($result)) { $graph = '
      ' . - grafico_eventos_grupo(350, 148, + grafico_eventos_grupo(400, 250, rawurlencode ($sql_post), $meta, $history) . '
      '; html_print_div(array('id' => 'events_graph',