Merge branch 'master' into notes

[rails.git] / app / views / browse / relation.html.erb

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index b8d0bc3b527ae9af04619265115e984051b2d4f3..28e251ac2e1565aa498827ca2554f488159df3ca 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -6,9 +6,9 @@
 <%= stylesheet_link_tag 'browse' %>
 <% end %>
 <%= render :partial => "navigation" %>
 <%= stylesheet_link_tag 'browse' %>
 <% end %>
 <%= render :partial => "navigation" %>

-<h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
+<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>

 <%= render :partial => "map", :object => @relation %>
 <%= render :partial => "relation_details", :object => @relation %>
 <hr />
 <%= render :partial => "map", :object => @relation %>
 <%= render :partial => "relation_details", :object => @relation %>
 <hr />

-<%= t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
-                                 :view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>
+<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
+| <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>