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

Merge branch 'master' into openstreetbugs

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
This commit is contained in:
Tom Hughes 2012-03-08 18:23:27 +00:00
commit e660e60966
565 changed files with 10835 additions and 29494 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/browse/_changeset_details.html.erb
View file

@ -33,8 +33,7 @@
</tr>
<tr>
<td><%=bbox.min_lon -%></td>
<td>(<a href='/?minlon=<%= bbox.min_lon %>&minlat=<%= bbox.min_lat %>&maxlon=<%= bbox.max_lon %>&maxlat=<%= bbox.max_lat %>
&box=yes' title='<%= t 'browse.changeset_details.show_area_box' %>'><%= t 'browse.changeset_details.box' %></a>)</td>
<td>(<%= link_to t('browse.changeset_details.box'), root_path(:minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => 'yes'), :title => t('browse.changeset_details.show_area_box') %>)</td>
<td><%=bbox.max_lon -%></td>
</tr>
<tr>

2
app/views/browse/node.html.erb
View file

@ -6,7 +6,7 @@
<%= 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>
<%= render :partial => "map", :object => @node %>
<%= render :partial => "node_details", :object => @node %>
<hr />

2
app/views/browse/relation.html.erb
View file

@ -6,7 +6,7 @@
<%= 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 />

2
app/views/browse/way.html.erb
View file

@ -6,7 +6,7 @@
<%= stylesheet_link_tag 'browse' %>
<% end %>
<%= render :partial => "navigation" %>
<h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
<%= render :partial => "map", :object => @way %>
<%= render :partial => "way_details", :object => @way %>
<hr />