From 15acc345b5ef4ff03862378168a98e766fc31f16 Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Thu, 12 Apr 2012 09:26:51 +0000
Subject: [PATCH] 2012-04-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

	* include/styles/dialog.css
	 include/styles/pandora.css
	 include/auth/mysql.php
	 general/login_page.php: Modal windows improved and changes in login
	 page error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5949 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                  |  8 +++
 pandora_console/general/login_page.php     | 22 ++++---
 pandora_console/include/auth/mysql.php     |  1 +
 pandora_console/include/styles/dialog.css  | 67 +++++++++++++++++-----
 pandora_console/include/styles/pandora.css | 20 ++++++-
 5 files changed, 92 insertions(+), 26 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e7e7585d8e..f6762c7d95 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/styles/dialog.css
+	 include/styles/pandora.css
+	 include/auth/mysql.php
+	 general/login_page.php: Modal windows improved and changes in login 
+	 page error.
+
 2012-04-12  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/reporting/visual_console_builder.editor.php
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 36ba3b3c18..c53856727c 100644
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -82,16 +82,22 @@ echo '<div id="ver_num">' . $pandora_version.(($develop_bypass == 1) ? ' '.__('B
 
 
 if (isset ($login_failed)) {
-	
-	echo '<div id="login_failed" title="Login Failed" style="">';
 
-		echo '<div style="position:absolute; top:20%; text-align: center; left:0%; right:0%; width:600px;">';
+	echo '<div id="login_failed" title="Login failed" style="">';
+
+		echo '<div style="position:absolute; top:0px; text-align: center; left:0%; right:0%; height:100px; width:330px; margin: 0 auto; ">';
 		
 			echo '<div id="error_login">';
-			echo '<h3 class="error">'.__('Login failed').': '.$config["auth_error"].'</h3>';
+			echo '<b>' . $config["auth_error"] . '</b>';
+			echo '</div>';
+	
+			echo '<div id="error_login_icon">';
+			echo html_print_image('images/noaccess.png', true, array("alt" => __('Login failed'), "border" => 0));
 			echo '</div>';
 
-			echo '<div style="position: absolute; top:60px; right:40%;">';	  
+
+			//echo '<div style="position: absolute; top:60px; right:40%;">';	  
+			echo '<div style="position:absolute; margin: 0 auto; top: 70px; left: 35%; ">';	  
 				html_print_submit_button("Ok", 'hide-login-error', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only" style="width:100px;"');  
 			echo '</div>';
 			
@@ -113,7 +119,7 @@ if (!isset ($login_failed)) {
 	<!--[if IE]>
 	<div id="dialog" title="Pandora FMS Web browser advise" style="-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; filter: alpha(opacity=50); background:url(images/advise_navigator_background.png) no-repeat center bottom">
 
-		<div style="position:absolute; top:20%; text-align: center; left:0%; right:0%; width:600px;">
+		<div style="position:absolute; top:20%; text-align: center; left:0%; right:0%; width:590px;">
 			  <img src="images/error.png">
 			<?php	  
 			  echo __("In order to have the best user experience with Pandora FMS, we <b>strongly recommend</b> to use") . "<br>";
@@ -165,8 +171,8 @@ $(document).ready (function () {
 				resizable: true,
 				draggable: true,
 				modal: true,
-				height: 180,
-				width: 600,
+				height: 150,
+				width: 350,
 				overlay: {
 							opacity: 0.5,
 							background: "black"
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 023b4f223e..420a2c9fdd 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -103,6 +103,7 @@ function process_user_login ($login, $pass) {
 		}
 		else {
 			$mysql_cache["auth_error"] = "User not found in database or incorrect password";
+			$config["auth_error"] = "User not found in database or incorrect password";
 		}
 
 		return false;
diff --git a/pandora_console/include/styles/dialog.css b/pandora_console/include/styles/dialog.css
index 0652d40164..fa7d4f7509 100644
--- a/pandora_console/include/styles/dialog.css
+++ b/pandora_console/include/styles/dialog.css
@@ -2,7 +2,7 @@
 /* This file skins dialog */
 
 .ui-dialog {
-    background: #EEEEEE !important; 
+    background: #D3D3D3 !important; 
     border: 1px solid #DDDDDD !important;
     color: #333333 !important;
     padding: 0.2em !important;
@@ -19,17 +19,22 @@
 
 .ui-dialog .ui-dialog-titlebar {
 	background: url(../../images/ui_title.png) repeat-x scroll !important;
-	height: 28px !important;
-	_height: 29px !important;
-	margin: 2px auto 0 auto !important;
+	#height: 15px !important;
+	#_height: 16px !important;
+	padding: 0.3em 1em !important;
+	position:relative;
+	margin: 0px auto 0 auto !important;
 	font-weight: bold !important;
-	border: 1px solid #3d6630 !important;
+	border-bottom: 1px solid #A9A9A9 !important;
+	border-top: 1px solid #A9A9A9 !important;
+	border-left: 1px solid #A9A9A9 !important;
+	border-right: 1px solid #A9A9A9 !important;
 	color: #FFFFFF !important;
-	padding: 0.1em 1em !important;
+	#padding: 0.1em 1em !important;
 
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
+	-moz-border-radius: 4px 4px 0 0;
+	-webkit-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
 }
 
 .ui-dialog .ui-dialog-title {
@@ -37,8 +42,9 @@
 	color: white !important;
 	font-weight: bold !important;
 	position: relative !important;
-	top: 7px !important;
+	#top: 7px !important;
 	left: 4px !important;
+	float: none !important;
 }
 
 .ui-dialog.ui-draggable .ui-dialog-titlebar {
@@ -50,7 +56,7 @@
 	height: 16px !important;
 	background: url(images/dialog-titlebar-close.png) no-repeat !important;
 	position: absolute !important;
-	top: 6px;
+	top: 2px;
 	right: 17px !important;
 	cursor: default !important;
 }
@@ -66,15 +72,43 @@
 	.ui-dialog .ui-dialog-titlebar-close-hover {
 		color: #000000 !important;
 	}
+	
+
+	.ui-dialog .ui-dialog-titlebar-close:hover span {
+		display: none !important;
+	}
+
+	.ui-dialog .ui-dialog-titlebar-close:hover {
+		background: url(images/dialog-titlebar-close-hover.png) no-repeat !important;
+	}
+
+	.ui-dialog .ui-dialog-titlebar-close:hover {
+		color: #000000 !important;
+	}
+
+	
 
 .ui-dialog .ui-dialog-content {
 	margin: 1.2em !important;
-	padding: 0.5em 1em !important;
+	#padding: 0.5em 1em !important;
 	overflow: auto !important;
+	
+	border-left: 1px solid #A9A9A9 !important;
+	border-right: 1px solid #A9A9A9 !important;
+	border-bottom: 1px solid #A9A9A9 !important;
+    border-radius: 0px 0px 4px 4px !important;
+	#height: 80% !important;
+    #width: 98% !important;
+    margin: 0 auto !important;
+    background: #EEEEEE !important;	
+    position: relative !important;
+	
 }
 
 .ui-dialog-content {
 	overflow: auto !important;
+	width: auto !important;
+	#height: auto !important;
 }
 
 .ui-dialog .ui-dialog-buttonpane {
@@ -180,12 +214,12 @@
 .ui-dialog .ui-button-dialog {
     background: #F6F6F6;
     border: 1px solid #CCCCCC;
-    color: #1C94C4;
+    color: #696969;
     font-weight: bold;
     outline: medium none;
     cursor: pointer;    
-    margin: 0.5em 0.4em 0.5em 0;
-    border-radius: 4px 4px 4px 4px;
+    margin: 0.5em 0.4em 0.5em 0 !important;
+    border-radius: 4px 4px 4px 4px !important;
 }
 
 .ui-dialog .ui-button-dialog:hover {
@@ -196,3 +230,6 @@
     outline: medium none;
 }
 
+.ui-dialog-overlay {
+	background: url("images/ui-bg_diagonals-thick_20_666666_40x40.png") repeat scroll 50% 50% #666666 !important;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 7f8870faad..3fed6d0ee7 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -169,11 +169,25 @@ div#login_in, #login_f {
 	width: 400px;
 }
 div#error_login {
-	margin: 0 auto;
-	margin-top: -10px; 
+	#margin: 0 auto;
+	#margin-top: -10px; 
 	text-align: center;
-	margin-left: 20px;
+	margin-top: 30px;
+	margin-left: 5px;
+	width: 73%;
+	float: left;
 }
+
+div#error_login_icon {
+	#margin: 0 auto;
+	margin-top: 10px; 
+	margin-right: 7px; 
+	text-align: center;
+	#margin-left: 20px;
+	width: 20%;
+	float: right;
+}
+
 div#login_f {
 	margin-top: 10px;
 	margin-bottom: 25px;