Merge remote-tracking branch 'upstream/pull/5341'

[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 d2358f05e0afd291632060032836d8e695c17e47..9d271d4ce3e4dc45ac29d0e75e755d95ca04c2a9 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,48 +1 @@
-<div id="map">
-  <%= t 'site.edit.flash_player_required' %>
-</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.potlatch_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) {
-    doSWF(lat, lon, zoom || 15);
-  }
-</script>
+<%= render :partial => "potlatch" %>