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

[rails.git] / app / views / diary_entry / _location.html.erb

diff --git a/app/views/diary_entry/_location.html.erb b/app/views/diary_entry/_location.html.erb
index ec8ea462a9b7e21e9e79b7c52485d018f0609df0..6828cd4dc282b536567731a55ede2bcaa4d5e12a 100644 (file)
--- a/app/views/diary_entry/_location.html.erb
+++ b/app/views/diary_entry/_location.html.erb
@@ -1,11 +1,7 @@
-<% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %>
-<%= t 'diary_entry.location.location' %>
+<%= t '.location' %>

 
 

+<a href="<%= url_for :controller => 'site', :action => 'index', :anchor => "map=14/#{location.latitude}/#{location.longitude}" %>">

 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
 </abbr>
 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
 </abbr>

-
-(<%=link_to t('diary_entry.location.view'), :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>
-/
-<%=link_to t('diary_entry.location.edit'), :controller => 'site', :action => 'edit', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>)
-<% end %>
+</a>