From d88ac2f8369f880eaccc6c66d4801ed8f1cb8b77 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Tue, 1 Dec 2009 01:24:42 +0000
Subject: [PATCH]  * fix the error of fusioncharts.

---
 trunk/module/report/model.php                          | 8 +++++---
 trunk/www/js/misc/{FusionCharts.js => fusioncharts.js} | 5 +++--
 trunk/www/theme/default/style.css                      | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename trunk/www/js/misc/{FusionCharts.js => fusioncharts.js} (95%)

diff --git a/trunk/module/report/model.php b/trunk/module/report/model.php
index d2a574379f..e98b103a9c 100644
--- a/trunk/module/report/model.php
+++ b/trunk/module/report/model.php
@@ -31,11 +31,12 @@ class reportModel extends model
         $chartRoot = $this->app->getWebRoot() . 'fusioncharts/';
         $swfFile   = "fcf_$swf.swf";
         return <<<EOT
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase=http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" width="$width" height="$height" id="Column3D" >
+<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase=http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" width="$width" height="$height" id="fcf$swf" >
 <param name="movie"     value="$chartRoot$swfFile" />
 <param name="FlashVars" value="&dataURL=$dataURL&chartWidth=$width&chartHeight=$height">
 <param name="quality"   value="high" />
-<embed src="$chartRoot$swfFile" flashVars="&dataURL=$dataURL&chartWidth=$width&chartHeight=$height" quality="high" width="$width" height="$height" name="Column3D" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<param name="wmode"     value="Opaque">
+<embed src="$chartRoot$swfFile" flashVars="&dataURL=$dataURL&chartWidth=$width&chartHeight=$height" quality="high" wmode="Opaque" width="$width" height="$height" name="fcf$swf" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
 </object>
 EOT;
     }
@@ -43,6 +44,7 @@ EOT;
     /* 创建js输出的chart。*/
     public function createJSChart($swf, $dataXML, $width = 600, $height = 500)
     {
+        $jsRoot = $this->app->getWebRoot() . 'js/';
         static $count = 0;
         $count ++;
         $chartRoot = $this->app->getWebRoot() . 'fusioncharts/';
@@ -51,7 +53,7 @@ EOT;
         $chartID   = "chart{$count}";
 
         $js = '';
-        if($count == 1) $js = "<script language='Javascript' src='/js/misc/FusionCharts.js'></script>";
+        if($count == 1) $js = "<script language='Javascript' src='{$jsRoot}misc/fusioncharts.js'></script>";
         return <<<EOT
 $js
 <div id="$divID"></div>
diff --git a/trunk/www/js/misc/FusionCharts.js b/trunk/www/js/misc/fusioncharts.js
similarity index 95%
rename from trunk/www/js/misc/FusionCharts.js
rename to trunk/www/js/misc/fusioncharts.js
index 42f8e4a149..fd377d5da6 100644
--- a/trunk/www/js/misc/FusionCharts.js
+++ b/trunk/www/js/misc/fusioncharts.js
@@ -113,7 +113,7 @@ infosoftglobal.FusionCharts.prototype = {
 		var swfNode = "";
 		if (navigator.plugins && navigator.mimeTypes && navigator.mimeTypes.length) { 
 			// netscape plugin architecture			
-			swfNode = '<embed type="application/x-shockwave-flash" src="'+ this.getAttribute('swf') +'" width="'+ this.getAttribute('width') +'" height="'+ this.getAttribute('height') +'"  ';
+			swfNode = '<embed type="application/x-shockwave-flash" wmode="Opaque" src="'+ this.getAttribute('swf') +'" width="'+ this.getAttribute('width') +'" height="'+ this.getAttribute('height') +'"  ';
 			swfNode += ' id="'+ this.getAttribute('id') +'" name="'+ this.getAttribute('id') +'" ';
 			var params = this.getParams();
 			 for(var key in params){ swfNode += [key] +'="'+ params[key] +'" '; }
@@ -129,6 +129,7 @@ infosoftglobal.FusionCharts.prototype = {
 			}
 			var pairs = this.getVariablePairs().join("&");			
 			if(pairs.length > 0) {swfNode += '<param name="flashvars" value="'+ pairs +'" />';}
+      swfNode += '<param name="wmode" value="Opaque">';
 			swfNode += "</object>";
 		}
 		return swfNode;
@@ -358,4 +359,4 @@ infosoftglobal.FusionChartsUtil.updateChartXML = function(chartId, strXML){
 /* Aliases for easy usage */
 var getChartFromId = infosoftglobal.FusionChartsUtil.getChartObject;
 var updateChartXML = infosoftglobal.FusionChartsUtil.updateChartXML;
-var FusionCharts = infosoftglobal.FusionCharts;
\ No newline at end of file
+var FusionCharts = infosoftglobal.FusionCharts;
diff --git a/trunk/www/theme/default/style.css b/trunk/www/theme/default/style.css
index 538bb86569..b88f79e361 100644
--- a/trunk/www/theme/default/style.css
+++ b/trunk/www/theme/default/style.css
@@ -115,7 +115,7 @@ tr, th, td {padding:5px}
 #submenu li a:hover {color:red;}
 
 #posbar    {margin:5px 0 5px 10px; text-align:left}
-#footer    {width:100%; position:fixed; bottom:0; left:0; margin:10px 0 0 0; border-top:2px solid #F4BF20; text-align:center; background-color:#FBF5C6; font-size:108%;}
+#footer    {width:100%; position:fixed; bottom:0; left:0; margin:10px 0 0 0; padding-left:10px;  border-top:2px solid #F4BF20; text-align:left; background-color:#FBF5C6; font-size:108%;}
 #hiddenwin {display:none}
 
 #tabbar    {font-weight:bold; font-size:108%; margin:0; padding:0; height:28px; background-color:#e4e4e4}