diff --git a/pandora_console/general/firts_task/collections.php b/pandora_console/general/firts_task/collections.php index 269de3ba12..8e27ce6ee3 100755 --- a/pandora_console/general/firts_task/collections.php +++ b/pandora_console/general/firts_task/collections.php @@ -22,7 +22,7 @@ ui_require_css_file('firts_task'); __('Collections')]); ?>
-

+

true, 'message' => __('There are no custom __('Custom Fields')]); ?>

-

+

true, 'message' => __('There are no custom __('Custom Graphs')]); ?>

-

+

__('Fields Manager')]); ?>

-

+

__('Incidents')]); ?>

-

+

__('Visual Console')]); ?>

-

+

__('Network Map')]); ?>

-

+

__('Planned Downtime')]); ?>

-

+

__('Discovery server')]); ?>

-

+

__('Services')]); ?>

-

+

__('SNMP Filter')]); ?>

-

+

__('Tags')]); ?>

-

+

__('Transactions')]); ?>

-

+

'; if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) { if (isset($config['custom_splash_login'])) { - html_print_image('enterprise/images/custom_splash_login/'.$config['custom_splash_login'], false, [ 'alt' => 'splash', 'border' => 0, 'title' => $splash_title], false, true); + html_print_image('enterprise/images/custom_splash_login/'.$config['custom_splash_login'], false, [ 'alt' => 'splash', 'border' => 0], false, true); } else { - html_print_image('enterprise/images/custom_splash_login/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0, 'title' => $splash_title], false, true); + html_print_image('enterprise/images/custom_splash_login/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0], false, true); } } else { - html_print_image('images/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0, 'title' => $splash_title], false, true); + html_print_image('images/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0], false, true); } echo '

'; diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 7944a92d7b..fe26e72fd7 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -19,8 +19,10 @@ // Set session variable to store menu type (classic or collapsed) within this session -if (!empty(get_parameter('menuType'))) - $_SESSION['menu_type'] = get_parameter('menuType', 'collapsed'); +if (!empty(get_parameter('menuType'))) { + $_SESSION['menu_type'] = get_parameter('menuType', 'classic'); +} + /** * Prints a complete menu structure. @@ -80,10 +82,17 @@ function menu_print_menu(&$menu) $submenu = false; - if ($_SESSION['menu_type']=='classic') - $classes = ['menu_icon', 'no_hidden_menu']; - else - $classes = ['menu_icon', 'menu_icon_collapsed']; + if ($_SESSION['menu_type'] == 'classic') { + $classes = [ + 'menu_icon', + 'no_hidden_menu', + ]; + } else { + $classes = [ + 'menu_icon', + 'menu_icon_collapsed', + ]; + } if (isset($main['sub'])) { $classes[] = ''; @@ -383,10 +392,11 @@ function menu_print_menu(&$menu) $length = strlen(__($main['text'])); $padding_top = ( $length >= 18) ? 6 : 12; - if ($_SESSION['menu_type']=='classic') + if ($_SESSION['menu_type'] == 'classic') { $output .= ''; - else + } else { $output .= ''; + } // Add the notification ball if defined if (isset($main['notification'])) { diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css index b851999f9a..34e9b98255 100644 --- a/pandora_console/include/styles/discovery.css +++ b/pandora_console/include/styles/discovery.css @@ -99,10 +99,44 @@ div.arrow_box:before { .arrow_box:hover { color: #000; } + +/* + * Breadcrum + */ + +#menu_tab_frame_view_bc { + display: flex; + justify-content: space-between; + border-bottom: 2px solid #82b92e; + max-height: 70px; + min-height: 55px; + width: 100%; + padding-right: 0px; + margin-left: 0px !important; + margin-bottom: 20px; + height: 55px; + box-sizing: border-box; + background-color: #fafafa; + border-top-right-radius: 7px; + border-top-left-radius: 7px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1); + flex-direction: column; +} + +#menu_tab_frame_view_bc .breadcrumbs_container { + align-self: flex-start; +} + +.breadcrumbs_container { + padding-left: 10px; + padding-top: 4px; + text-indent: 0.25em; +} + .breadcrumb_link { - color: #d0d0d0; - font-size: 12pt !important; - font-family: "Open Sans", sans-serif !important; + color: #848484; + font-size: 10pt !important; + font-family: "lato-bolder", "Open Sans", sans-serif !important; text-decoration: none !important; } @@ -130,4 +164,3 @@ span.breadcrumb_link { box-sizing: border-box; padding: 10px; } - diff --git a/pandora_console/include/styles/firts_task.css b/pandora_console/include/styles/firts_task.css index 32be0eb832..1b26b2bfbe 100755 --- a/pandora_console/include/styles/firts_task.css +++ b/pandora_console/include/styles/firts_task.css @@ -72,6 +72,7 @@ div.new_task_cluster > div { } #description_task { font-size: 12px; + line-height: 1.8em; } #fuerte { diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 9a51451b70..dcb9db06cb 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -31,8 +31,7 @@ .operation .menu_icon ul.submenu > li, .godmode .menu_icon ul.submenu > li { background-color: #282828; - padding-left: 10px; - padding-right: 10px; + padding-left: 1.5em; } .menu ul { @@ -58,7 +57,7 @@ li:hover ul { .submenu_text { margin-left: 0px; width: 100%; - color: #9ca4a6; + color: #b9b9b9; font-family: "Open Sans", sans-serif; font-size: 9.4pt; } @@ -71,21 +70,20 @@ li:hover ul { margin: 0px 0px 0px 0px; position: absolute; z-index: 999; - width: 214px; + width: 240px; } .submenu2 { position: absolute; z-index: 999; - left: 214px; - width: 214px; + left: 240px; + width: 240px; } .sub_subMenu { font-weight: normal !important; background-color: #202020; - padding-left: 10px; - padding-right: 10px; + padding-left: 1.5em; } .sub_subMenu.selected { @@ -291,7 +289,7 @@ ul li a:hover { } .operation { - background-color: #343434 !important; + background-color: #3d3d3d !important; padding-top: 20px !important; } @@ -468,11 +466,11 @@ ul li a:hover { } .header_table_classic { - padding-left: 250px !important; /* 215 + 35 */ + padding-left: 235px !important; /* 215 + 35 */ } .header_table_collapsed { - padding-left: 95px !important; /* 60 + 35 */ + padding-left: 80px !important; /* 60 + 35 */ } .title_menu_classic { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 9ea2d02c03..bc9e4c6357 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -404,10 +404,10 @@ div#page { background-image: none; clear: both; width: auto; - padding-top: 20px !important; + padding-top: 5px !important; padding-left: 60px; /* This is overwritten by the classic menu (215px)*/ padding-right: 35px; - margin-left: 35px; + margin-left: 20px; } body.pure { @@ -1266,40 +1266,12 @@ div.title_line { margin-bottom: 20px; height: 50px; box-sizing: border-box; - background-color: #fff; + background-color: #fafafa; border-top-right-radius: 7px; border-top-left-radius: 7px; box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.1); } -#menu_tab_frame_view_bc { - display: flex; - justify-content: space-between; - border-bottom: 2px solid #82b92e; - max-height: 70px; - min-height: 50px; - width: 100%; - padding-right: 0px; - margin-left: 0px !important; - margin-bottom: 20px; - height: 70px; - box-sizing: border-box; - background-color: #fff; - border-top-right-radius: 7px; - border-top-left-radius: 7px; - box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.1); - flex-direction: column; -} - -#menu_tab_frame_view_bc .breadcrumbs_container { - align-self: flex-start; -} - -.breadcrumbs_container { - padding-left: 10px; - padding-top: 4px; -} - #menu_tab { margin-right: 10px; } @@ -1333,6 +1305,7 @@ div.title_line { text-decoration: none; padding: 0px; margin: 0px; + padding-top: 6px; } #menu_tab li.nomn:hover a, #menu_tab li:hover ul a:hover { @@ -1438,7 +1411,8 @@ div#agent_wizard_subtabs { #menu_tab_left li a, #menu_tab_left li span { color: #343434; - font-size: 14pt; + font-size: 16pt; + line-height: 16pt; } /* @@ -2047,6 +2021,7 @@ div#pandora_logo_header { #header_table_inner { height: 60px; + min-width: 790px; /*width: 100%;*/ display: flex; align-items: center; @@ -3279,7 +3254,7 @@ div.div_groups_status { } #title_menu { - color: #9ca4a6; + color: #b9b9b9; float: right; width: 72%; letter-spacing: 0pt; @@ -3295,16 +3270,15 @@ div.div_groups_status { #menu_tab li.nomn, #menu_tab li.nomn_high { - background-color: #fff; - padding-right: 3px; - padding-left: 3px; + padding-right: 8px; + padding-left: 8px; padding-top: 6px; font-weight: bold; text-decoration: none; font-size: 14px; margin-top: 0; min-width: 30px; - height: 29px; + height: 40px; } #menu_tab li:hover { @@ -3315,6 +3289,7 @@ div.div_groups_status { #menu_tab li.nomn_high span { color: #fff; box-shadow: inset 0px 4px #82b92e; + background-color: #fff; } #menu_tab li.nomn img, @@ -4772,8 +4747,8 @@ input:checked + .p-slider:before { /* New white rounded boxes */ .white_box { background-color: #fff; - border: 1px solid #d7d9da; - border-radius: 10px; + border: 1px solid #f3f3f3; + border-radius: 5px; padding: 20px 50px; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index bf81ae5110..997bfed3cb 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -335,11 +335,6 @@ if (check_acl($config['id_user'], 0, 'ER') $sub['operation/events/events_marquee.php']['type'] = 'direct'; } - // CSV - $sub['operation/events/export_csv.php?search=&event_type=&severity=-1&status=3&id_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure=']['text'] = __('CSV File'); - $sub['operation/events/export_csv.php?search=&event_type=&severity=-1&status=3&id_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure=']['id'] = 'CSV File'; - $sub['operation/events/export_csv.php?search=&event_type=&severity=-1&status=3&id_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure=']['type'] = 'direct'; - // Sound Events $javascript = "javascript: window.open('operation/events/sound_events.php');"; $javascript = 'javascript: alert(111);';