diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cde78186aa..2df6a7a228 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,25 @@ +2009-12-04 Sancho Lerena + + * include/styles/pandora.css: Modified style for 3.0 + + * images/pandora_textlogo.png, + images/pandora_header_logo_enterprise.png, + images/custom_logo/none.png + images/custom_logo/sourceforge.png + images/custom_logo/artica_logo.png + images/header.jpg + images/pandora_header_logo.png + images/pandora_logo.png: New logos and background for 3.0 style. + + * general/login_page.php: Updated style. + + * general/logon_ok.php: Removed small bug in the audit log block. + + * general/header.php: Pandora logo is now in left, and custom logo + at right. + + * include/functions_config.php: By default custom logo is "none" + 2009-12-4 Miguel de Dios * godmode/alerts/alert_templates.php: use the function to translate the diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index fba3531392..98ce281164 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -18,7 +18,17 @@ require_once ("include/functions_messages.php"); "; ?> + + +"; + } else { + echo ""; + } +?> + + "; echo " diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 74031fe849..2feeeea6c3 100644 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -20,11 +20,15 @@ if (!empty ($page) && !empty ($sec)) { } } -echo '
-

'.__('Pandora FMS Web Console').'


+echo '
'; + + //echo '

Put here your custom welcome message

"; + +echo '

'; +echo '
-
- .png" class="bot" alt="user" /> [] @@ -94,12 +104,7 @@ require_once ("include/functions_messages.php"); echo ""; echo ""; - - if (!defined ('PANDORA_ENTERPRISE')){ - echo ""; - } else { - echo ""; - } + echo ""; ?>
'; +
'; if (isset ($login_failed)) { echo '
'; diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 3076bbe1ac..631e6acd08 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -133,8 +133,9 @@ foreach ($cells as $key => $row) { } echo '
'; -echo '
 
'; //Clear the floats +echo ""; echo '
'; +echo "

"; // Show last activity from this user echo "

" . __('This is your last activity in Pandora FMS console') . "

"; diff --git a/pandora_console/images/custom_logo/artica_logo.png b/pandora_console/images/custom_logo/artica_logo.png index 35bd9c091d..a01768e460 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.png b/pandora_console/images/custom_logo/none.png new file mode 100644 index 0000000000..157dbf59f0 Binary files /dev/null and b/pandora_console/images/custom_logo/none.png differ diff --git a/pandora_console/images/custom_logo/sourceforge.png b/pandora_console/images/custom_logo/sourceforge.png index 0bcfe45f55..90d216607f 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/header.jpg b/pandora_console/images/header.jpg index a6c3078cdd..defdaf98ae 100644 Binary files a/pandora_console/images/header.jpg and b/pandora_console/images/header.jpg differ diff --git a/pandora_console/images/pandora_header_logo.png b/pandora_console/images/pandora_header_logo.png index 9c6ac364b7..04788b84ba 100644 Binary files a/pandora_console/images/pandora_header_logo.png and b/pandora_console/images/pandora_header_logo.png differ diff --git a/pandora_console/images/pandora_header_logo_enterprise.png b/pandora_console/images/pandora_header_logo_enterprise.png index 22437f3018..edd33bc6b1 100644 Binary files a/pandora_console/images/pandora_header_logo_enterprise.png and b/pandora_console/images/pandora_header_logo_enterprise.png differ diff --git a/pandora_console/images/pandora_logo.png b/pandora_console/images/pandora_logo.png index 40b9a8e7b7..1bae0a0e20 100644 Binary files a/pandora_console/images/pandora_logo.png and b/pandora_console/images/pandora_logo.png differ diff --git a/pandora_console/images/pandora_textlogo.png b/pandora_console/images/pandora_textlogo.png index 5ac8e1b140..1b3b08a56e 100644 Binary files a/pandora_console/images/pandora_textlogo.png and b/pandora_console/images/pandora_textlogo.png differ diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 33356c634a..2c35346ae9 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -306,7 +306,7 @@ function process_config () { } if (!isset ($config["custom_logo"])){ - update_config_value ('custom_logo', 'pandora_logo_head.png'); + update_config_value ('custom_logo', 'none.png'); } /* Finally, check if any value was overwritten in a form */ diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 38b50084ee..edf3a609e2 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -73,7 +73,7 @@ h1, h2, h3, h4 { font-size: 1em; font-family: Arial, Sans-serif; text-transform: uppercase; - color: #786; + color: #666; padding-bottom: 4px; padding-top: 7px; } @@ -183,8 +183,8 @@ div#page { width: 960px; background: #fff; clear: both; - border-bottom: solid 5px #786; - border-top: solid 5px #786; + border-bottom: solid 5px #666; + border-top: solid 5px #666; } div#main { width: 785px; @@ -251,7 +251,7 @@ input.datos_readonly { background-color: #050505; } input.login { - border-color: #786; + border-color: #666; background-color: #f5f5f5; margin: 2px 0 8px; width: 90px; @@ -303,7 +303,7 @@ table, img { } th { color: #fff; - background-color: #786; + background-color: #666; text-align:center; } tr.datos, tr.datost, tr.datosb , tr.datos_id, @@ -340,7 +340,7 @@ tr.rowOdd:hover { background-color: #E0E0E0 } .bg { /* op menu */ - background-color: #786; + background-color: #666; } .bg2 { /* main page */ background-color: #d84437; @@ -498,7 +498,7 @@ div.title_line { #menu_tab li a, #menu_tab a { background: #d4ddc6; padding: 3px 5px; - color: #333; + color: #666; border-left: 2px solid #778866; font-weight: bold; line-height: 18px;