X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20e5f756be74c8adf31d7ec3a6406a2b4bdb22c1..f75eb6fe9ef1e0a755c1a1810c5ca15ed58d9d08:/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 73ef782b5..bab612491 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,88 +1,19 @@
+<%= javascript_include_tag "edit/potlatch2" %>
+
-
<%= raw t 'site.edit.flash_player_required' %>
+ <% session[:token] = current_user.tokens.create.token unless session[:token] && 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 Settings.key?(:potlatch2_key) %>
+ <% token = current_user.access_token(Settings.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, t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
-
-<%= javascript_include_tag 'swfobject.js' %>
-
-<% if defined? POTLATCH2_KEY %>
-<% token = @user.access_token(POTLATCH2_KEY) %>
-<% else%>
-
-<% end %>
-
-<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>
-
-