X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70d75e3dc0ac3d2303f04b19a49d915947279842..8a2df0e0b5347be90543dc7c9f025ef8136b08c3:/app/views/site/_potlatch2.html.erb?ds=sidebyside

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index cda423e29..9e01eef30 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,48 +1,19 @@
+<%= javascript_include_tag "edit/potlatch2" %>
+
 <div id="map">
-  <%= t 'site.edit.flash_player_required' %>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%>
+  <% data = { :token => session[:token] } -%>
+  <% data[:lat] = @lat if @lat -%>
+  <% data[:lon] = @lon if @lon -%>
+  <% data[:zoom] = @zoom if @zoom -%>
+  <% if defined? POTLATCH2_KEY %>
+  <% token = current_user.access_token(POTLATCH2_KEY) %>
+  <% data[:token] = token.token -%>
+  <% data[:token_secret] = token.secret -%>
+  <% data[:consumer_key] = token.client_application.key -%>
+  <% data[:consumer_secret] = token.client_application.secret -%>
+  <% end %>
+  <% data[:locale] = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s -%>
+  <% data[:locale_path] = asset_path("potlatch2/locales/#{Potlatch2::LOCALES[data[:locale]]}.swf") -%>
+  <%= content_tag :div, raw(t("site.edit.flash_player_required")), :id => "potlatch", :data => data %>
 </div>
-
-<%= javascript_include_tag 'swfobject.js' %>
-
-<% token = @user.access_token(POTLATCH2_KEY) %>
-
-<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");
-  // 700,600 for fixed size, 100%,100% for resizable
-  var changesaved=true;
-  
-  window.onbeforeunload=function() {
-    if (!changesaved) {
-      return '<%= escape_javascript(t('site.edit.potlatch2_unsaved_changes')) %>';
-    }
-  }
-
-  function markChanged(a) { changesaved=a; }
-
-  function doSWF(lat,lon,zoom) {
-    fo.addParam("base","/potlatch2");
-    if (lat) { fo.addVariable("lat",lat); }
-    if (lon) { fo.addVariable("lon",lon); }
-    <% if params['gpx'] %>
-    fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
-    <% end %>
-    fo.addVariable("zoom",zoom);
-    fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
-    fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
-    fo.addVariable("connection","XML");
-    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("maximise_function","maximiseMap");
-    fo.addVariable("minimise_function","minimiseMap");
-    fo.write("map");
-  }
-
-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
-
-  function setPosition(lat, lon, zoom) {
-    $("potlatch").setPosition(lat, lon, Math.max(zoom || 15, 13));
-  }
-</script>