tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
zarzuelo 2013-02-11 12:40:43 +00:00
parent 33f977980e
commit 6bca51ad6a
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -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

8
pandora_console/general/header.php
View File

@ -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'];?>;

15
pandora_console/include/functions_ui.php
View File

@ -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) {