Serve swfobject via the assets pipeline

diff --git a/public/expressInstall.swf b/app/assets/swfobject/expressInstall.swf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from public/expressInstall.swf
rename to app/assets/swfobject/expressInstall.swf

diff --git a/app/assets/javascripts/swfobject.js b/app/assets/swfobject/swfobject.js
similarity index 100%
rename from app/assets/javascripts/swfobject.js
rename to app/assets/swfobject/swfobject.js

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index c09fdf186a9f38cd0df8ff0ada6e1aaa4eaaa3ac..da348d417525da2c04965525fe2a9d6e91f8b4b1 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -39,7 +39,7 @@
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 

-    swfobject.embedSWF("<%= asset_path("/potlatch/potlatch.swf") %>", "potlatch", "100%", "100%", "6","<%= asset_path("/expressInstall.swf") %>", flashvars, params, attributes);
+    swfobject.embedSWF("<%= asset_path("/potlatch/potlatch.swf") %>", "potlatch", "100%", "100%", "6","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);

     // 700,600 for fixed size, 100%,100% for resizable
   }
 
     // 700,600 for fixed size, 100%,100% for resizable
   }
 

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 0605ff52d397d67d59b1b446797b81f05df789ee..ceb92558c590ddacf8274674a646a4d585f05025 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -57,7 +57,7 @@
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 

-    swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.85","<%= asset_path("/expressInstall.swf") %>", flashvars, params, attributes);
+    swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.85","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);

     // 700,600 for fixed size, 100%,100% for resizable
   }
 
     // 700,600 for fixed size, 100%,100% for resizable
   }