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

[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 c443a917ac272f5eb6c40a46990411cfdba132ab..9e01eef302ab204e49d4d2d5278bd896b6aa7663 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,82 +1,19 @@
+<%= javascript_include_tag "edit/potlatch2" %>
+
 <div id="map">
-  <div id="potlatch"><%= raw t 'site.edit.flash_player_required' %></div>
+  <% 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' %>
-
-<% 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 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) {
-    var flashvars = {};
-    if (lat) { flashvars.lat = lat; }
-    if (lon) { flashvars.lon = lon; }
-    flashvars.zoom = zoom;
-    flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
-    <% if params['gpx'] %>
-    flashvars.gpx = '<%= h(params['gpx']) %>';
-    <% end %>
-    <% 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";
-    <% 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";
-
-    var params = {};
-    params.base = "/potlatch2";
-
-    var attributes = {};
-    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);
-    // 700,600 for fixed size, 100%,100% for resizable
-  }
-
-  <% if params[:node] -%>
-  <% bbox = Node.find(params[:node]).bbox.to_unscaled -%>
-  doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
-  <% elsif params[:way] -%>
-  <% bbox = Way.find(params[:way]).bbox.to_unscaled -%>
-  doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
-  <% else -%>
-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
-  <% end -%>
-
-  function setPosition(lat, lon, zoom) {
-    $("#potlatch").each(function () {
-      this.setPosition(lat, lon, Math.max(zoom || 15, 13));
-    });
-  }
-
-  function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
-    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
-  }
-</script>