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

[rails.git] / app / views / site / _id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 9b44ed4613f38a64345a3e980aa56a0a8dda31c4..c0ea3631b35a11d7b99068f33c69a23c170622f9 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">
-  <% data = { :key => Settings.id_key } -%>
-  <% data[:lat] = @lat if @lat -%>
-  <% data[:lon] = @lon if @lon -%>
-  <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>
-  <% data[:url] = id_url(:locale => params[:locale]) -%>
-  <%= content_tag :iframe, "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
+  <% data = { :configured => Settings.key?(:id_application) }
+     data[:lat] = @lat if @lat
+     data[:lon] = @lon if @lon
+     data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
+     data[:url] = id_url(:locale => params[:locale]) %>
+  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
 </div>