2007-06-02 Raul Mateos <raulofpandora@gmail.com>

* include/styles/pandora.css: Updated.

	* include/styles/pandora_minimal.css: New file for install and graphs.

	* include/config.inc.php: Updated build. Updated attachment directory.

	* install.php: Added some text to clarify use of config directory in
	step 3. Now we use the pandora_mininmal.css file. Updated logo. Closed
	some HTML tags.

	* reporting/stat_win.php: Now we use the pandora_minimal.css file. Closed
	some HTML tags. Added title.

	* reporting/Image/*.php: Converted end-line Windows format to Unix.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@483 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2007-06-02 13:52:45 +00:00
parent 641baa4f97
commit e84c1bd265
17 changed files with 7115 additions and 7114 deletions

View File

@ -1,3 +1,20 @@
2007-06-02 Raul Mateos <raulofpandora@gmail.com>
* include/styles/pandora.css: Updated.
* include/styles/pandora_minimal.css: New file for install and graphs.
* include/config.inc.php: Updated build. Updated attachment directory.
* install.php: Added some text to clarify use of config directory in
step 3. Now we use the pandora_mininmal.css file. Updated logo. Closed
some HTML tags.
* reporting/stat_win.php: Now we use the pandora_minimal.css file. Closed
some HTML tags. Added title.
* reporting/Image/*.php: Converted end-line Windows format to Unix.
2007-05-31 Sancho Lerena <slerena@artica.es>
* fgraph.php: Small improvements in combined graphs.

View File

@ -21,7 +21,7 @@
//Pandora Version
if (!isset($build_version))
$build_version="PC070529";
$build_version="PC070602";
if (!isset($pandora_version))
$pandora_version="v1.3 devel";
@ -43,7 +43,7 @@ error_reporting(E_ALL);
//This is directory where placed "attachment" directory, to upload files stores.
// This MUST be writtable by http server user, and should be in pandora root.
// Please append "/" to the end.
$attachment_store=$config_homedir;
$attachment_store=$config_homedir."attachment/";
// Default font used for graphics (a Free TrueType font included with Pandora FMS)
$config_fontpath = $config_homedir."reporting/FreeSans.ttf";

View File

@ -315,7 +315,7 @@ td.datos_jus, td.datos2_jus {
text-align: center;
}
.f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9 {
font-size: 6pt;
font-size: 6.5pt;
}
.f9i, .redi {
font-style: italic;

View File

@ -33,7 +33,7 @@
<meta name="keywords" content="pandora, fms, monitoring, network, system, GPL, software">
<meta name="robots" content="index, follow">
<link rel="icon" href="images/pandora.ico" type="image/ico">
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
<link rel="stylesheet" href="include/styles/pandora_minimal.css" type="text/css">
<link rel="stylesheet" href="include/styles/install.css" type="text/css">
</head>
@ -165,7 +165,7 @@ function install_step1() {
echo "
</div>
<div id='logo_img'>
<img src='images/logo_login.gif' border='0'><br><br>
<img src='images/pandora_logo.png' border='0'><br>
<img src='images/step0.png' border='0'>
</div>
<div id='install_img'>
@ -200,7 +200,7 @@ function install_step2() {
echo "</table>
</div>
<div id='logo_img'>
<img src='images/logo_login.gif' border='0'' alt=''><br><br>
<img src='images/pandora_logo.png' border='0'' alt=''><br>
<img src='images/step1.png' border='0' alt=''>
</div>
<div id='install_img'>";
@ -233,8 +233,10 @@ function install_step3() {
<h1>Environment and database setup</h1>
<p>
This wizard will create your Pandora FMS database, and populate it with all the data needed to run for the first time.
You need a privileged user to create database schema, this is usually root user.
Information about <i>root</i> user will not be used or stored anymore.
</p>
<p>
You need a privileged user to create database schema, this is usually <b>root</b> user.
Information about <b>root</b> user will not be used or stored anymore.
</p>
<p>
Now, please, complete all details to configure your database and enviroment setup.
@ -255,12 +257,12 @@ function install_step3() {
<div>DB Name (pandora by default)</div>
<input class='login' type='text' name='dbname' value='pandora'>
<div>Full path to HTTP publication directory.<br>
<span class='f9b'>For example /var/www/pandora_console/</span>
<div>Full path to HTTP publication directory<br>
<span class='f9b'>For example /var/www/pandora_console/. Needed for graphs and attachments.</span>
</div>
<input class='login' type='text' name='path' style='width: 190px;' value='/var/www/pandora_console/'>
<div>Full local URL to Pandora FMS Console. <br>
<div>Full local URL to Pandora FMS Console<br>
<span class='f9b'>For example http://localhost/pandora_console</span>
</div>
<input class='login' type='text' name='url' style='width: 250px;' value='http://localhost/pandora_console'>
@ -269,7 +271,7 @@ function install_step3() {
</form>
</div>
<div id='logo_img'>
<img src='images/logo_login.gif' border='0' alt=''><br><br>
<img src='images/pandora_logo.png' border='0' alt=''><br>
<img src='images/step2.png' border='0' alt=''>
</div>
</div>
@ -368,7 +370,7 @@ $BASE_URL="'.$url.'"; // Base URL
}
echo "</table></div>
<div id='logo_img'>
<img src='images/logo_login.gif' border='0' alt=''><br><br>
<img src='images/pandora_logo.png' border='0' alt=''><br>
<img src='images/step3.png' border='0' alt=''>
</div>
@ -408,7 +410,7 @@ function install_step5() {
<p><a href='index.php'>Click here to access to your Pandora FMS console</a></p>
</div>
<div id='logo_img'>
<img src='images/logo_login.gif' border='0'><br><br>
<img src='images/pandora_logo.png' border='0'><br>
<img src='images/step4.png' border='0'><br>
</div>
</div>
@ -441,3 +443,5 @@ if (! isset($_GET["step"])){
}
?>
</body>
</html>

View File

@ -112,7 +112,7 @@ class Image_Graph extends Image_Graph_Element
* $Graph =& Image_Graph::factory('graph', array(array('width' => 400,
* 'height' => 300, 'canvas' => 'jpg')));
*
* NB! In thïs case remember the "double" array (see {@link Image_Graph::
* NB! In th<EFBFBD>s case remember the "double" array (see {@link Image_Graph::
* factory()})
*
* 2) Use the canvas specified, pass a valid Image_Canvas as

View File

@ -40,12 +40,10 @@ if (comprueba_login() != 0) {
if (isset($_GET['refresh']) and is_numeric($_GET['refresh']) and $_GET['refresh']>0) {
header( 'refresh: ' . $_GET['refresh'] );
}
// Read styles
echo '<style>';
include("../include/styles/pandora.css");
echo '</style>';
echo "<body bgcolor=#ffffff>";
echo '<html>
<head><title>Pandora FMS Graph</title>
<link rel="stylesheet" href="../include/styles/pandora_minimal.css" type="text/css">';
;
// Get input parameters
@ -151,25 +149,6 @@ echo "</table>";
<script type='text/javascript' src='../include/javascript/x_core.js'></script>
<script type='text/javascript' src='../include/javascript/x_event.js'></script>
<script type='text/javascript' src='../include/javascript/x_slide.js'></script>
<style type='text/css'><!--
.menu {
color:#000; background:#ccc;
margin-left: 10px;
padding-left: 10px; padding-top: 10px;
font-family:arial,sans-serif,verdana; font-size:10px;
border:1px solid #000;
position:absolute;
margin:0; width:325px; height:220px;
visibility:hidden;
filter:alpha(opacity=95);
-moz-opacity: 0.95;
opacity: 0.95;
}
--></style>
<script type='text/javascript'><!--
var defOffset = 2;
var defSlideTime = 200;
@ -294,5 +273,6 @@ echo "</table>";
</form>
</div>
</body>
</html>