From 798d7256c4e45ec61de2ec9f23c395139f11f93c Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Fri, 11 Oct 2013 09:19:59 +0000
Subject: [PATCH] 2013-10-11  Sergio Martin <sergio.martin@artica.es>

	* include/functions_ui.php
	index.php
	general/header.php: Add include of dialog.css in
	config for incident #254



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8889 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                | 7 +++++++
 pandora_console/general/header.php       | 7 -------
 pandora_console/include/functions_ui.php | 3 +++
 pandora_console/index.php                | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 495f4fc5c8..2b25f8ef17 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-11  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_ui.php
+	index.php
+	general/header.php: Add include of dialog.css in 
+	config for incident #254
+
 2013-10-10  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_agents.php
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index a217f33597..5e1a7effa8 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -93,11 +93,6 @@ config_check();
 				
 				
 				
-				
-				
-				
-				
-				
 				//======= Autorefresh code =============================
 				$autorefresh_txt = '';
 				$autorefresh_additional = '';
@@ -166,7 +161,6 @@ config_check();
 				
 				if ($config["alert_cnt"] > 0) {
 					echo '<div id="alert_messages" style="display: none"></div>';
-					ui_require_css_file ('dialog');
 					
 					$maintenance_link = 'javascript:';
 					$maintenance_title = __("System alerts detected - Please fix as soon as possible");
@@ -212,7 +206,6 @@ config_check();
 				$msg_cnt = messages_get_count ($config["id_user"]);
 				if ($msg_cnt > 0) {
 					echo '<div id="dialog_messages" style="display: none"></div>';
-					ui_require_css_file ('dialog');
 					
 					$table->data[0][9] = '<a href="ajax.php?page=operation/messages/message_list" title="' . __("Message overview") . '" id="show_messages_dialog">';
 					$table->data[0][9] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;'));
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index ab110f23b0..8f178a8dc3 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1297,6 +1297,9 @@ function ui_process_page_head ($string, $bitfield) {
 	// Add the jquery UI styles CSS
 	$config['css']['jquery-UI'] = "include/styles/jquery-ui-1.10.0.custom.css";
 	
+	// Add the dialog styles CSS
+	$config['css']['dialog'] = "include/styles/dialog.css";
+	
 	//We can't load empty and we loaded (conditionally) ie
 	$loaded = array ('', 'ie');
 	
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 3cb1b33182..bfee18a0bd 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -602,7 +602,7 @@ require('include/php_to_js_values.php');
 	
 	//Dynamically assign footer position and width.
 	function adjustFooter() {
-		if (document.readyState !== 'complete') {
+		if (document.readyState !== 'complete' || $('#container').position() == undefined) {
 			return;
 		}
 		// minimum top value (upper limit) for div#foot