From 19ba9da2ce9af1d51206c7f12995b6c1eca9ee8a Mon Sep 17 00:00:00 2001
From: harris wong <hwong@ocad.ca>
Date: Fri, 9 Sep 2011 14:34:00 +0000
Subject: [PATCH] 4807: added flash path in the configuration.

---
 .../_core/file_manager/filemanager_display.inc.php   | 12 +++++++++++-
 docs/themes/default/include/header.tmpl.php          |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/mods/_core/file_manager/filemanager_display.inc.php b/docs/mods/_core/file_manager/filemanager_display.inc.php
index ec0f3cda5..5dbedb212 100644
--- a/docs/mods/_core/file_manager/filemanager_display.inc.php
+++ b/docs/mods/_core/file_manager/filemanager_display.inc.php
@@ -196,7 +196,7 @@ if (TRUE || $framed != TRUE) {
 					<th class="fl-uploader-file-name">File Name</th>
 					<th class="fl-uploader-file-size">Size</th>
 					<th class="fl-uploader-file-actions"></th>
-				</tr>
+				</tr>u
             </table>
             
             <!-- File Queue body, which is the default container for the FileQueueView component -->
@@ -321,6 +321,16 @@ if (TRUE || $framed != TRUE) {
                         window.location = "<?php echo AT_BASE_HREF; ?>mods/_core/file_manager/index.php?pathext=<?php echo $pathext; ?>";
                     }
     		    },
+    		    components: {
+                    strategy: {
+                        options: {
+                            flashMovieSettings: {
+                                flashURL: "<?php echo AT_BASE_HREF; ?>jscripts/infusion/lib/swfupload/flash/swfupload.swf",
+                                flashButtonImageURL: "<?php echo AT_BASE_HREF; ?>jscripts/infusion/components/uploader/images/browse.png"
+                            }
+                        }
+                    }
+                }
             });
             
             //bind fluid checkbox
diff --git a/docs/themes/default/include/header.tmpl.php b/docs/themes/default/include/header.tmpl.php
index f7f85abe9..335301a68 100644
--- a/docs/themes/default/include/header.tmpl.php
+++ b/docs/themes/default/include/header.tmpl.php
@@ -80,6 +80,7 @@ global $system_courses, $_custom_css, $db;
 
     <!-- Fluid and jQuery Dependencies -->
     <script type="text/javascript" src="<?php echo $this->base_href; ?>jscripts/infusion/InfusionAll.js"></script>
+    <script type="text/javascript" src="<?php echo $this->base_href; ?>jscripts/infusion/framework/enhancement/js/ProgressiveEnhancement.js"></script>
         
 	<script language="javascript" type="text/javascript">
 	//<!--
-- 
2.17.1