tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed visual styls of install page. Ticket #448

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-03-07 10:59:22 +01:00
parent 4b8ec8e5ae
commit 15bcd0add8
7 changed files with 88 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/icono_critical_install.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 730 B

BIN
pandora_console/images/icono_info_install.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 728 B

BIN
pandora_console/images/icono_warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 733 B

BIN
pandora_console/images/icono_warning_install.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 733 B

BIN
pandora_console/images/logo_opensource.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

60
pandora_console/include/styles/install.css
View File

@ -23,8 +23,7 @@ h1 {
text-align: center; text-align: center;
} }
h2 { h2 {
font: bold 1em Arial, Sans-serif; font: Verdana;
border-bottom: solid 1px #00aa00;
font-size: 16px; font-size: 16px;
} }
@ -40,7 +39,6 @@ div#logo_img {
} }
div#wizard { div#wizard {
text-align: left; text-align: left;
border: 1px solid #999;
margin-top: 1em; margin-top: 1em;
width: 650px; width: 650px;
@ -51,7 +49,6 @@ div#wizard {
margin-top: 0px; margin-top: 0px;
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
border-radius: 10px;
position: relative; position: relative;
} }
@ -74,19 +71,13 @@ div#install_box, div#install_img {
div#install_box { div#install_box {
background: F3F3F3; background: F3F3F3;
-moz-border-radius: 8px; border: 1px solid #ccc;
-webkit-border-radius: 8px;
border-radius: 8px;
border: 0px;
padding: 10px 25px; padding: 10px 25px;
margin-top: 10px; margin-top: 40px;
-moz-box-shadow: -1px 1px 6px #aaa;
-webkit-box-shadow: -1px 1px 6px #aaa;
box-shadow: -1px 1px 6px #aaa;
} }
div#install_box h2 { div#install_box h2 {
color: #00aa00; color: #82B92E;
text-transform: uppercase; text-transform: uppercase;
} }
@ -114,22 +105,25 @@ input#step4, input#step4:hover {
background-color: #fafafa; background-color: #fafafa;
} }
div.warn { div.warn {
background: url(../../images/warn.png) no-repeat 0% -2px; min-height: 24px;
color: #880; background: url(../../images/icono_warning_install.png) no-repeat 0% -2px;
margin-top: 7px; color: #222;
padding: 2px 1px 6px 30px; margin-top: 14px;
padding: 2px 1px 6px 40px;
} }
div.info { div.info {
background: url(../../images/info.png) no-repeat 0% -2px; min-height: 24px;
color: #222; background: url(../../images/icono_info_install.png) no-repeat 0% -2px;
margin-top: 7px; color: #222;
padding: 2px 1px 6px 30px; margin-top: 14px;
padding: 2px 1px 6px 40px;
} }
div.err { div.err {
background: url(../../images/error_red.png) no-repeat 0% -2px; min-height: 24px;
color: #cc0000; background: url(../../images/icono_critical_install.png) no-repeat 0% -2px;
margin-top: 7px; color: #cc0000;
padding: 2px 1px 6px 30px; margin-top: 14px;
padding: 2px 1px 6px 40px;
} }
span.arr { span.arr {
background: url(../../images/arrow.png) no-repeat; background: url(../../images/arrow.png) no-repeat;
@ -152,8 +146,22 @@ body{
} }
div.installation_step { div.installation_step {
position: absolute; position: static;
float: right;
top: 7px; top: 7px;
right: 10px; right: 10px;
color: #666; color: #666;
margin-top: 14px;
margin-right: 12px;
}
.btn_install_next {
margin: 10px;
padding: 8px 20px 8px 20px;
background-color: transparent;
border: 1px solid #82B92E;
font: bold 1em Verdana;
font-size: 14pt;
color: #82B92E;
border-radius: 0%;
} }

88
pandora_console/install.php
View File

@ -150,41 +150,52 @@ function check_exists ( $file, $label ) {
} }
function check_generic ( $ok, $label ) { function check_generic ( $ok, $label ) {
echo "<tr><td>"; echo "<tr><td style='width:10%'>";
echo "<span class='arr'> $label </span>";
echo "</td><td>";
if ($ok == 0 ) { if ($ok == 0 ) {
echo " <img src='images/dot_red.png'>"; echo " <img src='images/dot_red.png'>";
echo "<td>";
echo "<span class='arr'> $label </span>";
echo "</td>";
echo "</td></tr>";
return 1; return 1;
} }
else { else {
echo " <img src='images/dot_green.png'>"; echo " <img src='images/dot_green.png'>";
echo "<td>";
echo "<span class='arr'> $label </span>";
echo "</td>";
echo "</td></tr>";
return 0; return 0;
} }
echo "</td></tr>";
} }
function check_writable ( $fullpath, $label ) { function check_writable ( $fullpath, $label ) {
echo "<tr><td>"; echo "<tr><td style='width:10%;'>";
echo "<span class='arr'> $label </span>";
echo "</td><td>";
if (file_exists($fullpath)) if (file_exists($fullpath))
if (is_writable($fullpath)) { if (is_writable($fullpath)) {
echo " <img src='images/dot_green.png'>"; echo " <img style='margin-left:50px;' src='images/dot_green.png'>";
echo "<td>";
echo "<span class='arr'> $label </span>";
echo "</td>";
echo "</td></tr>"; echo "</td></tr>";
return 0; return 0;
} }
else { else {
echo " <img src='images/dot_red.png'>"; echo " <img style='margin-left:50px;' src='images/dot_red.png'>";
echo "<td>";
echo "<span class='arr'> $label </span>";
echo "</td>";
echo "</td></tr>"; echo "</td></tr>";
return 1; return 1;
} }
else { else {
echo " <img src='images/dot_red.png'>"; echo " <img style='margin-left:50px;' src='images/dot_red.png'>";
echo "<td>";
echo "<span class='arr'> $label </span>";
echo "</td>";
echo "</td></tr>"; echo "</td></tr>";
return 1; return 1;
} }
} }
function check_variable ( $var, $value, $label, $mode ) { function check_variable ( $var, $value, $label, $mode ) {
@ -269,16 +280,19 @@ function random_name ($size) {
function print_logo_status ($step, $step_total) { function print_logo_status ($step, $step_total) {
global $banner; global $banner;
return " $header = "
<div id='logo_img'> <div id='logo_img' style='width: 100%;'>
<div> <div style='width:100%; background-color:#333333;'>
<img src='images/pandora_tinylogo_open.png' border='0'><br> <img src='images/logo_opensource.png' border='0'><br>
<span style='font-size: 9px;'>$banner</span> <span style='font-size: 9px;'>$banner</span>
</div>
<div class='installation_step'>
<b>Install step $step of $step_total</b>
</div> </div>
</div>"; </div>";
$header .= "
<div class='installation_step'>
<b>Install step $step of $step_total</b>
</div>";
return $header;
} }
// //
@ -361,14 +375,17 @@ function install_step1() {
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 you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup.
</div>"; </div>";
echo "<br>";
if ($writable == 0) { if ($writable == 0) {
echo "<div style='text-align:right; width:100%;'>";
echo "<a id='step11' href='install.php?step=11'><button type='submit' class='btn_install_next'>Next</button></a>";
echo "</div>"; echo "</div>";
echo "<a id='step11' href='install.php?step=11'><img align='right' style='margin-top: 20px;' src='images/arrow_next.png' border='0'></a>";
} }
else { else {
echo "<div class='err'><b>ERROR:</b>You need to setup permissions to be able to write in ./include directory</div>"; echo "<div class='err'><b>ERROR:</b>You need to setup permissions to be able to write in ./include directory</div>";
echo "</div>";
} }
echo "</div>";
echo "<div style='clear:both;'></div>"; echo "<div style='clear:both;'></div>";
echo " echo "
@ -402,7 +419,7 @@ function install_step1_licence() {
echo file_get_contents ("COPYING"); echo file_get_contents ("COPYING");
echo "</textarea>"; echo "</textarea>";
echo "<p>"; echo "<p>";
echo "<div style='text-align: right;'><input type=submit value='Yes, I accept licence terms'></div>"; echo "<div style='text-align: right;'><button class='btn_install_next' type='submit'>Yes, I accept licence terms</button></div>";
} }
echo "</div>"; echo "</div>";
@ -472,17 +489,18 @@ function install_step2() {
your HTTP/Apache server after it to use the new your HTTP/Apache server after it to use the new
modules. modules.
</div> </div>
<div style='text-align: right;'> <div style='text-align:right; width:100%;'>
Ignore it. <a href='install.php?step=3' style='font-weight: bolder;'>Force install Step #3</a> Ignore it. <a href='install.php?step=3' style='font-weight: bolder;'><button class='btn_install_next' type='submit'>Force install Step #3</button></a>
</div>"; </div>";
echo "</div>";
} }
else { else {
echo "</div>"; echo "<div style='text-align:right; width:100%;'>";
echo "<a id='step3' href='install.php?step=3'><br> echo "<a id='step3' href='install.php?step=3'><br>
<img align='right' src='images/arrow_next.png' border='0' alt=''></a> <button class='btn_install_next' type='submit'>Next</button></a>";
<div style='clear: both;'><!-- --></div>"; echo "</div>";
echo "<div style='clear: both;'><!-- --></div>";
} }
echo "</div>";
echo " echo "
</div> </div>
<div style='clear: both;'><!-- --></div> <div style='clear: both;'><!-- --></div>
@ -616,13 +634,15 @@ function install_step3() {
</table> </table>
"; ";
if (!$error) {
echo "<div style='text-align:right; width:100%;'>";
echo "<a id='step4' href='install.php?step=4'><br>
<button class='btn_install_next' type='submit'>Next</button></a>";
echo "</div>";
}
echo "</div>"; echo "</div>";
if (!$error) {
echo "<input type='image' src='images/arrow_next.png' value='Step #4' id='step4'>";
}
echo "</form>"; echo "</form>";
echo "<div style='clear:both;'></div>"; echo "<div style='clear:both;'></div>";
@ -945,10 +965,10 @@ function install_step5() {
for updates. for updates.
<p>Select if you want to rename '<i>install.php</i>'.</p> <p>Select if you want to rename '<i>install.php</i>'.</p>
<form method='post' action='index.php'> <form method='post' action='index.php'>
<input type='submit' name='rn_file' value='Yes, rename the file'> <button class='btn_install_next' type='submit' name='rn_file'>Yes, rename the file</button>
<input type='hidden' name='rename_file' value='1'> <input type='hidden' name='rename_file' value='1'>
</form> </form>
<p><br><b><a id='access_pandora' href='index.php'>Click here to access to your Pandora FMS console</a>.</b> <p><br><b><a id='access_pandora' href='index.php'><button class='btn_install_next' type='submit'>Click here to access to your Pandora FMS console</button></a>.</b>
</p> </p>
</div>"; </div>";