diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 55baeea9d8..6566002b2f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2007-05-27 Raul Mateos + + * include/styles/pandora.css: Cleaned and moved install styles + to a new file only using in install.php file. + + * include/styles/pandora_red.css: Cleaned and moved install styles + to a new file only using in install.php file. + + * include/styles/install.css: New file. + + * install.php: Updated with new styles. + 2007-05-26 Raul Mateos * include/styles/pandora.css: Cleaned and updated some styles. diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 08cefc3fdf..adb8d24ca5 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -289,7 +289,7 @@ td.datos_id { td.datos_jus, td.datos2_jus { text-align: justify; } -.bg { /* op menu */ +.bg { /* op menu */ background-color: #786; } .bg2 { /* main page */ @@ -417,22 +417,6 @@ div.nf { margin-left: 7px; padding: 2px 1px 6px 25px; } -div#wizard { - text-align: left; - border: 1px solid #999; - margin-top: 3em; - margin-bottom: -1em; - padding: 20px; - width: 600px; - background-color: #fff; - background: url(../../images/background8.jpg); -} -div#install_box { - float: right; - padding-right: 20px; - margin-top: 10px; - width: 350px; -} div.title_line { background-color: #4e682c; height: 5px; diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css index 6bdcc1dcaf..84b30b0444 100644 --- a/pandora_console/include/styles/pandora_red.css +++ b/pandora_console/include/styles/pandora_red.css @@ -32,7 +32,7 @@ font-size: 8pt; } body { - margin-top: 0; + text-align: center; } input, textarea { border: 1px solid #ddd; @@ -43,7 +43,7 @@ textarea { padding: 5px; height: 100px; font-family: verdana, sans-serif; - font-size: 8pt; + font-size: 8pt; } input { padding: 2px 3px 4px 3px; @@ -60,7 +60,7 @@ select { padding: 0px; border:1px solid #ddd; font-family: verdana, sans-serif; - font-size: 8pt; + font-size: 8pt; } checkbox { padding: 4px; @@ -69,19 +69,19 @@ checkbox { h1, h2, h3 { font: bold 1em Arial, Sans-serif; text-transform: uppercase; - color: #778855; + color: #786; padding-bottom: 5px; padding-top: 7px; } -h3 { - font-size: 13px; -} h1 { font-size: 16px; } h2 { font-size: 15px; } +h3 { + font-size: 13px; +} a { color: #d81616; font-weight: bold; @@ -92,54 +92,43 @@ a:hover { text-decoration: underline; } a.white_bold { - color: #eeeeee; + color: #eee; text-decoration: none; font-weight: bold; } a.white { - color: #eeeeee; + color: #eee; text-decoration: none; } p.center { text-align: center; } h1#log { - border-bottom: 1px solid #778866; - padding-bottom: 3px; - margin-top: 5em; - width: 29em; - text-align: left; + font-size: 18px; + margin-bottom: 0px; + color: #000; } -h1#log_f, h1#db_fh1 { - color: #ff0000; - border-bottom: 1px solid #ff0000; +h1#log_f { + color: #f00; + border-bottom: 1px solid #f00; padding-bottom: 3px; } div#login { - text-align: left; - border: 1px solid #999999; - margin-top: 2em; - margin-bottom: -1em; - padding: 0.5em; - width: 40em; - background: url(../../images/backgrounds/background10.jpg); + margin: 0 auto; + margin-top: 200px; + width: 460px; + border-left: solid 1px #000; + border-top: solid 1px #000; + border-bottom: solid 2px #000; + border-right: solid 2px #000 +} +div#login_in, #login_f { + margin: 0 auto; + width: 400px; } div#login_f { - text-align: left; - margin: auto; - padding: 0.5em; - width: 48em; - margin-top: 5em; -} -div#login_box { - float: right; - padding-right: 10px; - margin-top: 25px; - width: 140px; -} -div#logo_box { - margin-top: 25px; - padding-left: 5px; + margin-top: 10px; + margin-bottom: 25px; } div#noaccess { width: 350px; @@ -165,11 +154,21 @@ div#db_ftxt { float: right; padding-top: 10px; } +div#container { + margin: 0 auto; + width: 960px; + text-align: left; + border-left: solid 2px #000; + border-right: solid 2px #000; + border-top: solid 2px #000; + margin-top: 5px; +} div#page { width: 960px; background: #fff; clear: both; - border-bottom: solid 5px #778855; + border-bottom: solid 5px #786; + border-top: solid 5px #786; } div#main { width: 780px; @@ -211,7 +210,7 @@ div#foot { } #ip { margin-top: 10px; - clear: both; + margin-bottom: 5px; } label { display: block; @@ -235,7 +234,7 @@ input.datos_readonly { background-color: #050505; } input.login { - border-color: #778866; + border-color: #786; background-color: #f5f5f5; margin: 2px 0 8px; width: 90px; @@ -266,14 +265,9 @@ input.delete { table, img { border: 0px; } -th, td.lb { +th, td.lb, td.lb_view { color: #fff; - background-color: #778866; -} -td.lb_view { - color: #fff; - /*background-color: #7ba04a;*/ - background-color: #778866; + background-color: #786; } td.lb, td.lb_view { height: 16px; @@ -287,7 +281,6 @@ td.datos2, td.datos2t, td.datos2b, td.datos2_id , td.datos2f9 { background-color: #efefef; } td.datos3 { - /*background-color: #a7b896;*/ background-color: #d4ddc6; } td.datos_id { @@ -296,8 +289,8 @@ td.datos_id { td.datos_jus, td.datos2_jus { text-align: justify; } -.bg , .bgt { /* op menu */ - background-color: #778855; +.bg { /* op menu */ + background-color: #786; } .bg2 { /* main page */ background-color: #d84437; @@ -366,7 +359,7 @@ td.datos_jus, td.datos2_jus { font-weight: bold; } .raya { - border-top: 1px solid #778866; + border-top: 1px solid #786; width: 100%; } .raya, .noraya { @@ -405,12 +398,6 @@ td.datos_jus, td.datos2_jus { margin-top: 15px; text-align: justify; } -.mr40 { - margin-right: 40px; -} -.mt35 { - margin-top: 35px; -} ul.mn { list-style: none; padding: 0px 0px 0px 0px; @@ -430,22 +417,6 @@ div.nf { margin-left: 7px; padding: 2px 1px 6px 25px; } -div#wizard { - text-align: left; - border: 1px solid #999; - margin-top: 3em; - margin-bottom: -1em; - padding: 20px; - width: 600px; - background-color: #fff; - background: url(../../images/background8.jpg); -} -div#install_box { - float: right; - padding-right: 20px; - margin-top: 10px; - width: 350px; -} div.title_line { background-color: #4e682c; height: 5px; @@ -493,8 +464,7 @@ div.title_line { float: left; position: relative; } -#menu_tab_left li a, #menu_tab_left li.nomn a { - background: #ac4444; +#menu_tab_left li a { background: #d84437; padding: 2px 10px 2px 10px; color: #fff; @@ -505,6 +475,13 @@ div.title_line { display: block; text-decoration: none; } +#menu_tab_left li.view a { + background: #6a4; + padding: 2px 10px 2px 10px; + color: #fff; + font-weight: bold; + line-height: 18px; +} span.users { background: url(../../images/group.png) no-repeat; } @@ -544,17 +521,16 @@ span.master, span.snmp, span.binary, span.recon { } /* New styles for data box */ .databox, .databox_color, .databox_frame { - margin-bottom: 10px; + margin-bottom: 15px; margin-top: 5px; margin-left: 0px; border: 1px solid #f2f2f2; } .databox { - margin: 0px; background-color: #fafafa; } .databox_color { - border-left: 4px solid #778855; + border-left: 4px solid #786; } #head_l { float: left; diff --git a/pandora_console/install.php b/pandora_console/install.php index 6390866a81..5fdb4eb5d8 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -34,8 +34,11 @@ - - + + + + +

Pandora FMS installation wizard. Step #1 of 4

Welcome to Pandora FMS installation Wizard

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

-

In three steps checks all dependencies and make your configuration for a quick installation.

+

In three steps checks all dependencies and make your configuration for a quick installation.

For more information, please refer to documentation.

- Pandora FMS Development team + Pandora FMS Development Team "; if (file_exists("include/config.php")){ - echo "

Warning: You already have a config.php file. Configuration and database would be overwritten if you continued.

"; + echo "
Warning: You already have a config.php file. Configuration and database would be overwritten if you continued.
"; } echo "
-
-
-
-
+
+

-
+
-
-
- +
+
+ Pandora FMS is a Free Software project registered at + SourceForge +
"; } function install_step2() { echo " -
+

Pandora FMS console installation wizard. Step #2 of 4

"; @@ -198,34 +199,34 @@ function install_step2() { //$res += check_exists ("/usr/bin/pdflatex","PDF Latex in /usr/bin/pdflatex"); echo "
-
- -
-
+
+

-
"; +
"; if ($res > 0) { - echo "

You have some uncomplete + echo "

You have some uncomplete dependencies. Please correct them or this installer will not be able to finish your installation. -

+
Ignore it. Force install Step #3"; } else { echo ""; } echo "
-
-
-
"; +
+
+ Pandora FMS is a Free Software project registered at + SourceForge +
+
"; } + function install_step3() { echo " -
+

Pandora FMS console installation wizard. Step #3 of 4

@@ -236,7 +237,10 @@ function install_step3() { Information about root user will not be used or stored anymore.

- Now, please, complete all details to configure your database and enviroment setup. NOTICE that database will be destroyed if it already exists!. + Now, please, complete all details to configure your database and enviroment setup. +

+

+ NOTICE that database will be destroyed if it already exists!

DB User with privileges on MySQL
@@ -259,27 +263,24 @@ function install_step3() {
Full local URL to Pandora FMS Console.
For example http://localhost/pandora_console
- + -
+
-
- -
-
+
+

- "; } - function install_step4() { $pandora_config = "include/config.php"; @@ -308,7 +309,7 @@ function install_step4() { $step3=0; $step4=0; $step5=0; $step6=0; $step7=0; echo " -
+

Pandora FMS Console installation wizard. Step #4 of 4

@@ -343,7 +344,7 @@ function install_step4() { $cfgout = fopen ($pandora_config,"w"); $config_contents = fread ($cfgin, filesize("include/config.inc.php")); - $config_new = '
-
- -
-
+
+

-
"; +
"; if ($everything_ok == 1) { echo ""; } else { - echo " You got some problems. Installation is not completed. -

Please correct failures before trying again. All database schemes created in this step have been dropped.

"; + echo "
There was some problems. Installation is not completed. +

Please correct failures before trying again. + All database schemes created in this step have been dropped.

"; if (mysql_error() != "") - echo "

ERROR: ". mysql_error()."

"; + echo "
ERROR: ". mysql_error().".
"; mysql_query ("DROP DATABASE $dbname"); } echo "
- "; } + function install_step5() { echo " -
+

Pandora FMS console installation wizard. Finished

Installation complete

-

You now must delete manually this installer for security, ('install.php') before trying to access to your Pandora FMS console. +

You now must delete manually this installer ('install.php') file for security before trying to access to your Pandora FMS console.

Don't forget to check http://pandora.sourceforge.net for updates. -

Click here to access to your Pandora FMS console

+

Click here to access to your Pandora FMS console

-
-
-
-
+
+


-