X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/abc5b2d7b4bf08b29074e7bb152d48b904989443..9da461cc2e9008e5a5dc861bfda0b00ce073f835:/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 825654029..9e01eef30 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -1,48 +1,19 @@ +<%= javascript_include_tag "edit/potlatch2" %> +
- <%= t 'site.edit.flash_player_required' %> + <% 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 %>
- -<%= javascript_include_tag 'swfobject.js' %> - -<% token = @user.access_token(POTLATCH2_KEY) %> - -