Merge branch 'master' into notes

[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 59ab013f781bae3e2e234cc7d95a0432c3a86713..a3ba473a8a67e54f11e08cfc79f314e9b3a4201a 100644 (file)
--- a/app/views/diary_entry/_location.html.erb
+++ b/app/views/diary_entry/_location.html.erb
@@ -1,9 +1,7 @@
 <%= t 'diary_entry.location.location' %>
 
+<a href="<%= url_for :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>">
 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
-<% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %>
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
-<% end %>
 </abbr>
-
-(<%=link_to t('diary_entry.location.view'), :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>)
+</a>