X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0ea9f92be50a8763331a81d3c32a5f5a157265c6..a4b5485405ee1b45209302d1d34733199ffd33cb:/app/views/site/_potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index a72975dd7..535992f2f 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,15 +1,18 @@
 <div id="map">
-  <%= t 'site.edit.flash_player_required' %>
+  <div id="potlatch"><%= raw t 'site.edit.flash_player_required' %></div>
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
 
+<% if defined? 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;
-  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() {
@@ -21,32 +24,63 @@
   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); }
+    var flashvars = {};
+    if (lat) { flashvars.lat = lat; }
+    if (lon) { flashvars.lon = lon; }
+    flashvars.zoom = zoom;
+    flashvars.assets = "<%= asset_path "potlatch2/assets.zip" %>";
+    flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";
+    flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
+    flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";
     <% if params['gpx'] %>
-    fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
+    flashvars.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.addVariable("move_function","mapMoved");
-    fo.write("map");
-  }
+    <% if params['tileurl'] %>
+    flashvars.tileurl = '<%= h(params['tileurl']) %>';
+    <% end %>
+    flashvars.api = "<%= request.protocol + request.host_with_port %>/api/<%= API_VERSION %>/";
+    flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
+    flashvars.connection = "XML";
+    flashvars.show_help = "once";
+    flashvars.user_check = "warn";
+    <% if token %>
+    flashvars.oauth_token = "<%= token.token %>";
+    flashvars.oauth_token_secret = "<%= token.secret %>";
+    flashvars.oauth_consumer_key = "<%= token.client_application.key %>";
+    flashvars.oauth_consumer_secret = "<%= token.client_application.secret %>";
+    <% end %>
+    flashvars.maximise_function = "maximiseMap";
+    flashvars.minimise_function = "minimiseMap";
+    flashvars.move_function = "mapMoved";
 
-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+    var params = {};
+    params.base = "/potlatch2";
 
-  function setPosition(lat, lon, zoom) {
-    $("potlatch").setPosition(lat, lon, Math.max(zoom || 15, 13));
+    var attributes = {};
+    attributes.id = "potlatch";
+    attributes.bgcolor = "#FFFFFF";
+
+    swfobject.embedSWF("<%= asset_path("potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
+    // 700,600 for fixed size, 100%,100% for resizable
   }
 
+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);
+  <% else -%>
+  var params = OSM.mapParams();
+  doSWF(params.lat, params.lon, params.zoom || 17);
+  <% end -%>
+
+  $(document).ready(function () {
+    $("body").on("click", "a.set_position", function () {
+      var data = $(this).data();
+
+      $("#potlatch").each(function () {
+        this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));
+      });
+    });
+  });
+
   function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
     updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
   }