From 6a9361b1d31e234d11e17958262728fede7e8db7 Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Mon, 11 Feb 2013 12:40:43 +0000
Subject: [PATCH] 2013-02-11  Sergio Martin <sergio.martin@artica.es>

	* include/functions_ui.php
	general/header.php: Move some javascript and css inclusions
	from header file to ui_process_page_head function to still
	having this files when in full screen mode



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

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index aa4718b536..a8036abe51 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-11  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_ui.php
+	general/header.php: Move some javascript and css inclusions
+	from header file to ui_process_page_head function to still 
+	having this files when in full screen mode 
+
 2013-02-11  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/users/user_list.php: Fix pagination on users list
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 2d29f05ab4..c1e209f5ed 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -220,13 +220,7 @@ config_check();
 		</td>
 	</tr>
 </table>
-<?php
-ui_require_css_file ('jquery-ui-1.10.0.custom');
-ui_require_jquery_file('jquery-ui-1.10.0.custom');
-ui_require_jquery_file('countdown');
-ui_require_javascript_file('encode_decode_base64');
-?>
-<script type="text/javascript" src="include/javascript/webchat.js "></script>	
+
 <script type="text/javascript">
 	/* <![CDATA[ */
 	var new_chat = <?php echo (int)$_SESSION['new_chat'];?>;
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 208c94ba38..a34823f9f6 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1227,6 +1227,9 @@ function ui_process_page_head ($string, $bitfield) {
 			$config['style'] => "include/styles/".$config['style'].".css"), $config['css']);
 	}
 	
+	// Add the jquery UI styles CSS
+	$config['css']['jquery-UI'] = "include/styles/jquery-ui-1.10.0.custom.css";
+	
 	//We can't load empty and we loaded (conditionally) ie
 	$loaded = array ('', 'ie');
 	
@@ -1259,6 +1262,12 @@ function ui_process_page_head ($string, $bitfield) {
 	//Pandora specific JavaScript should go first
 	$config['js'] = array_merge (array ("pandora" => "include/javascript/pandora.js"), $config['js']);
 	
+	//Load base64 javascript library
+	$config['js']['base64'] = "include/javascript/encode_decode_base64.js";
+	
+	//Load webchat javascript library
+	$config['js']['webchat'] = "include/javascript/webchat.js";
+
 	//Load other javascript
 	//We can't load empty
 	$loaded = array ('');
@@ -1306,6 +1315,12 @@ function ui_process_page_head ($string, $bitfield) {
 		$config['jquery']['datepicker_language'] = 'include/languages/datepicker/jquery.ui.datepicker-'.$config['language'].'.js';
 	}
 	
+	// Include jquery UI
+	$config['jquery']['jquery-ui'] = 'include/javascript/jquery.jquery-ui-1.10.0.custom.js';
+
+	// Include countdown library
+	$config['jquery']['countdown'] = 'include/javascript/jquery.countdown.js';
+
 	//Then add each script as necessary
 	$loaded = array ('');
 	foreach ($config['jquery'] as $name => $filename) {