cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix test failures

Browse source
This commit is contained in:
John Firebaugh 2013-11-15 15:36:54 -08:00
parent 44629832dd
commit e91956d0f7
58 changed files with 231 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/browse/_node.html.erb
View file

@ -1,11 +1,13 @@
<div class='browse-section'>
<% if node.redacted? %>
<% if node.redacted? %>
<div class='browse-section browse-redacted'>
<%= t 'browse.redacted.message_html',
:type => t('browse.redacted.type.node'),
:version => node.version,
:redaction_link => link_to(t('browse.redacted.redaction',
:id => node.redaction.id), node.redaction) %>
<% else %>
</div>
<% else %>
<div class='browse-section browse-node'>
<%= render :partial => "common_details", :object => node %>
<% unless node.ways.empty? and node.containing_relation_members.empty? %>
@ -17,5 +19,5 @@
<%= render :partial => "containing_relation", :collection => node.containing_relation_members %>
</ul>
<% end %>
<% end %>
</div>
</div>
<% end %>

12
app/views/browse/_relation.html.erb
View file

@ -1,11 +1,13 @@
<div class='browse-section'>
<% if relation.redacted? %>
<% if relation.redacted? %>
<div class='browse-section browse-redacted'>
<%= t 'browse.redacted.message_html',
:type => t('browse.redacted.type.relation'),
:version => relation.version,
:redaction_link => link_to(t('browse.redacted.redaction',
:id => relation.redaction.id), relation.redaction) %><
<% else %>
</div>
<% else %>
<div class='browse-section browse-relation'>
<%= render :partial => "common_details", :object => relation %>
<% unless relation.relation_members.empty? %>
@ -17,5 +19,5 @@
<h4><%= t'browse.part_of' %></h4>
<ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members %></ul>
<% end %>
<% end %>
</div>
</div>
<% end %>

12
app/views/browse/_way.html.erb
View file

@ -1,11 +1,13 @@
<div class='browse-section'>
<% if way.redacted? %>
<% if way.redacted? %>
<div class='browse-section browse-redacted'>
<%= t 'browse.redacted.message_html',
:type => t('browse.redacted.type.way'),
:version => way.version,
:redaction_link => link_to(t('browse.redacted.redaction',
:id => way.redaction.id), way.redaction) %>
<% else %>
</div>
<% else %>
<div class='browse-section browse-way'>
<%= render :partial => "common_details", :object => way %>
<% unless way.way_nodes.empty? %>
@ -29,5 +31,5 @@
<%= render :partial => "containing_relation", :collection => way.containing_relation_members %>
</ul>
<% end %>
<% end %>
</div>
</div>
<% end %>