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

[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 1a3807e4afcc6900c39d4fc429d2b6fd290dfa44..6b6c69798c4de77e10321a9cd51ffc786a0ee958 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,11 @@
 <%= javascript_include_tag "edit/id" %>
 
 <%= javascript_include_tag "edit/id" %>
 

-<div id="map">
-  <% data = { :key => Settings.id_key }
+<div id="map" class="h-100 overflow-hidden">
+  <% data = { :configured => Settings.key?(:id_application) }

      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon
      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon

+     data[:zoom] = @zoom if @zoom

      data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
      data[:url] = id_url(:locale => params[:locale]) %>
      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 %>
+  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "w-100 h-100", :allowfullscreen => "", :data => data %>

 </div>
 </div>