diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 981444c608..f8d2075921 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-06-16 Juan Manuel Ramon + + * include/functions_ui.php: Changed the way to include css files + when skin functionality is enabled. + * general/pandora_help.php: Some modifications in css link help + file. + * godmode/alerts/alert_list.php: Changed enterprise_include() + function to enterprise_include(). + 2011-06-15 Miguel de Dios Merge from the branch. diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index 4fc2f5819b..1808f118f0 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -24,7 +24,7 @@ require_once ("../include/functions_html.php"); echo __('Pandora FMS help system'); ?> - +'; ?> "; echo "
"; - echo '' . html_print_image("../images/pandora_logo.png", array("border" => '0')) . '
'; + echo '' . html_print_image("images/pandora_logo.png", array("border" => '0')) . '
'; echo "
"; echo '
'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'
'; return; @@ -59,7 +59,7 @@ if (! $id || ! file_exists ($help_file)) { /* Show help */ echo '
'; echo ''; -echo html_print_image('../images/pandora_textlogo.png', true, array("border" => '0')); +echo html_print_image('images/pandora_textlogo.png', true, array("border" => '0')); echo ""; echo '

'.__('Pandora FMS help system').'

'; echo '
'; diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 46a7d359d1..501d5378b9 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -28,7 +28,7 @@ if (! check_acl ($config['id_user'], 0, "LW")) { require_once ('include/functions_agents.php'); require_once ('include/functions_alerts.php'); require_once ('include/functions_users.php'); -$isFunctionPolicies = enterprise_include ('include/functions_policies.php'); +$isFunctionPolicies = enterprise_include_once ('include/functions_policies.php'); $id_group = 0; /* Check if this page is included from a agent edition */ diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 6ec54b0a32..70549c3939 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -884,12 +884,11 @@ function ui_process_page_head ($string, $bitfield) { if ($exists_css){ foreach ($skin_styles as $filename => $name){ $style = substr ($filename, 0, strlen ($filename) - 4); - $config['css'] = array_merge(array ($style => $skin_path . 'include/styles/' . $filename)); + $config['css'][$style] = $skin_path . 'include/styles/' . $filename; } - } + } //Otherwise assign default and user's css else{ - //User style should go last so it can rewrite common styles $config['css'] = array_merge (array ( "common" => "include/styles/common.css",