Merge branch 'master' into openstreetbugs

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

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index a72975dd73985e72fc34559d93ab4d2fd04b5e72..c91a0198496ea78d99a62483058615bb492b9dc8 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -4,11 +4,17 @@
 
 <%= javascript_include_tag 'swfobject.js' %>
 
 
 <%= javascript_include_tag 'swfobject.js' %>
 

+<% if defined? POTLATCH2_KEY %>

 <% token = @user.access_token(POTLATCH2_KEY) %>
 <% token = @user.access_token(POTLATCH2_KEY) %>

+<% else%>
+<script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
+<% end %>
+
+<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>

 
 <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("/potlatch2/potlatch2.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "9", "#FFFFFF");
+  var fo = new SWFObject("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "9", "#FFFFFF");

   // 700,600 for fixed size, 100%,100% for resizable
   var changesaved=true;
   
   // 700,600 for fixed size, 100%,100% for resizable
   var changesaved=true;
   


@@ -24,17 +30,24 @@
     fo.addParam("base","/potlatch2");
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }
     fo.addParam("base","/potlatch2");
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }

+    fo.addVariable("locale", "<%= Potlatch2::LOCALES[locale] %>");

     <% if params['gpx'] %>
     fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
     <% end %>
     <% if params['gpx'] %>
     fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
     <% end %>

+    <% if params['tileurl'] %>
+    fo.addVariable('tileurl' ,'<%= h(params['tileurl']) %>');
+    <% end %>

     fo.addVariable("zoom",zoom);
     fo.addVariable("zoom",zoom);

-    fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
-    fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
+    fo.addVariable("api","<%= request.protocol + request.host_with_port %>/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","<%= request.protocol + request.host_with_port %>/api/crossdomain.xml");

     fo.addVariable("connection","XML");
     fo.addVariable("connection","XML");

+    fo.addVariable("show_help","once");
+    <% if token %>

     fo.addVariable("oauth_token","<%= token.token %>");
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
     fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
     fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
     fo.addVariable("oauth_token","<%= token.token %>");
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
     fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
     fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");

+    <% end %>

     fo.addVariable("maximise_function","maximiseMap");
     fo.addVariable("minimise_function","minimiseMap");
     fo.addVariable("move_function","mapMoved");
     fo.addVariable("maximise_function","maximiseMap");
     fo.addVariable("minimise_function","minimiseMap");
     fo.addVariable("move_function","mapMoved");