From d22cad0327803a61851b595cab9e84675abf3914 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Fri, 19 Sep 2014 15:20:24 +0900 Subject: [PATCH] Remove the map_marker partial, which is no longer useful. --- .../agents/agent_views/user_location_agent/_show.html.erb | 7 +++++-- app/views/events/show.html.erb | 7 +++++-- app/views/shared/_map_marker.html.erb | 7 ------- 3 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 app/views/shared/_map_marker.html.erb diff --git a/app/views/agents/agent_views/user_location_agent/_show.html.erb b/app/views/agents/agent_views/user_location_agent/_show.html.erb index abe950fa..37555cd9 100644 --- a/app/views/agents/agent_views/user_location_agent/_show.html.erb +++ b/app/views/agents/agent_views/user_location_agent/_show.html.erb @@ -1,4 +1,7 @@ - +<% content_for :head do -%> +<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?sensor=false" %> +<%= javascript_include_tag "map_marker" %> +<% end -%>

Recent Event Map

@@ -15,7 +18,7 @@ var map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions); <% events.each do |event| %> - <%= render "shared/map_marker", map: 'map', location: event.location %> + map_marker(map, <%= Utils.jsonify(event.location) %>); <% end %> <% else %> diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index 279ac91c..636e8254 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -16,7 +16,10 @@

<% if @event.lat && @event.lng %> - + <% content_for :head do -%> +<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?sensor=false" %> +<%= javascript_include_tag "map_marker" %> + <% end -%>

Lat: @@ -37,7 +40,7 @@ var map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions); - <%= render "shared/map_marker", map: 'map', location: @event.location %> + map_marker(map, <%= Utils.jsonify(@event.location) %>); <% end %> diff --git a/app/views/shared/_map_marker.html.erb b/app/views/shared/_map_marker.html.erb deleted file mode 100644 index 7db4b459..00000000 --- a/app/views/shared/_map_marker.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%- unless @map_marker_included_p -%> -<%- content_for :head do -%> -<%= javascript_include_tag "map_marker" %> -<%- end -%> -<%- @map_marker_included_p = true -%> -<%- end -%> -map_marker(<%= map %>, <%= Utils.jsonify(location) %>)