From 1f383dcbd7a52b9a1b5ec120750a85bb65ffcfb8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 7 Oct 2011 19:31:30 +0100 Subject: [PATCH] Serve swfobject via the assets pipeline --- {public => app/assets/swfobject}/expressInstall.swf | Bin app/assets/{javascripts => swfobject}/swfobject.js | 0 app/views/site/_potlatch.html.erb | 2 +- app/views/site/_potlatch2.html.erb | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {public => app/assets/swfobject}/expressInstall.swf (100%) mode change 100755 => 100644 rename app/assets/{javascripts => swfobject}/swfobject.js (100%) diff --git a/public/expressInstall.swf b/app/assets/swfobject/expressInstall.swf old mode 100755 new mode 100644 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 c09fdf186..da348d417 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -39,7 +39,7 @@ 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 } diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 0605ff52d..ceb92558c 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -57,7 +57,7 @@ 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 } -- 2.43.2