Merge branch 'master' into notes

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

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 95176ab04305610c1a34159b42d1202932589cd3..8f0a2001b14c189072ea725e05c4d54b0796d9d4 100644 (file)
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -2,12 +2,18 @@
 @name = printable_name @node
 @title = t('browse.node.node') + ' | ' + @name
 %>
+<% content_for :head do %>
+<%= stylesheet_link_tag 'browse' %>
+<% end %>
 <%= render :partial => "navigation" %>
-<h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>
+<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
+<% if @node.visible -%>
 <%= render :partial => "map", :object => @node %>
+<% end -%>
 <%= render :partial => "node_details", :object => @node %>
 <hr />
-<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "node", :action => "read"),
-                             :view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
-                             :edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
-%>
+<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
+| <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
+<% if @node.visible -%>
+| <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %>
+<% end -%>