Commit fa998338e192f2a10ddba280104a1cfcbcba8355

Authored by Rodrigo Souto
2 parents 400a36af 4ee3fe12

Merge commit 'refs/merge-requests/357' of git://gitorious.org/noosfero/noosfero into stable

app/views/blocks/location.html.erb
1 1 <% if profile.lat %>
2 2 <%= block_title block.title %>
3 3 <div class='the-localization-map'>
4   - <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
  4 + <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
5 5 </div>
6 6 </div>
7 7 <% else %>
... ...
app/views/maps/edit_location.rhtml
... ... @@ -29,5 +29,5 @@
29 29  
30 30 <% end %>
31 31  
32   -<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
  32 +<%= content_tag('script', '', :src => "https://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
33 33 <%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
... ...