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

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
This commit is contained in:
zarzuelo 2013-10-11 09:19:59 +00:00
parent 523ce35b6c
commit 798d7256c4
4 changed files with 11 additions and 8 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-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> 2013-10-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php * include/functions_agents.php

7
pandora_console/general/header.php
View File

@ -93,11 +93,6 @@ config_check();
//======= Autorefresh code ============================= //======= Autorefresh code =============================
$autorefresh_txt = ''; $autorefresh_txt = '';
$autorefresh_additional = ''; $autorefresh_additional = '';
@ -166,7 +161,6 @@ config_check();
if ($config["alert_cnt"] > 0) { if ($config["alert_cnt"] > 0) {
echo '<div id="alert_messages" style="display: none"></div>'; echo '<div id="alert_messages" style="display: none"></div>';
ui_require_css_file ('dialog');
$maintenance_link = 'javascript:'; $maintenance_link = 'javascript:';
$maintenance_title = __("System alerts detected - Please fix as soon as possible"); $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"]); $msg_cnt = messages_get_count ($config["id_user"]);
if ($msg_cnt > 0) { if ($msg_cnt > 0) {
echo '<div id="dialog_messages" style="display: none"></div>'; 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] = '<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;')); $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;'));

3
pandora_console/include/functions_ui.php
View File

@ -1297,6 +1297,9 @@ function ui_process_page_head ($string, $bitfield) {
// Add the jquery UI styles CSS // Add the jquery UI styles CSS
$config['css']['jquery-UI'] = "include/styles/jquery-ui-1.10.0.custom.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 //We can't load empty and we loaded (conditionally) ie
$loaded = array ('', 'ie'); $loaded = array ('', 'ie');

2
pandora_console/index.php
View File

@ -602,7 +602,7 @@ require('include/php_to_js_values.php');
//Dynamically assign footer position and width. //Dynamically assign footer position and width.
function adjustFooter() { function adjustFooter() {
if (document.readyState !== 'complete') { if (document.readyState !== 'complete' || $('#container').position() == undefined) {
return; return;
} }
// minimum top value (upper limit) for div#foot // minimum top value (upper limit) for div#foot