diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e750b81f2d..170f91560d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2013-10-02 Sergio Martin + + * include/styles/install.css + include/styles/pandora.css + install.php + images/warn.png + images/pandora_tinylogo_open.png + images/dot_red.png + images/dot_green.png: Improve visual styles of + install screens + + * general/pandora_help.php: Add a opensource logo + image in help screen when enterprise is not installed + + * general/error_screen.php: Add css styles to + error screens before login + 2013-10-02 Miguel de Dios * godmode/setup/setup_general.php: removed the field diff --git a/pandora_console/general/error_screen.php b/pandora_console/general/error_screen.php index fa54dd1553..ca2e4476d5 100644 --- a/pandora_console/general/error_screen.php +++ b/pandora_console/general/error_screen.php @@ -31,6 +31,7 @@ + '; echo ''; -echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0')); +if (empty($config['enterprise_installed'])) { + echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0')); +} +else { + echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0')); +} echo ""; echo '

'. html_print_image('images/interrogant.png', true, array('title' => __('Pandora FMS help system'))) . '

'; echo '
'; diff --git a/pandora_console/images/dot_green.png b/pandora_console/images/dot_green.png index 92578043c4..aa1561471c 100644 Binary files a/pandora_console/images/dot_green.png and b/pandora_console/images/dot_green.png differ diff --git a/pandora_console/images/dot_red.png b/pandora_console/images/dot_red.png index 5e9ed081e5..25aa610aef 100644 Binary files a/pandora_console/images/dot_red.png and b/pandora_console/images/dot_red.png differ diff --git a/pandora_console/images/pandora_tinylogo_open.png b/pandora_console/images/pandora_tinylogo_open.png new file mode 100755 index 0000000000..9fde161088 Binary files /dev/null and b/pandora_console/images/pandora_tinylogo_open.png differ diff --git a/pandora_console/images/warn.png b/pandora_console/images/warn.png new file mode 100755 index 0000000000..11c98b8b67 Binary files /dev/null and b/pandora_console/images/warn.png differ diff --git a/pandora_console/include/styles/install.css b/pandora_console/include/styles/install.css index bf28b79680..f5a6434a5c 100644 --- a/pandora_console/include/styles/install.css +++ b/pandora_console/include/styles/install.css @@ -35,23 +35,61 @@ div#install_container { } div#logo_img { text-align: center; - width: 200px; + width: 100%; + color: #666; } div#wizard { text-align: left; border: 1px solid #999; margin-top: 1em; - padding: 20px; - padding-left: 20px; + width: 650px; - background-color: #fafafa; + padding-left: 0px; + padding-top: 0px; + padding-bottom: 20px; + background-color: #ffffff; + margin-top: 0px; + margin-left: 0px; + margin-right: 0px; + border-radius: 10px; + position: relative; } + +div#wizard a img { + padding-right: 30px; +} + +div#wizard>input { + padding-right: 30px; + float:right; + margin-top: 20px; +} + div#install_box, div#install_img { - float: right; padding-right: 20px; margin-top: 0px; - width: 400px; + width: 80%; + margin: 0px auto; } + +div#install_box { + background: F3F3F3; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + border: 0px; + padding: 10px 25px; + margin-top: 10px; + -moz-box-shadow: -1px 1px 6px #aaa; + -webkit-box-shadow: -1px 1px 6px #aaa; + box-shadow: -1px 1px 6px #aaa; +} + +div#install_box h2 { + color: #00aa00; + text-transform: uppercase; +} + div#install_img { margin-bottom: 25px; margin-left: 25px; @@ -65,10 +103,6 @@ div#foot_install { padding-left: 20px; padding-right: 20px; text-align: center; - background: #777; - width: 650px; - border-left: 1px solid #999; - border-right: 1px solid #999; } div#foot_install a { color: #ccc; @@ -80,16 +114,22 @@ input#step4, input#step4:hover { background-color: #fafafa; } div.warn { - background: url(../../images/info.png) no-repeat; - color: #ac4444; + background: url(../../images/warn.png) no-repeat 0% -2px; + color: #880; margin-top: 7px; - padding: 2px 1px 6px 25px; + padding: 2px 1px 6px 30px; } div.info { - background: url(../../images/information.png) no-repeat; - color: #000000; + background: url(../../images/info.png) no-repeat 0% -2px; + color: #222; margin-top: 7px; - padding: 2px 1px 6px 25px; + padding: 2px 1px 6px 30px; +} +div.err { + background: url(../../images/error_red.png) no-repeat 0% -2px; + color: #cc0000; + margin-top: 7px; + padding: 2px 1px 6px 30px; } span.arr { background: url(../../images/arrow.png) no-repeat; @@ -108,6 +148,12 @@ body, td { } body{ - background: url(../../images/greyback.gif); + background-color: #555555; } +div.installation_step { + position: absolute; + top: 7px; + right: 10px; + color: #666; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 356a60d94c..16a47ffa04 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -207,7 +207,7 @@ div#main_help { margin-right: 0px; border-radius: 10px; } -div#main_help div.databox { +div#main_help div.databox, .license_databox { background: F3F3F3; -moz-border-radius: 8px; -webkit-border-radius: 8px; diff --git a/pandora_console/install.php b/pandora_console/install.php index 8be4453949..030e400a7e 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -377,12 +377,15 @@ function random_name ($size) { function print_logo_status ($step, $step_total) { global $banner; - echo " + return "
-
+
+
$banner -

+
+
Install step $step of $step_total +
"; } @@ -391,7 +394,8 @@ function install_step1() { echo "
-
+
+ " . print_logo_status (1,6) . "

Welcome to Pandora FMS installation Wizard

This wizard helps you to quick install Pandora FMS console and main database in your system.

@@ -404,7 +408,7 @@ function install_step1() { Configuration and database would be overwritten if you continued.
"; } echo "
"; - echo ""; + echo "
"; $writable = check_writable ( "include", "Checking if ./include is writable"); if (file_exists("include/config.php")) $writable += check_writable ( "include/config.php", "Checking if include/config.php is writable"); @@ -416,22 +420,20 @@ function install_step1() { "; echo "
Upgrade: - If you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup.
"; - - echo ""; - - print_logo_status (1,6); - - echo "
"; + If you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup. +
"; + if ($writable == 0) { - echo " -

- "; + echo ""; + echo ""; } - else - echo "
ERROR:You need to setup permissions to be able to write in ./include directory
"; + else { + echo "
ERROR:You need to setup permissions to be able to write in ./include directory
"; + echo ""; + } + + echo "
"; echo " -
Pandora FMS is an OpenSource Software project registered at @@ -443,7 +445,8 @@ function install_step1() { function install_step1_licence() { echo "
-
+
+ " . print_logo_status (2,6) . "

GPL2 Licence terms agreement

Pandora FMS is an OpenSource software project licensed under the GPL2 licence. Pandora FMS includes, as well, another software also licensed under LGPL and BSD licenses. Before continue, you must accept the licence terms.. @@ -457,16 +460,14 @@ function install_step1_licence() { } else { echo "
"; - echo ""; echo "

"; - echo ""; + echo "

"; } echo "
"; - - print_logo_status (2,6); - + echo "
@@ -480,7 +481,8 @@ function install_step2() { echo "
-
+
+ " . print_logo_status (3,6) . "
"; echo "

Checking software dependencies

"; echo "
"; @@ -513,22 +515,24 @@ function install_step2() { check_extension("mysql", "PHP MySQL extension"); check_extension("pgsql", "PHP PostgreSQL extension"); check_extension("oci8", "PHP Oracle extension"); - echo "
"; - echo "
"; - print_logo_status (3,6); - - echo "
"; + echo ""; if ($res > 0) { echo " -
You have some incomplete +
You have some incomplete dependencies. Please correct them or this installer will not be able to finish your installation.
- Ignore it. Force install Step #3"; +
+ Ignore it. Force install Step #3 +
"; + echo "
"; } else { + echo "
"; echo "
- "; +
+"; + } echo "
@@ -561,7 +565,8 @@ function install_step3() { echo "
-
+
+ " . print_logo_status (4,6) . "

Environment and database setup

@@ -593,7 +598,7 @@ function install_step3() { echo ""; } - echo ""; + echo "
"; echo "
"; echo "DB Engine
"; @@ -617,16 +622,16 @@ function install_step3() { echo ""; } echo "
DB User with privileges
- + 		DB Password for this user
- +
DB Hostname
- + 		DB Name (pandora by default)
- +
Drop Database if exists
@@ -639,7 +644,7 @@ function install_step3() { -
URL path to Pandora FMS Console
+
URL path to Pandora FMS Console
For example '/pandora_console'
"; + + echo ""; + if (!$error) { - echo "

- -
"; + echo ""; } - echo " - "; - print_logo_status (4,6); + echo ""; + echo "
"; echo "
Pandora FMS is an OpenSource Software project registered at @@ -706,10 +711,11 @@ function install_step4() { echo "
-
+
+ " . print_logo_status(5,6) . "

Creating database and default configuration file

- "; +
"; switch ($engine) { case 'mysql': if (! mysql_connect ($dbhost, $dbuser, $dbpassword)) { @@ -1071,17 +1077,15 @@ function install_step4() { } break; } - echo "
"; - - print_logo_status(5,6); - - echo "
"; + echo "
"; + if ($everything_ok == 1) { - echo "

- "; + echo "

"; + echo ""; } else { - $info = "
There were some problems. + $info = "
There were some problems. Installation was not completed.

Please correct failures before trying again. All database "; @@ -1097,7 +1101,7 @@ function install_step4() { switch ($engine) { case 'mysql': if (mysql_error() != "") { - echo "

ERROR: ". mysql_error().".
"; + echo "
ERROR: ". mysql_error().".
"; } if ($step1 == 1) { @@ -1110,22 +1114,25 @@ function install_step4() { oracle_drop_all_objects($connection); break; } + echo "
"; } + + echo "
"; echo "
-
-
- Pandora FMS is an Open Source Software project registered at - SourceForge -
-
"; +
+ Pandora FMS is an Open Source Software project registered at + SourceForge +
+
"; } function install_step5() { echo "
-
+
+ " . print_logo_status (6,6) . "

Installation complete

For security, you now must manually delete this installer @@ -1139,7 +1146,6 @@ function install_step5() {


Click here to access to your Pandora FMS console.

"; - print_logo_status (6,6); echo "
Pandora FMS is an OpenSource Software project registered at