2012-03-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

* images/splash_error.png: Added background image for error views.
	
	* include/styles/pandora.css
	 general/error_emptyconfig.php
	 general/error_perms.php
	 general/error_authconfig.php
	 general/error_noconfig.php
	 general/error_install.php
	 general/error_dbconfig.php: Changed views to the new look and feel. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5851 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-03-30 14:42:12 +00:00
parent 20166ab06b
commit 1871936edc
9 changed files with 147 additions and 64 deletions

View File

@ -1,3 +1,15 @@
2012-03-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/splash_error.png: Added background image for error views.
* include/styles/pandora.css
general/error_emptyconfig.php
general/error_perms.php
general/error_authconfig.php
general/error_noconfig.php
general/error_install.php
general/error_dbconfig.php: Changed views to the new look and feel.
2012-03-30 Vanessa Gil <vanessa.gil@artica.es> 2012-03-30 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb_data.sql * pandoradb_data.sql

View File

@ -32,14 +32,18 @@
</head> </head>
<body> <body>
<div id="main" style=' width: 80%; margin:0 auto 0 auto;'>
<div align='center'>
<div id='login_f'> <img src="images/login_background.png" id="login_body">
<h1 id="log_f" class="error">Problem with Pandora FMS auth system</h1> <div class="databox_error" id="login">
<div> <br>
<img src="images/pandora_logo.png" border="0"> <h1 id="log">Problem with Pandora FMS database</h1>
</div> <br>
<div class="msg"> <div style="width: 440px; margin: 0 auto auto;">
<table cellpadding="4" cellspacing="1" width="440">
<tr><td align="left">
<a href="index.php"><img src="images/pandora_login.png" border="0" height="100px" alt="Pandora FMS"></a>
</td><td valign="bottom">
Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br /><br /> Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br /><br />
Probably one or more of your user, database or hostname values are incorrect or Probably one or more of your user, database or hostname values are incorrect or
the database server is not running.</i><br /><br /><span class="error"> the database server is not running.</i><br /><br /><span class="error">
@ -51,8 +55,15 @@
<div class="msg"> <div class="msg">
If you have modified auth system, problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><br><pre>DELETE FROM tconfig WHERE token = "auth";</pre> If you have modified auth system, problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>
</div> </div>
</td></tr>
</table>
</div> </div>
<br>
</div> </div>
<div id="bottom_logo">
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
</div> </div>
</body> </body>

View File

@ -32,22 +32,31 @@
</head> </head>
<body> <body>
<div id="main" style='float:left; margin-left: 100px'>
<div align='center'> <img src="images/login_background.png" id="login_body">
<div id='login_f'> <div class="databox_logout" id="login">
<h1 id="log_f" class="error">Problem with Pandora FMS database</h1> <br>
<div> <h1 id="log">Problem with Pandora FMS database</h1>
<img src="images/pandora_logo.png" border="0"> <br>
</div> <div style="width: 440px; margin: 0 auto auto;">
<div class="msg"> <table cellpadding="4" cellspacing="1" width="440">
<tr><td align="left">
<a href="index.php"><img src="images/pandora_login.png" border="0" height="100px" alt="Pandora FMS"></a>
</td><td valign="bottom">
Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br><br> Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br><br>
Probably one or more of your user, database or hostname values are incorrect or Probably one or more of your user, database or hostname values are incorrect or
the database server is not running.</i><br /><br /><span class="error"> the database server is not running.</i><br /><br /><span class="error">
<b>DB ERROR:</b><?php echo db_get_last_error(); ?></span> <b>DB ERROR:</b><?php echo db_get_last_error(); ?></span>
<br>&nbsp; <br>&nbsp;
</td></tr>
</table>
</div> </div>
<br>
</div> </div>
</div>
<div id="bottom_logo">
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
</div> </div>
</body> </body>

View File

@ -32,22 +32,31 @@
</head> </head>
<body> <body>
<div id="main" style='float:left; margin-left: 100px'> <img src="images/login_background.png" id="login_body">
<div align='center'> <div class="databox_error" id="login">
<div id='login_f'> <br>
<h1 id="log_f" class="error">Empty configuration table</h1> <h1 id="log">Empty configuration table</h1>
<div> <br>
<img src="images/pandora_logo.png" border="0"> <div style="width: 440px; margin: 0 auto auto;">
</div> <table cellpadding="4" cellspacing="1" width="440">
<div class="msg"> <tr><td align="left">
<a href="index.php"><img src= <?php echo '"'.$relative_link . 'images/pandora_login.png"' ?> border="0" height="100px" alt="Pandora FMS"></a>
</td><td valign="bottom">
<br><br>
Cannot load configuration variables from database. Please check your database setup in the Cannot load configuration variables from database. Please check your database setup in the
<b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br><br> <b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br><br>
Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date. Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid <br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i> permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>
</td></tr>
</table>
</div> </div>
<br>
</div> </div>
</div>
<div id="bottom_logo">
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
</div> </div>
</body> </body>

View File

@ -32,19 +32,29 @@
</head> </head>
<body> <body>
<div id="main" style=' width: 80%; margin:0 auto 0 auto;'> <img src="images/login_background.png" id="login_body">
<div align='center'> <div class="databox_logout" id="login">
<div id='login_f'> <br>
<h1 id="log_f" class="error">Installer active</h1> <h1 id="log">Installer active</h1>
<div> <br>
<img src="images/pandora_logo.png" border="0" alt="Pandora FMS"> <div style="width: 440px; margin: 0 auto auto;">
</div> <table cellpadding="4" cellspacing="1" width="440">
<div class="msg"><br><br> <tr><td align="left">
<a href="index.php"><img src="images/pandora_login.png" border="0" height="100px" alt="Pandora FMS"></a>
</td><td valign="bottom">
For security reasons, normal operation is not possible until you delete installer file. For security reasons, normal operation is not possible until you delete installer file.
Please delete the <i>./install.php</i> file before running Pandora FMS Console. Please delete the <i>./install.php</i> file before running Pandora FMS Console.
</td></tr>
</table>
</div> </div>
<br>
</div> </div>
<div id="bottom_logo">
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@ -27,27 +27,40 @@
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others"> <meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
<meta name="keywords" content="pandora, monitoring, system, GPL, software"> <meta name="keywords" content="pandora, monitoring, system, GPL, software">
<meta name="robots" content="index, follow"> <meta name="robots" content="index, follow">
<link rel="icon" href="images/pandora.ico" type="image/ico"> <link rel="icon" href= <?php echo '"images/pandora.ico"' ?> type="image/ico">
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css"> <link rel="stylesheet" href= <?php echo '"include/styles/pandora.css"' ?> type="text/css">
</head> </head>
<body> <body>
<div id="main" style=' width: 80%; margin:0 auto 0 auto;'>
<div align='center'> <img src="images/login_background.png" id="login_body">
<div id='login_f'> <div class="databox_logout" id="login">
<h1 id="log_f" class="error">No configuration file found</h1> <br>
<div> <h1 id="log">No configuration file found</h1>
<img src="images/pandora_logo.png" border="0"> <br>
</div> <div style="width: 440px; margin: 0 auto auto;">
<div class="msg"> <table cellpadding="4" cellspacing="1" width="440">
<tr><td align="left">
<a href="index.php"><img src= <?php echo '"images/pandora_login.png"' ?> border="0" height="100px" alt="Pandora FMS"></a>
</td><td valign="bottom">
<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid <br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
permissions and HTTP server cannot read it. Please read documentation to fix this problem. permissions and HTTP server cannot read it. Please read documentation to fix this problem.
</div>
<div class="msg"> <div class="msg">
You may try to run the <b><a href="install.php">installation wizard</a></b> to create one. You may try to run the <b><?php
if (file_exists('install.php'))
echo '<a href="install.php">installation wizard</a>';
else
echo 'installation wizard'; ?></b> to create one.
</div> </div>
</td></tr>
</table>
</div> </div>
<br>
</div> </div>
<div id="bottom_logo">
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
</div> </div>
</body> </body>

View File

@ -27,26 +27,36 @@
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others"> <meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
<meta name="keywords" content="pandora, monitoring, system, GPL, software"> <meta name="keywords" content="pandora, monitoring, system, GPL, software">
<meta name="robots" content="index, follow"> <meta name="robots" content="index, follow">
<link rel="icon" href="images/pandora.ico" type="image/ico"> <link rel="icon" href= <?php echo '"images/pandora.ico"' ?> type="image/ico">
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css"> <link rel="stylesheet" href= <?php echo '"include/styles/pandora.css"' ?> type="text/css">
</head> </head>
<body> <body>
<div id="main" style=' width: 80%; margin:0 auto 0 auto;'> <img src="images/login_background.png" id="login_body">
<div align='center'> <div class="databox_logout" id="login">
<div id='login_f'> <br>
<h1 id="log_f" class="error">Bad permission for include/config.php</h1> <h1 id="log">&nbsp;&nbsp;Bad permission for include/config.php</h1>
<div> <br>
<img src="images/pandora_logo.png" border="0" alt="Pandora FMS"><br> <div style="width: 440px; margin: 0 auto auto;">
</div> <table cellpadding="4" cellspacing="1" width="440">
<div class="msg"><br><br> <tr><td align="left">
<a href="index.php"><img src= <?php echo '"images/pandora_login.png"' ?> border="0" height="100px" alt="Pandora FMS"></a>
</td><td valign="bottom">
<br>
For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users
should not read it or write to it. It should be written only for owner should not read it or write to it. It should be written only for owner
(usually www-data or http daemon user), normal operation is not possible until you change (usually www-data or http daemon user), normal operation is not possible until you change
permissions for <i>include/config.php</i> file. Please do it, it's for your security. permissions for <i>include/config.php</i> file. Please do it, it's for your security.
</td></tr>
</table>
</div> </div>
<br>
</div> </div>
<div id="bottom_logo">
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
</div> </div>
</div>
</body> </body>
</html> </html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -845,6 +845,15 @@ span.rmess, span.nrmess {
background-color: #fafafa; background-color: #fafafa;
background: url(../../images/splash_logout.png) no-repeat; background: url(../../images/splash_logout.png) no-repeat;
} }
.databox_error {
width: 657x !important;
height: 400px;
border: none !important;
background-color: #fafafa;
background: url(../../images/splash_error.png) no-repeat;
}
.databox_color { .databox_color {
background-color: #fafafa; background-color: #fafafa;
} }