Simplify URL scheme name matching in OAuth callback URLs a little

[rails.git] / app / views / site / _potlatch.html.erb

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index c255cef9124f863e30d2a56be9f2a4eb1e8bc7e0..18e1c4cce30eb3ec89b588f749914298ddb35efd 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -3,9 +3,12 @@
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>

+
+<% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
+

 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;

-  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
+  var fo = new SWFObject("<%= asset_path("/potlatch/potlatch.swf") %>", "potlatch", "100%", "100%", "6", "#FFFFFF");

   // 700,600 for fixed size, 100%,100% for resizable
   var changesaved=true;
   var winie=false; if (document.all && window.print) { winie=true; }
   // 700,600 for fixed size, 100%,100% for resizable
   var changesaved=true;
   var winie=false; if (document.all && window.print) { winie=true; }