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

	* include/styles/pandora.css
	 include/javascript/jquery.pandora.js
	 index.php
	 general/login_help_dialog.php: Added input for license in blocking
	 license modal windows.

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                           | 10 ++++++++++
 pandora_console/general/login_help_dialog.php       |  7 +++++--
 .../include/javascript/jquery.pandora.js            | 13 +++++--------
 pandora_console/include/styles/pandora.css          |  5 ++---
 pandora_console/index.php                           |  3 ++-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 61ec06a93b..a9e4bedde6 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+	
+	* include/styles/pandora.css
+	 include/javascript/jquery.pandora.js
+	 index.php
+	 general/login_help_dialog.php: Added input for license in blocking
+	 license modal windows.
+
+	Merged from branches.
+
 2012-04-26 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* operation/agentes/exportdata.php,
diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php
index d5b986f6df..81b4e9eddf 100644
--- a/pandora_console/general/login_help_dialog.php
+++ b/pandora_console/general/login_help_dialog.php
@@ -36,6 +36,9 @@ if (is_ajax()) {
 
 // Prints help dialog information
 
+if ($license_fail == 1)
+	return;
+
 echo '<div id="login_help_dialog" title="' . __('Welcome to Pandora FMS') . '" style="">';
 
 	echo '<div style="position:absolute; top:30px; left: 10px; text-align: left; right:0%; height:70px; width:560px; margin: 0 auto; border: 1px solid #FFF; line-height: 19px;">';
@@ -122,11 +125,11 @@ $(document).ready (function () {
 		
 	
 	$("#submit-hide-login-help").click (function () {
-				
+		
 		$("#login_help_dialog" ).dialog('close');
 		
 		var skip_login_help = $("#checkbox-skip_login_help").attr('checked');
-				
+		
 		// Update config['skip_login_help_dialog'] to don't display more this message
 		if (skip_login_help == 'checked') {
 			jQuery.get ("ajax.php",
diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index d6b57260ed..783b5a5e74 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -86,24 +86,23 @@ $(document).ready (function () {
 		return false;
 	});
 	
-	$(function() {
-		$( "#license_error_msg_dialog" ).dialog({
+
+	$( "#license_error_msg_dialog" ).dialog({
 				resizable: true,
 				draggable: true,
 				modal: true,
-				height: 250,
+				height: 280,
 				width: 600,
 				overlay: {
 							opacity: 0.5,
 							background: "black"
 						},
 				bgiframe: jQuery.browser.msie
-			});
 	});
 	
 	$("#submit-hide-license-error-msg").click (function () {
 		$("#license_error_msg_dialog" ).dialog('close')
-	});	
+	});
 	
 	
 	$("a#dialog_license_info").click (function () {
@@ -134,6 +133,4 @@ $(document).ready (function () {
 		return false;
 	});
 
-}
-
-);
+});
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 78d9578278..f34d19d0b8 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -156,7 +156,6 @@ h1#log_f {
 }
 div#login {
 	margin: 0 auto;
-	#margin-top: 200px;
 	padding-top: 63px;
 	width: 657px;
 	border-left: solid 1px #000;
@@ -173,9 +172,9 @@ div#error_login {
 	#margin: 0 auto;
 	#margin-top: -10px; 
 	text-align: center;
-	margin-top: 10px;
+	margin-top: 5px;
 	margin-left: 5px;
-	width: 70%;
+	width: 75%;
 	float: right;
 	text-align: left;
 	top: 100px;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index b632b54ab4..92839f85cf 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -267,6 +267,7 @@ if (isset ($_GET["bye"])) {
  * Load the basic configurations of extension and add extensions into menu.
  * Load here, because if not, some extensions not load well, I don't why.
  */
+
 extensions_load_extensions ($config['extensions']);
 if ($process_login) {
 	 /* Call all extensions login function */
@@ -277,7 +278,7 @@ if ($process_login) {
 	//Set the initial global counter for chat.
 	users_get_last_global_counter('session');
 }
-
+	
 //Get old parameters before navigation.
 $old_sec = '';
 $old_sec2 = '';