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

2012-04-24 Miguel de Dios <miguel.dedios@artica.es> 

* install.php: cleaned source code style.
	
	* include/functions_graph.php: added into the src attribute the
	$config['homeurl'] in the functions "progress_bar" and
	"progress_bubble" to show the images in other paths that usually
	path.
	
	* include/functions_ui.php: fixed into the function
	"ui_process_page_head" when try to use in others paths that usually
	path (like as homeurl) and this bug have been for js and css.
	
	* operation/visual_console/public_console.php: fixed and re-design
	the page.
	
	Fixes: #3520670
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-04-24 13:45:02 +00:00
parent 5e83f35a13
commit 8c5de64b91
4 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/ChangeLog
View File

@ -1,3 +1,23 @@
2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* install.php: cleaned source code style.
* include/functions_graph.php: added into the src attribute the
$config['homeurl'] in the functions "progress_bar" and
"progress_bubble" to show the images in other paths that usually
path.
* include/functions_ui.php: fixed into the function
"ui_process_page_head" when try to use in others paths that usually
path (like as homeurl) and this bug have been for js and css.
* operation/visual_console/public_console.php: fixed and re-design
the page.
Fixes: #3520670
MERGED FROM 4.0.2
2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* include/Image/image_functions.php: fixed into the function
@ -7,6 +27,8 @@
* include/config_process.php: disabled warning message of PHP5 about
the timezone.
Fixes: #3520657
MERGED FROM 4.0.2
2012-04-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

9
pandora_console/include/functions_graph.php
View File

@ -493,10 +493,9 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
}
// Added support for projection graphs (normal_module + 1(prediction data))
if ($projection !== false) {
if ($projection !== false){
$module_number = count ($module_list) + 1;
}
else {
}else{
$module_number = count ($module_list);
}
@ -970,7 +969,7 @@ function progress_bar($progress, $width, $height, $title = '', $mode = 1, $value
include_graphs_dependencies($config['homedir'].'/');
return "<img title='" . $title . "' alt='" . $title . "'" .
" src='include/graphs/fgraph.php?homeurl=../../&graph_type=progressbar" .
" src='" . $config['homeurl'] . "/include/graphs/fgraph.php?homeurl=../../&graph_type=progressbar" .
"&width=".$width."&height=".$height."&progress=".$progress.
"&mode=" . $mode . "&out_of_lim_str=".$out_of_lim_str .
"&title=".$title."&font=".$config['fontpath']."&value_text=". $value_text .
@ -997,7 +996,7 @@ function progress_bubble($progress, $width, $height, $title = '', $mode = 1, $va
include_graphs_dependencies($config['homedir'].'/');
return "<img title='" . $title . "' alt='" . $title . "'" .
" src='include/graphs/fgraph.php?homeurl=../../&graph_type=progressbubble" .
" src='" . $config['homeurl'] . "/include/graphs/fgraph.php?homeurl=../../&graph_type=progressbubble" .
"&width=".$width."&height=".$height."&progress=".$progress.
"&mode=" . $mode . "&out_of_lim_str=".$out_of_lim_str .
"&title=".$title."&font=".$config['fontpath']."&value_text=". $value_text .

11
pandora_console/include/functions_ui.php
View File

@ -1091,14 +1091,14 @@ function ui_process_page_head ($string, $bitfield) {
}
}
//If skin's css files exists then add them
if ($exists_css){
if ($exists_css) {
foreach ($skin_styles as $filename => $name){
$style = substr ($filename, 0, strlen ($filename) - 4);
$config['css'][$style] = $skin_path . 'include/styles/' . $filename;
}
}
//Otherwise assign default and user's css
else{
else {
//User style should go last so it can rewrite common styles
$config['css'] = array_merge (array (
"common" => "include/styles/common.css",
@ -1123,8 +1123,9 @@ function ui_process_page_head ($string, $bitfield) {
//Remove comments
$output .= preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $style);
$output .= '</style>';
} else {
$output .= '<link rel="stylesheet" href="'.$filename.'" type="text/css" />'."\n\t";
}
else {
$output .= '<link rel="stylesheet" href="' . $config['homeurl'] . '/' .$filename.'" type="text/css" />'."\n\t";
}
}
//End load CSS
@ -1151,7 +1152,7 @@ function ui_process_page_head ($string, $bitfield) {
$output .= "\n".'/* ]]> */</script>';
}
else {
$output .= '<script type="text/javascript" src="'.$filename.'"></script>'."\n\t";
$output .= '<script type="text/javascript" src="'. $config['homeurl'] . '/' .$filename.'"></script>'."\n\t";
}
}
//End load JS

6
pandora_console/operation/visual_console/public_console.php
View File

@ -64,11 +64,12 @@ $background = $layout["background"];
$bwidth = $layout["width"];
$bheight = $layout["height"];
$pure_url = "&pure=".$config["pure"];
if (!isset($config['pure']))
$config['pure'] = 0;
// Render map
$options = array();
echo '<div style="width: 95%; background: white; margin: 20px auto 20px auto; box-shadow: 10px 10px 5px #000;">';
echo "<h1>". $layout_name. "</h1>";
visual_map_print_visual_map ($id_layout, true, true, null, null, '../../');
@ -114,6 +115,7 @@ html_print_input_hidden ('pure', $config["pure"]);
html_print_input_hidden ('id', $id_layout);
html_print_table ($table);
echo '</form>';
echo '</div>';
if ($config["pure"] && $config["refr"] != 0) {
ui_require_jquery_file ('countdown');