X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/13289d404188bd397ee72852f66c415a2bb87066..448a68447fcadbb1e544fe8ebdea4d029e9593a1:/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 e7a2564f9..1c203b2fb 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -10,7 +10,7 @@
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 
-<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>
+<% locale = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s %>
 
 <script type="text/javascript" defer="defer">
   var changesaved=true;
@@ -28,7 +28,12 @@
     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") %>";
+    flashvars.intro_image = "<%= asset_path "help/introduction.jpg" %>";
+    flashvars.intro_video = "<%= asset_path "help/introduction.mp4" %>";
     <% if params['gpx'] %>
     flashvars.gpx = '<%= h(params['gpx']) %>';
     <% end %>
@@ -39,6 +44,7 @@
     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 %>";
@@ -56,19 +62,27 @@
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 
-    swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.85","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
+    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) {
+      updateLinks({ lon: lon, lat: lat }, zoom);
+    }
   }
 
-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+<% if @lat && @lon -%>
+  doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);
+<% else -%>
+  var mapParams = OSM.mapParams();
+  doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
+<% end -%>
 
-  function setPosition(lat, lon, zoom) {
-    $("#potlatch").each(function () {
-      this.setPosition(lat, lon, Math.max(zoom || 15, 13));
-    });
-  }
+  var mapMoved = $.throttle(250, function(lon, lat, zoom) {
+    updateLinks({ lon: lon, lat: lat }, zoom);
 
-  function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
-    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
-  }
+    var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom });
+    if (hash !== location.hash) {
+      location.replace(hash);
+    }
+  });
 </script>