diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d9d840cbc5..24b151afd4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,24 @@ +2013-07-03 Sergio Martin + + * include/functions_config.php + include/help/en/help_custom_logo.php + include/help/es/help_custom_logo.php + include/help/ja/help_custom_logo.php + images/custom_logo/sourceforge.jpg + images/custom_logo/pandora_logo_head.jpg + images/custom_logo/artica_logo.png + images/custom_logo/sourceforge.png + images/custom_logo/pandora_logo_head.png + images/custom_logo/none.jpg + images/pandora_header_logo_enterprise.png + images/pandora_header_logo.png + extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql + extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql + extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql + general/header.php: Change the old system of custom logo + to be used in the unique logo (left side) of Pandora FMS 5 + Bug #2241 + 2013-07-03 Miguel de Dios * mobile/index.php, mobile/operation/networkmaps.php, diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index bfcc0c2295..f14276209a 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -1133,3 +1133,9 @@ UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE ALTER TABLE tagente_datos_inc DROP COLUMN id_adi; +-- --------------------------------------------------------------------- +-- Reset custom logo in tconfig table +-- --------------------------------------------------------------------- + +UPDATE tconfig SET value = 'pandora_logo_head.png' WHERE token = 'custom_logo'; + diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index f02cee4430..3d077488db 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -1138,3 +1138,9 @@ UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE ALTER TABLE tagente_datos_inc DROP COLUMN id_adi; + +-- --------------------------------------------------------------------- +-- Reset custom logo in tconfig table +-- --------------------------------------------------------------------- + +UPDATE tconfig SET value = 'pandora_logo_head.png' WHERE token = 'custom_logo'; diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index 9f40034fd3..d6f85789bb 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -1128,3 +1128,8 @@ UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE ALTER TABLE tagente_datos_inc DROP COLUMN id_adi; +-- --------------------------------------------------------------------- +-- Reset custom logo in tconfig table +-- --------------------------------------------------------------------- + +UPDATE tconfig SET value = 'pandora_logo_head.png' WHERE token = 'custom_logo'; diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 9b246a4565..a217f33597 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -34,12 +34,19 @@ config_check(); 'Pandora FMS Opensource', "border" => '0')); - } - else { - echo html_print_image('images/pandora_header_logo_enterprise.png', true, array("alt" => 'Pandora FMS Enterprise', "border" => '0')); - } + $custom_logo = 'images/custom_logo/' . $config['custom_logo']; + + if (!defined ('PANDORA_ENTERPRISE')) { + $logo_title = 'Pandora FMS Opensource'; + } + else { + if (file_exists(ENTERPRISE_DIR . '/' . $custom_logo)) { + $custom_logo = ENTERPRISE_DIR . '/' . $custom_logo; + } + $logo_title = 'Pandora FMS Enterprise'; + } + + echo html_print_image($custom_logo, true, array("alt" => $logo_title, "border" => '0')); ?> diff --git a/pandora_console/images/custom_logo/artica_logo.png b/pandora_console/images/custom_logo/artica_logo.png index a01768e460..e7e397b2c4 100644 Binary files a/pandora_console/images/custom_logo/artica_logo.png and b/pandora_console/images/custom_logo/artica_logo.png differ diff --git a/pandora_console/images/custom_logo/none.jpg b/pandora_console/images/custom_logo/none.jpg deleted file mode 100644 index b9f20a36da..0000000000 Binary files a/pandora_console/images/custom_logo/none.jpg and /dev/null differ diff --git a/pandora_console/images/custom_logo/pandora_logo_head.jpg b/pandora_console/images/custom_logo/pandora_logo_head.jpg deleted file mode 100644 index c9b423bae0..0000000000 Binary files a/pandora_console/images/custom_logo/pandora_logo_head.jpg and /dev/null differ diff --git a/pandora_console/images/custom_logo/pandora_logo_head.png b/pandora_console/images/custom_logo/pandora_logo_head.png index 1bae0a0e20..2f5b60fb37 100755 Binary files a/pandora_console/images/custom_logo/pandora_logo_head.png and b/pandora_console/images/custom_logo/pandora_logo_head.png differ diff --git a/pandora_console/images/custom_logo/sourceforge.jpg b/pandora_console/images/custom_logo/sourceforge.jpg deleted file mode 100644 index 2a217a8af7..0000000000 Binary files a/pandora_console/images/custom_logo/sourceforge.jpg and /dev/null differ diff --git a/pandora_console/images/custom_logo/sourceforge.png b/pandora_console/images/custom_logo/sourceforge.png index 90d216607f..d5482f6264 100644 Binary files a/pandora_console/images/custom_logo/sourceforge.png and b/pandora_console/images/custom_logo/sourceforge.png differ diff --git a/pandora_console/images/pandora_header_logo.png b/pandora_console/images/pandora_header_logo.png deleted file mode 100644 index 2f5b60fb37..0000000000 Binary files a/pandora_console/images/pandora_header_logo.png and /dev/null differ diff --git a/pandora_console/images/pandora_header_logo_enterprise.png b/pandora_console/images/pandora_header_logo_enterprise.png deleted file mode 100644 index 39e8e7d380..0000000000 Binary files a/pandora_console/images/pandora_header_logo_enterprise.png and /dev/null differ diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 331ca9c089..ab3aebf32d 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -745,7 +745,7 @@ function config_process_config () { } if (!isset ($config["custom_logo"])) { - config_update_value ('custom_logo', 'none.png'); + config_update_value ('custom_logo', 'pandora_logo_head.png'); } if (!isset ($config['history_db_enabled'])) { diff --git a/pandora_console/include/help/en/help_custom_logo.php b/pandora_console/include/help/en/help_custom_logo.php index 23b0ba2a93..96a3feac52 100644 --- a/pandora_console/include/help/en/help_custom_logo.php +++ b/pandora_console/include/help/en/help_custom_logo.php @@ -5,7 +5,7 @@ ?>

Custom logo (Branding)

-This option is used to display your own logo in the Pandora FMS header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 139x60 pixels. +This option is used to display your own logo in the Pandora FMS header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels.

Upload your custom branding logo, using the file manager to /images/custom_logo directory. diff --git a/pandora_console/include/help/es/help_custom_logo.php b/pandora_console/include/help/es/help_custom_logo.php index 8097d6d9e2..02edf9c72f 100644 --- a/pandora_console/include/help/es/help_custom_logo.php +++ b/pandora_console/include/help/es/help_custom_logo.php @@ -5,7 +5,7 @@ ?>

Logo de Cliente (Marca comunitaria de empresa)

-Esta opción se utiliza para poder desplegar su propio logo en la cabecera de Pandora FMS. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 139x60 píxeles. +Esta opción se utiliza para poder desplegar su propio logo en la cabecera de Pandora FMS. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.

diff --git a/pandora_console/include/help/ja/help_custom_logo.php b/pandora_console/include/help/ja/help_custom_logo.php index 63ac263bf4..daa5704532 100644 --- a/pandora_console/include/help/ja/help_custom_logo.php +++ b/pandora_console/include/help/ja/help_custom_logo.php @@ -7,6 +7,6 @@ ここに指定した画像ファイルを、オリジナルロゴとして Pandora FMS のヘッダーに表示することができます。 表示可能な画像ファイルは PNG 形式です。 -画像サイズは、139x60ピクセルに修正されます。 +画像サイズは、206x47ピクセルに修正されます。

カスタムロゴは、ファイルマネージャを使って /images/custom_logo ディレクトリへアップロードしてください。