2009-12-04 Sancho Lerena <slerena@artica.es>

* include/styles/pandora.css: Modified style for 3.0

        * images/pandora_textlogo.png,
        images/pandora_header_logo_enterprise.png, 
        images/custom_logo/none.png
        images/custom_logo/sourceforge.png
        images/custom_logo/artica_logo.png
        images/header.jpg
        images/pandora_header_logo.png
        images/pandora_logo.png: New logos and background for 3.0 style.

        * general/login_page.php: Updated style.

        * general/logon_ok.php: Removed small bug in the audit log block.

        * general/header.php: Pandora logo is now in left, and custom logo 
        at right. 

        * include/functions_config.php: By default custom logo is "none" 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2157 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,25 @@
+2009-12-04  Sancho Lerena <slerena@artica.es>
+
+	* include/styles/pandora.css: Modified style for 3.0
+
+	* images/pandora_textlogo.png,
+	images/pandora_header_logo_enterprise.png, 
+	images/custom_logo/none.png	
+	images/custom_logo/sourceforge.png
+	images/custom_logo/artica_logo.png
+	images/header.jpg
+	images/pandora_header_logo.png
+	images/pandora_logo.png: New logos and background for 3.0 style.
+
+	* general/login_page.php: Updated style.
+
+	* general/logon_ok.php: Removed small bug in the audit log block.
+
+	* general/header.php: Pandora logo is now in left, and custom logo 
+	at right. 
+	
+	* include/functions_config.php: By default custom logo is "none"
+
 2009-12-4  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* godmode/alerts/alert_templates.php: use the function to translate the

pandora_console/general/header.php

@@ -18,7 +18,17 @@ require_once ("include/functions_messages.php");
 <table width="100%" cellpadding="0" cellspacing="0" style="margin:0px; padding:0px;" border="0">
 	<tr>
 		<td rowspan=2>
-		<?php echo "<img height=60 width=139 src='images/custom_logo/".$config["custom_logo"]."'></td>"; ?>
+
+		<a href="index.php?sec=main">
+<?php
+		if (!defined ('PANDORA_ENTERPRISE')){
+			echo "<img border=0 src='images/pandora_header_logo.png'>";	
+		} else {
+			echo "<img border=0 src='images/pandora_header_logo_enterprise.png'>";	
+		}
+?>
+		</A>
+		</td>
 		<td width="20%">
 			<img src="images/user_<?php if (is_user_admin ($config["id_user"]) == 1) echo 'suit'; else echo 'green'; ?>.png" class="bot" alt="user" />
 			<a href="index.php?sec=usuarios&sec2=operation/users/user_edit" class="white"><?php echo __('You are');?> [<b><?php echo $config["id_user"];?></b>]</a>
@@ -94,12 +104,7 @@ require_once ("include/functions_messages.php");
 		echo "</td>";
 		echo "<td width='20%' rowspan=2>";
 		echo "<a href='index.php?sec=main'>";
-
-		if (!defined ('PANDORA_ENTERPRISE')){
-			echo "<img border=0 src='images/pandora_header_logo.png'>";	
-		} else {
-			echo "<img border=0 src='images/pandora_header_logo_enterprise.png'>";	
-		}
+		echo "<img height=60 width=139 src='images/custom_logo/".$config["custom_logo"]."'>"; 
 ?>
 		</td>
 	</tr>

pandora_console/general/login_page.php

@@ -20,11 +20,15 @@ if (!empty ($page) && !empty ($sec)) {
 	}
 }
 
-echo '<div class="databox" id="login">
-	<h1 id="log">'.__('Pandora FMS Web Console').'</h1><br />
+echo '<div class="databox" id="login">';
+
+	//echo '<h1>Put here your custom welcome message</h1>";
+
+echo '<br><br>';
+echo '
 	<div class="databox" id="login_in">
 		<form method="post" action="index.php'.$url.'">
-		<table cellpadding="4" cellspacing="1" width="400">';
+		<table cellpadding="4" cellspacing="1" width="420">';
 
 if (isset ($login_failed)) {
 	echo '<tr><td colspan="3">';

pandora_console/general/logon_ok.php

@@ -133,8 +133,9 @@ foreach ($cells as $key => $row) {
 }
 
 echo '</tbody></table>';
-echo '</div><div style="clear:both;">&nbsp;</div>'; //Clear the floats
+echo "</div>";
 echo '<div id="activity" style="width:700px;">';
+echo "<br><br>";
 // Show last activity from this user
 echo "<h2>" . __('This is your last activity in Pandora FMS console') . "</h2>";
 

pandora_console/include/functions_config.php

@@ -306,7 +306,7 @@ function process_config () {
 	}
 			
 	if (!isset ($config["custom_logo"])){
-		update_config_value ('custom_logo', 'pandora_logo_head.png');
+		update_config_value ('custom_logo', 'none.png');
 	}
 
 	/* Finally, check if any value was overwritten in a form */

pandora_console/include/styles/pandora.css

@@ -73,7 +73,7 @@ h1, h2, h3, h4 {
 	font-size: 1em;
 	font-family: Arial, Sans-serif;
 	text-transform: uppercase;
-	color: #786;
+	color: #666;
 	padding-bottom: 4px;
 	padding-top: 7px;
 }
@@ -183,8 +183,8 @@ div#page {
 	width: 960px;
 	background: #fff;
 	clear: both;
-	border-bottom: solid 5px #786;
-	border-top: solid 5px #786;
+	border-bottom: solid 5px #666;
+	border-top: solid 5px #666;
 }
 div#main {
 	width: 785px;
@@ -251,7 +251,7 @@ input.datos_readonly {
 	background-color: #050505;
 }
 input.login {
-	border-color: #786;
+	border-color: #666;
 	background-color: #f5f5f5;
 	margin: 2px 0 8px;
 	width: 90px;
@@ -303,7 +303,7 @@ table, img {
 }
 th {
 	color: #fff;
-	background-color: #786;
+	background-color: #666;
 	text-align:center;
 }
 tr.datos, tr.datost, tr.datosb , tr.datos_id, 
@@ -340,7 +340,7 @@ tr.rowOdd:hover {
 	background-color: #E0E0E0
 }
 .bg { /* op menu */
-	background-color: #786;
+	background-color: #666;
 }
 .bg2 { /* main page */
 	background-color: #d84437;
@@ -498,7 +498,7 @@ div.title_line {
 #menu_tab li a, #menu_tab a {
 	background: #d4ddc6;
 	padding: 3px 5px;
-	color: #333;
+	color: #666;
 	border-left: 2px solid #778866;
 	font-weight: bold;
 	line-height: 18px;