From 7433d1296eff1b9d31470b1d1b018b84226dc961 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 18 Jan 2023 19:32:31 +0100 Subject: [PATCH] cambiado footer y popup --- pandora_console/include/styles/install.css | 25 +++++++---- pandora_console/install.php | 52 ++++++++++++---------- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/pandora_console/include/styles/install.css b/pandora_console/include/styles/install.css index 559d080461..5c09b7e6b7 100644 --- a/pandora_console/include/styles/install.css +++ b/pandora_console/include/styles/install.css @@ -30,7 +30,9 @@ font-style: normal; font-display: swap; } - +html { + background-color: #959595; +} #install_container { max-width: 1000px; margin: 0 auto; @@ -397,6 +399,7 @@ input:checked + .slider:before { background-color: #000; opacity: 0.6; visibility: hidden; + top: 0; } .popup { @@ -406,17 +409,22 @@ input:checked + .slider:before { top: 50%; transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%); - background-color: #fff; z-index: 9999; display: none; + font-family: "Circular Std Book"; +} +.popup .btn_primary.outline { + color: #14524f; + border-color: #14524f; + margin: 0px 20px; } - .popup-title { - background-color: #82b92e; + background-color: #14524f; padding: 10px 20px; color: #fff; font-size: 12pt; text-align: center; + border-radius: 10px 10px 0px 0px; } .popup-inner { @@ -425,10 +433,11 @@ input:checked + .slider:before { /* overflow-y: scroll;*/ padding: 25px 35px; font-size: 11pt; + border-radius: 0px 0px 10px 10px; } .popup-button-green { - background-color: #82b92e; + background-color: #14524f; border: 1px solid transparent; color: #fff; } @@ -439,11 +448,11 @@ input:checked + .slider:before { .popup-button-green:hover { background-color: transparent; - border: 1px solid #82b92e; - color: #82b92e; + border: 1px solid #14524f; + color: #14524f; } .popup-button-green:hover span { - color: #82b92e; + color: #14524f; } /* POPUP -END */ diff --git a/pandora_console/install.php b/pandora_console/install.php index a37ae563cd..b1eca3392b 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -88,8 +88,6 @@ } function popupShow(){ document.getElementsByTagName('body')[0].style["margin"] = "0"; - document.getElementById('install_container').style["padding-top"] = "45px"; - document.getElementById('install_container').style["margin-top"] = "0"; document.getElementById('add-lightbox').style["visibility"] = "visible"; document.getElementById('open_popup').style["display"] = "block"; document.getElementById('open_popup').style["visibility"] = "visible"; @@ -122,10 +120,11 @@
Attention, you are going to overwrite the data of your current installation.

This means that if you do not have a backup you will irremissibly LOSE ALL THE STORED DATA, the configuration and everything relevant to your installation.

Are you sure of what you are going to do?

'; + echo '

Attention, you are going to overwrite the data of your current installation.

+

This means that if you do not have a backup you will irremissibly LOSE ALL THE STORED DATA, the configuration and everything relevant to your installation.

Are you sure of what you are going to do?

'; echo "
"; - echo ""; - echo ""; + echo ""; + echo ""; echo '
'; ?>
@@ -135,7 +134,6 @@ $version = '7.0NG.767'; $build = '230117'; $banner = "v$version Build $build"; - error_reporting(0); // --------------- @@ -508,10 +506,6 @@ function install_step1() please be sure that you have no valuable Pandora FMS data in your Database.
"; - 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 "
You need to setup permissions to be able to write in ./include directory
"; } @@ -534,8 +528,8 @@ function install_step1()
- Pandora FMS is an OpenSource Software project registered at - SourceForge →"; + © ".date('Y')." Pandora FMS + "; if ($writable === 0) { echo ""; } @@ -573,8 +567,8 @@ function install_step1_licence()
- Pandora FMS is an OpenSource Software project registered at - SourceForge →"; + © ".date('Y')." Pandora FMS + "; if (file_exists('COPYING')) { echo ""; } @@ -646,8 +640,8 @@ function install_step2()
- Pandora FMS is an OpenSource Software project registered at - SourceForge →"; + © ".date('Y')." Pandora FMS + "; if ($res > 0) { echo "Ignore it."; } else { @@ -816,8 +810,8 @@ function install_step3() echo "
Previous step - Pandora FMS is an OpenSource Software project registered at - SourceForge →"; + © ".date('Y')." Pandora FMS + "; if (!$error) { echo ""; echo ''; @@ -1165,6 +1159,10 @@ function install_step4() foreach ($errors as $key => $err) { $info .= '
'.$err.'
'; } + + $info .= "
If you use MySQL 8 make sure to include the + following parameter in your installation's my.cnf configuration file
+ sql_mode=\"\"
"; } $info .= "
There were some problems. @@ -1185,7 +1183,10 @@ function install_step4() switch ($engine) { case 'mysql': if (mysql_error() != '') { - echo "
ERROR: ".mysql_error().'.
'; + echo "
".mysql_error().'.
'; + echo "
If you use MySQL 8 make sure to include the + following parameter in your installation's my.cnf configuration file
+ sql_mode=\"\"
"; } if ($step1 == 1) { @@ -1195,7 +1196,10 @@ function install_step4() case 'mysqli': if ($connection && mysqli_error($connection) != '') { - echo "
ERROR: ".mysqli_error($connection).'.
'; + echo "
".mysqli_error($connection).'.
'; + echo "
If you use MySQL 8 make sure to include the + following parameter in your installation's my.cnf configuration file
+ sql_mode=\"\"
"; } if ($step1 == 1) { @@ -1213,8 +1217,8 @@ function install_step4()