Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop'

Set new brand and color for header

See merge request artica/pandorafms!4944

pandora_console/general/main_menu.php

@@ -26,6 +26,8 @@
  * ============================================================================
  */
 
+use function PHPSTORM_META\map;
+
 // Begin.
 if (isset($config['id_user']) === false) {
     include 'general/login_page.php';
@@ -57,52 +59,22 @@ if (isset($config['autohidden_menu']) === true && (bool) $config['autohidden_men
 // Start of full lateral menu.
 echo sprintf('<div id="menu_full" class="menu_full_%s">', $menuTypeClass);
 
-$custom_logo = 'images/custom_logo/'.$config['custom_logo'];
+// Header logo.
-$custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
+html_print_div(
-
-if (defined('PANDORA_ENTERPRISE') === false) {
-    $logo_title = get_product_name().' Opensource';
-    $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) === true) {
-        $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
-    }
-
-    $logo_title = get_product_name().' Enterprise';
-}
-
-echo '<div class="logo_green"><a href="index.php?sec=main">';
-
-if (isset($config['custom_logo']) === true) {
-    echo html_print_image(
-        $custom_logo,
-        true,
     [
-            'border' => '0',
+        'class'   => 'logo_green',
-            'width'  => '215',
+        'content' => html_print_anchor(
-            'alt'    => $logo_title,
+            [
-            'class'  => 'logo_full',
+                'href'    => ui_get_full_url('index.php'),
-            'style'  => ($menuCollapsed === true) ? 'display:none' : 'display:block',
+                'content' => html_print_header_logo_image(
+                    $menuCollapsed,
+                    true
+                ),
+            ],
+            true
+        ),
     ]
 );
-}
-
-if (isset($config['custom_logo_collapsed']) === true) {
-    echo html_print_image(
-        $custom_logo_collapsed,
-        true,
-        [
-            'border' => '0',
-            'width'  => '60',
-            'alt'    => $logo_title,
-            'class'  => 'logo_icon',
-            'style'  => ($menuCollapsed === true) ? 'display:block' : 'display:none',
-        ]
-    );
-}
-
-echo '</a></div>';
 
 require 'operation/menu.php';
 require 'godmode/menu.php';

pandora_console/include/constants.php

@@ -294,7 +294,11 @@ define('SERVICE_ELEMENT_DYNAMIC', 'dynamic');
 define('SERVICE_MODE_MANUAL', 0);
 define('SERVICE_MODE_SMART', 1);
 
-
+// New installation Product Logo.
+define('HEADER_LOGO_DEFAULT_CLASSIC', 'logo-default-pandorafms.png');
+define('HEADER_LOGO_DEFAULT_COLLAPSED', 'logo-default-pandorafms-collapsed.png');
+define('HEADER_LOGO_BLACK_CLASSIC', 'logo-black-pandorafms.png');
+define('HEADER_LOGO_BLACK_COLLAPSED', 'logo-default-pandorafms-collapsed.png');
 
 // Status images.
 // For modules.

pandora_console/include/functions_config.php

@@ -2357,12 +2357,12 @@ function config_process_config()
         config_update_value('custom_favicon', '');
     }
 
-    if (!isset($config['custom_logo'])) {
+    if (isset($config['custom_logo']) === false) {
-        config_update_value('custom_logo', 'pandora_logo_head_4.png');
+        config_update_value('custom_logo', HEADER_LOGO_DEFAULT_CLASSIC);
     }
 
-    if (!isset($config['custom_logo_collapsed'])) {
+    if (isset($config['custom_logo_collapsed']) === false) {
-        config_update_value('custom_logo_collapsed', 'pandora_logo_green_collapsed.png');
+        config_update_value('custom_logo_collapsed', HEADER_LOGO_DEFAULT_COLLAPSED);
     }
 
     if (is_metaconsole()) {

pandora_console/include/functions_html.php

@@ -4237,6 +4237,82 @@ function html_print_image(
 }
 
 
+/**
+ * Function for print the logo in menu header.
+ *
+ * @param boolean $menuCollapsed If true, the menu is collapsed.
+ * @param boolean $return        If true, the formed element is returned.
+ *
+ * @return mixed.
+ */
+function html_print_header_logo_image(bool $menuCollapsed, bool $return=false)
+{
+    global $config;
+
+    if (defined('PANDORA_ENTERPRISE') === false) {
+        if ($config['style'] === 'pandora_black') {
+            $custom_logo = 'images/custom_logo/'.HEADER_LOGO_BLACK_CLASSIC;
+            $custom_logo_collapsed = 'images/custom_logo/'.HEADER_LOGO_DEFAULT_COLLAPSED;
+        } else if ($config['style'] === 'pandora') {
+            $custom_logo = 'images/custom_logo/'.HEADER_LOGO_DEFAULT_CLASSIC;
+            $custom_logo_collapsed = 'images/custom_logo/'.HEADER_LOGO_DEFAULT_COLLAPSED;
+        }
+
+        $logo_title = get_product_name().' Opensource';
+    } else {
+        // Handle default logos when change theme.
+        if ($config['style'] === 'pandora_black' && $config['custom_logo'] === HEADER_LOGO_DEFAULT_CLASSIC) {
+            $config['custom_logo'] = HEADER_LOGO_BLACK_CLASSIC;
+        } else if ($config['style'] === 'pandora' && $config['custom_logo'] === HEADER_LOGO_BLACK_CLASSIC) {
+            $config['custom_logo'] = HEADER_LOGO_DEFAULT_CLASSIC;
+        }
+
+        $logo_title = get_product_name().' Enterprise';
+        $custom_logo = 'images/custom_logo/'.$config['custom_logo'];
+
+        $custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
+
+        if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo) === true) {
+            $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
+        }
+    }
+
+    if (isset($config['custom_logo']) === true) {
+        $output = html_print_image(
+            $custom_logo,
+            true,
+            [
+                'border' => '0',
+                'width'  => '215',
+                'alt'    => $logo_title,
+                'class'  => 'logo_full',
+                'style'  => ($menuCollapsed === true) ? 'display:none' : 'display:block',
+            ]
+        );
+    }
+
+    if (isset($config['custom_logo_collapsed']) === true) {
+        $output .= html_print_image(
+            $custom_logo_collapsed,
+            true,
+            [
+                'border' => '0',
+                'width'  => '60',
+                'alt'    => $logo_title,
+                'class'  => 'logo_icon',
+                'style'  => ($menuCollapsed === true) ? 'display:block' : 'display:none',
+            ]
+        );
+    }
+
+    if ($return === false) {
+        echo $output;
+    } else {
+        return $output;
+    }
+}
+
+
 /**
  * Render an input text element. Extended version, use html_print_input_text() to simplify.
  *

pandora_console/include/styles/menu.css

@@ -399,7 +399,8 @@ ul li {
 }
 
 .logo_green {
-  height: 60px;
+  background-color: #fff;
+  min-height: 60px;
   display: flex;
   justify-content: center;
   align-items: center;

pandora_console/include/styles/pandora_black.css

@@ -65,6 +65,9 @@ table.agent_info_table tr {
   color: #fff !important;
 }
 
+.logo_green {
+  background-color: #000;
+}
 #um-next:hover,
 #um-last:hover {
   border: 1px solid #888 !important;