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

2011-06-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* 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().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4459 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-06-16 10:56:48 +00:00
parent 4a460b7a49
commit fda16c8c3f
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2011-06-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* 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 <miguel.dedios@artica.es>
Merge from the branch.

6
pandora_console/general/pandora_help.php
View File

@ -24,7 +24,7 @@ require_once ("../include/functions_html.php");
echo __('Pandora FMS help system');
?>
</title></head>
<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css" type="text/css">
<?php echo '<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css" type="text/css">'; ?>
<body style="background-color: #fff;">
<?php
$id = get_parameter ('id');
@ -50,7 +50,7 @@ if (! $id || ! file_exists ($help_file)) {
echo __('Help system error');
echo "</h1>";
echo "<div class='noa'>";
echo '<a href="../index.php">' . html_print_image("../images/pandora_logo.png", array("border" => '0')) . '</a><br>';
echo '<a href="../index.php">' . html_print_image("images/pandora_logo.png", array("border" => '0')) . '</a><br>';
echo "</div>";
echo '<div class="msg">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
return;
@ -59,7 +59,7 @@ if (! $id || ! file_exists ($help_file)) {
/* Show help */
echo '<div>';
echo '<span style="float:left; margin: 0px; padding: 0px">';
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 "</span>";
echo '<p style="text-align: right"><strong>'.__('Pandora FMS help system').'</strong></p>';
echo '</div>';

2
pandora_console/godmode/alerts/alert_list.php
View File

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

5
pandora_console/include/functions_ui.php
View File

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