diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 48d0613c98..b35123b5d3 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -44,8 +44,6 @@ if ($current_package == 0) {
echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config['MR']));
echo ' ';
-echo '
® '.get_copyright_notice().'';
if (isset($config['debug'])) {
$cache_info = [];
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index a41c8326f0..126d03e424 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -82,7 +82,7 @@ require_once 'include/functions_notifications.php';
$header_chat .= '';
- // Search
+ // Search.
$acl_head_search = true;
if ($config['acl_enterprise'] == 1 && !users_is_admin()) {
$acl_head_search = db_get_sql(
@@ -94,7 +94,7 @@ require_once 'include/functions_notifications.php';
}
if ($acl_head_search) {
- // Search bar
+ // Search bar.
$search_bar = '
';
- $header_searchbar = '';
+ $header_searchbar = '';
}
@@ -268,35 +266,25 @@ require_once 'include/functions_notifications.php';
$header_autorefresh_counter .= '';
- // Qr.
- if ($config['show_qr_code_header'] == 0) {
- $show_qr_code_header = 'display: none;';
+ // Support.
+ if (defined('PANDORA_ENTERPRISE')) {
+ $header_support_link = 'https://support.artica.es/';
} else {
- $show_qr_code_header = 'display: inline;';
+ $header_support_link = 'https://pandorafms.com/forums/';
}
- $header_qr = '';
+ $header_support = '';
+
+ // Documentation.
+ $header_docu = '';
+
- echo "';
- ?>
-
- ';
- echo '
-
- ';
+ echo '
+
+ ';
?>
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index cb5126b621..2283faab64 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -70,7 +70,7 @@ $custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
if (!defined('PANDORA_ENTERPRISE')) {
$logo_title = get_product_name().' Opensource';
- $custom_logo = 'images/custom_logo/pandora_logo_head_green.png';
+ $custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
$custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
} else {
if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo)) {
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index a1ffc9008a..283afc5565 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -243,7 +243,7 @@ function logo_custom_enterprise($name, $logo)
false,
true,
'',
- $open,
+ false,
'width:240px'
);
return $select;
@@ -259,7 +259,7 @@ function logo_custom_enterprise($name, $logo)
false,
true,
'',
- $open,
+ true,
'width:240px'
);
return $select;
@@ -462,6 +462,20 @@ if (enterprise_installed()) {
$row++;
}
+// Title Header
+if (enterprise_installed()) {
+ $table_styles->data[$row][0] = __('Title (header)');
+ $table_styles->data[$row][1] = html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true);
+ $row++;
+}
+
+// Subtitle Header
+if (enterprise_installed()) {
+ $table_styles->data[$row][0] = __('Subtitle (header)');
+ $table_styles->data[$row][1] = html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true);
+ $row++;
+}
+
// login title1
if (enterprise_installed()) {
$table_styles->data[$row][0] = __('Title 1 (login)');
diff --git a/pandora_console/images/custom_logo/pandora_logo_head_3.png b/pandora_console/images/custom_logo/pandora_logo_head_3.png
index 5bce825279..c39d604af8 100644
Binary files a/pandora_console/images/custom_logo/pandora_logo_head_3.png and b/pandora_console/images/custom_logo/pandora_logo_head_3.png differ
diff --git a/pandora_console/images/custom_logo/pandora_logo_head_4.png b/pandora_console/images/custom_logo/pandora_logo_head_4.png
index 275871dca6..8bf5fbb1d3 100644
Binary files a/pandora_console/images/custom_logo/pandora_logo_head_4.png and b/pandora_console/images/custom_logo/pandora_logo_head_4.png differ
diff --git a/pandora_console/images/custom_logo/pandora_logo_head_5.png b/pandora_console/images/custom_logo/pandora_logo_head_5.png
new file mode 100644
index 0000000000..275871dca6
Binary files /dev/null and b/pandora_console/images/custom_logo/pandora_logo_head_5.png differ
diff --git a/pandora_console/images/custom_logo/pandora_logo_head_6.png b/pandora_console/images/custom_logo/pandora_logo_head_6.png
new file mode 100644
index 0000000000..5bce825279
Binary files /dev/null and b/pandora_console/images/custom_logo/pandora_logo_head_6.png differ
diff --git a/pandora_console/images/custom_logo/pandora_logo_head_green.png b/pandora_console/images/custom_logo/pandora_logo_head_green.png
deleted file mode 100644
index 8bf5fbb1d3..0000000000
Binary files a/pandora_console/images/custom_logo/pandora_logo_head_green.png and /dev/null differ
diff --git a/pandora_console/images/header_docu.png b/pandora_console/images/header_docu.png
new file mode 100644
index 0000000000..2a1c193bed
Binary files /dev/null and b/pandora_console/images/header_docu.png differ
diff --git a/pandora_console/images/header_down_gray.png b/pandora_console/images/header_down_gray.png
index 0cfebc477a..68b302c3ea 100644
Binary files a/pandora_console/images/header_down_gray.png and b/pandora_console/images/header_down_gray.png differ
diff --git a/pandora_console/images/header_ready_gray.png b/pandora_console/images/header_ready_gray.png
index 9aadb340d5..a1fd9adfb3 100644
Binary files a/pandora_console/images/header_ready_gray.png and b/pandora_console/images/header_ready_gray.png differ
diff --git a/pandora_console/images/header_support.png b/pandora_console/images/header_support.png
new file mode 100644
index 0000000000..75823214b6
Binary files /dev/null and b/pandora_console/images/header_support.png differ
diff --git a/pandora_console/images/header_warning_gray.png b/pandora_console/images/header_warning_gray.png
index ca9954d54f..c09319fef4 100644
Binary files a/pandora_console/images/header_warning_gray.png and b/pandora_console/images/header_warning_gray.png differ
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9ba9ace3ff..714bcada23 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -896,6 +896,14 @@ function config_update_config()
$error_update[] = __('Custom networkmap center logo');
}
+ if (!config_update_value('custom_title_header', (string) get_parameter('custom_title_header'))) {
+ $error_update[] = __('Custom title header');
+ }
+
+ if (!config_update_value('custom_subtitle_header', (string) get_parameter('custom_subtitle_header'))) {
+ $error_update[] = __('Custom subtitle header');
+ }
+
if (!config_update_value('custom_title1_login', (string) get_parameter('custom_title1_login'))) {
$error_update[] = __('Custom title1 login');
}
@@ -1792,7 +1800,7 @@ function config_process_config()
}
if (!isset($config['custom_logo'])) {
- config_update_value('custom_logo', 'pandora_logo_head_green.png');
+ config_update_value('custom_logo', 'pandora_logo_head_4.png');
}
if (!isset($config['custom_logo_collapsed'])) {
@@ -1827,6 +1835,14 @@ function config_process_config()
config_update_value('custom_mobile_console_logo', '');
}
+ if (!isset($config['custom_title_header'])) {
+ config_update_value('custom_title_header', __('Pandora FMS'));
+ }
+
+ if (!isset($config['custom_subtitle_header'])) {
+ config_update_value('custom_subtitle_header', __('the Flexible Monitoring System'));
+ }
+
if (!isset($config['custom_title1_login'])) {
config_update_value('custom_title1_login', __('PANDORA FMS'));
}
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index e8811ddf83..9a51451b70 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -389,7 +389,7 @@ ul li a:hover {
.button_collapse {
height: 38px;
- background-color: #6c6c6d;
+ background-color: #505050;
width: 60px; /* This is overwritten by the classic menu (215px) */
text-align: center;
color: #fff;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 90310bb38c..7a40e04587 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -647,11 +647,10 @@ a.footer span {
}
div#foot {
- padding-top: 8px;
- padding-bottom: 5px;
+ padding-top: 10px;
+ padding-bottom: 10px;
text-align: center;
background: #343434;
- height: 30px;
clear: both;
width: auto;
}
@@ -659,7 +658,7 @@ div#foot {
div#foot a,
div#foot span {
font-family: "Open Sans", sans-serif;
- font-size: 8.5pt;
+ font-size: 8pt;
color: #9ca4a6;
}
@@ -2043,15 +2042,29 @@ div#pandora_logo_header {
justify-content: space-between;
}
+.header_title {
+ font-weight: 600;
+ font-size: 10.5pt;
+ font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
+
+.header_subtitle {
+ font-size: 10pt;
+ font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
+
#header_table_inner a,
#header_table_inner span {
font-family: "Open Sans", sans-serif;
}
+#header_table_inner a:hover {
+ text-decoration: none;
+}
+
.header_left {
display: flex;
- justify-content: flex-start;
- align-items: center;
+ flex-direction: column;
}
.header_center {
@@ -2066,64 +2079,40 @@ div#pandora_logo_header {
align-items: center;
}
-.header_left > div,
-.header_center > div {
- padding-right: 15px;
-}
-
.header_right > div {
padding-left: 15px;
}
-
-#header_table_inner #header_user span {
- color: #777;
-}
-
.header_left img,
.header_center img,
.header_right img {
vertical-align: middle;
}
+#header_chat {
+ padding-left: 0;
+ padding-right: 15px;
+}
+
+#header_autorefresh {
+ padding-left: 0;
+}
+
+#header_table_inner #header_user span {
+ color: #777;
+ align-self: center;
+}
+
+#header_table_inner #header_user a {
+ display: flex;
+ justify-content: center;
+}
+
#header_user img {
padding-right: 5px;
}
-#header_alert,
-#header_message {
- padding-right: 0px;
-}
-
-#header_alert p,
-#header_message p {
- border-radius: 50%;
- padding: 0;
- margin: 0;
- width: 15px;
- position: relative;
- height: 15px;
- top: -5px;
- text-align: center;
- display: inline-block;
- vertical-align: super;
-}
-
-#header_alert p {
- background-color: #ec4e1b;
- left: -12px;
-}
-
-#header_message p {
- background-color: #82b92e;
- left: -9px;
-}
-
-#header_alert span,
-#header_message span {
- color: #fff;
- font-size: 7pt;
- font-weight: 600;
- font-family: "Open Sans", sans-serif;
+div#header_autorefresh_counter {
+ padding-left: 0;
}
.autorefresh_disabled {
@@ -2135,10 +2124,21 @@ a.autorefresh_txt,
color: #1c1c1c;
font-size: 8.5pt;
}
-/*
-#combo_refr select {
- margin-right: 8px;
-}*/
+
+@media screen and (min-width: 1024px) and (max-width: 1200px) {
+ #header_searchbar input.search_input {
+ width: 135px;
+ }
+ .header_right > div {
+ padding-left: 10px;
+ }
+}
+
+@media screen and (max-width: 1300px) {
+ .header_right > div {
+ padding-left: 10px;
+ }
+}
.disabled_module {
color: #aaa;
@@ -2868,9 +2868,8 @@ input.search_input {
background-color: #f2f6f7 !important;
padding: 0px;
margin: 0;
- width: 200px;
- height: 35px;
- margin-bottom: 5px;
+ width: 250px;
+ height: 30px;
margin-left: 2px;
padding-left: 15px;
padding-right: 40px;
@@ -4422,14 +4421,15 @@ div#dialog_messages table th:last-child {
*/
.notification-ball {
- border: #343434 solid 2px;
border-radius: 50%;
- width: 20px;
- height: 20px;
+ width: 24px;
+ height: 24px;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
+ color: #fff;
+ font-weight: bold;
}
.notification-ball-no-messages {