From 8d3534238a0ba97a56f96201b8d0d2582d25917e Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Wed, 2 Oct 2013 14:51:02 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8844 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 17 +++ pandora_console/general/error_screen.php | 1 + pandora_console/general/pandora_help.php | 7 +- pandora_console/images/dot_green.png | Bin 554 -> 1100 bytes pandora_console/images/dot_red.png | Bin 526 -> 1099 bytes .../images/pandora_tinylogo_open.png | Bin 0 -> 4490 bytes pandora_console/images/warn.png | Bin 0 -> 1442 bytes pandora_console/include/styles/install.css | 80 ++++++++--- pandora_console/include/styles/pandora.css | 2 +- pandora_console/install.php | 136 +++++++++--------- 10 files changed, 159 insertions(+), 84 deletions(-) create mode 100755 pandora_console/images/pandora_tinylogo_open.png create mode 100755 pandora_console/images/warn.png 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 92578043c42f0eb9d2a6d1ee0ee9c717bd27646f..aa1561471c40a2e2be65f045b74192f8809ad4e1 100644 GIT binary patch literal 1100 zcmaJ=TSyd97(T1A+LC0@g9+hjyb$8foY{6=c5-zuvztqe$hy!zIy-aJLFeMkv0aTo zMM&!*NrDOr!5(~ydg-B{q{~B3LD7p31wm906%;*1bVl8+hqi&kod4(lzW@6#XL)Gw zc%!ey2LNcy42W6!-|LM_-TaSnK6i5@*7TDnL)&kVrv%BOar=%a>1M?QHCnrDM7a? zw1%_WCfYErBwHNMBDbV+pd|f2RM#uf4$0y_djCo6dO#&bVp8gXt8LL*XJgSOymqE8^W)a)kX{@GgQ-|9{ z3tDw8VpYCftXfqIN>#;jR1D{i_ODTwU37okYh`h%QCWR#(0#Y*VlS$}1N2cm$cXV= zX{#^-7Ve$>@$G7?Zsj^?iow@sI^hWb=bGc)O|>_@a4z=97yH@z#G83@&i8Aq5UT;6 zx)47{qH0+-&$&-Z|-wj;At!v$MNeQ-W~aNl<(H7MRnj4b>HfQee{ literal 554 zcmV+_0@eMAP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4J8)e>H)?800F8=L_t&-(@oL8YZGA{$MMheJa^%|7)^sc2Qgr^g@}~Up@ljLnG~w_ zU+5p;>JSj5n}dUMR!7kaig2Kd3YBU^DnSR~rb>!;m)w)wJ>TbtOF`fBdwVgQ)ZM|N z@Yyco=oxZt;j_e9#D-jdIKUVH*vWXquZd?{H}BNfu5S8g>I<026bIiw(92iPB`LE# z9N;bM?qJcci68gxJ!qb5MX&@IW5F2*^MLW6-+1)oVMb(D#Dxv^cmX3{vHosSJ`br1A)>%NsrzdY)0P zeL7gcagl&b39H4P{lq zV*xtRby?wub{8 svi}9SV7rW=XN_xf!4l^XTk}uwFZ8D27hKW{I{*Lx07*qoM6N<$f-xoVA^-pY diff --git a/pandora_console/images/dot_red.png b/pandora_console/images/dot_red.png index 5e9ed081e57abcf76a3c8c6c2c080194f313ec19..25aa610aefcbc8ed2c0f4cdbbe9d148824a51ffe 100644 GIT binary patch literal 1099 zcmaJ=OH30%7@krfNI)vYM2V4cH69Gz7cJOLtJ`)dt+J#kHTK|v?e5U7un%?zS}-P+ zAO_<>Z+h_Ng^TgxNsWoogL?9$F#$T+0SWjl$=dV0Y@;|pVX zbzw@4Xw><0Fj^IefPt_AtH!kH3e_03tt*hb=VmCl4Z%|}YA30JoP|ltK`>0SL6sfk z;9!X6LTn@y>4!Yau?)vE>`;(nh47HTa&Y&fNHj;A6mn8(Hx{vCR2gGiV37J}BNXS(k-Nw3QLQhdCTC+GtkxX|=Fzh{9)7@$)Zk@Mi}(K9o!h@+poR z=HpyyD4CE_kwlmcB|?chSF+Su1DUwa)%LkkL$0?BhD{<%$kFGJmU1iuZWk@+jdO`N z)Z681jdMvfLZivyF(T`UAlUlJc<_?DW0!>E>3{O z-}i3(cpx_4eFy>~T)%c2UIegqB;FtJKWc?F@m0I{tMB#X5+~MHd(Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4JIPhbEdEW00E9kL_t&-(@l}jN*iGm#n1g_CTS;a69z<(7(y3y>B?^07#J57p~VO2 zlSEvYeV?H(APTyX!S39M4^WpwaKyqS)0vFs`*Uv>BhmwhvpI{y?+{*e-0!cni6$OV zteFQbrBWx7EJenL)9D`opqJt(RO;kg9Cv#A`+*-tuz8O8`MEhwl10sYa5$a*qT_yl zB~I!*EO=xF}T{K@;$?fy8}-TnM-d)woxf*1p_7F^eG zMFBsGFf2>&cbZ1ZBZ_-_djZ!qxT@gF60R)4RRyjp*vCh_AB_S9#Qrn$!0UElvJ9+s zGr?Mjb6~9j0B<)oU_=J~8>Lc{Wgl5i{#jt^uXc+1!N9bDZ7WEG#g7<=iGZ z`MR~$`LMGSwAR+3@9**V>dKtm-Y%9R4d?$K^nnQx#ZF}45v3xMSm5=+f376uxjdNF Qvj6}907*qoM6N<$g2MIXSO5S3 diff --git a/pandora_console/images/pandora_tinylogo_open.png b/pandora_console/images/pandora_tinylogo_open.png new file mode 100755 index 0000000000000000000000000000000000000000..9fde16108807535eb467640e18846b5a148e7c99 GIT binary patch literal 4490 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 KOdsOi+5ZRLM8bst literal 0 HcmV?d00001 diff --git a/pandora_console/images/warn.png b/pandora_console/images/warn.png new file mode 100755 index 0000000000000000000000000000000000000000..11c98b8b672c91c2ea843a844ee01312cb25e4f6 GIT binary patch literal 1442 zcmbVMZ%i9y7{9ipz_1(W$S6#5yE0b|^xnIcUVGBf(rcwkffN$@VLFcXN>6C-ydG;o zhaDu0Iif(e#)gEj=m*`5AuJ?jYJ>z0BPQbJ*fcH?hr_>f$+m2=30{GsAC`UalFPl% zbHCs7|9Owq*FLA(R=5pdjI@knHS@$vY`Qba=%EE+9r}fq`s(u7!bJ zA-a|EFtoq(mGevm1Sx`SqgV90Ye*j#($Oi5E*9b?HUw2v#(3J-#)xnW)5?Y|$e$m7 zhQO@ff;5%8ft$B8LAJU}U>dq=8+~1EKC>UG+z(g8NXbBm5otIUY7a-qm<3t4OG@XI z8b#oBh}dR9HiGiH>tQ=5FmSmJl=*-WgN+6qW&mb`xfI3$22cz~0a1nlvYa3R25&xy zlv zpTP1W%Z1^TMY@IS5G{xl=|&16-tFEp9FA-jN-7x|qj?n50W=g!<+YBEh#uzOFdmAI zGR}>Whv1X?5zwT`Qtck?CalVca6Bb>R1(E*f{H&j(jFcYN z+e{dR1EUGUOg1CsbP%}NQH4=@45V#5jBB7MKu`q0^#qP#4t zt}7f7>9CJU`(-7+8(gFFkzCR)Fto@CjU3mWo`CuwCvuS>$HVr9avcV{X&)O-X;KZ^ z$d_US_7LND3S0d%x_y4#0?PE-*7* ztcEgjYhB}Lfm&^Iews<=7G-$H-i){PPNinput { + 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