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

Convert browse details to sidebar layout

Browse source
This commit is contained in:
John Firebaugh 2013-09-27 18:09:34 -07:00
parent e8ac6bd5d9
commit b30983f02b
20 changed files with 227 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/browse.js
View file

@ -23,7 +23,6 @@ $(document).ready(function () {
}).addTo(map);
$("#loading").hide();
$("#browse_map .secondary-actions").show();
$("a[data-editor=remote]").click(function () {
return remoteEditHandler(bbox);
@ -41,7 +40,6 @@ $(document).ready(function () {
bbox = map.getBounds();
$("#loading").hide();
$("#browse_map .secondary-actions").show();
$("a[data-editor=remote]").click(function () {
return remoteEditHandler(bbox);

9
app/assets/stylesheets/browse.css.scss
View file

@ -1,14 +1,5 @@
/* Make space for icons */
li.node::before,
li.way::before,
li.relation::before,
a.node:first-child::before,
a.way:first-child::before,
a.relation:first-child::before {
margin-left: -25px;
}
.node::before,
.way::before,
.relation::before {

115
app/assets/stylesheets/common.css.scss
View file

@ -926,7 +926,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
.site-index,
.site-export,
.site-edit,
.changeset-list {
.changeset-list,
.browse {
#content {
position: absolute;
top: $headerHeight;
@ -1083,59 +1084,71 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
/* Rules for the data browser */
.browse-section {
border-top: 1px solid #ccc;
margin-top: $lineheight/2;
padding-top: $lineheight/2;
&:first-child {
margin-top: 0;
}
.warning {
background-color: #ffe0cc;
margin: 0px;
padding: 4px 6px;
max-width: 100%;
}
h4, p {
margin-bottom: $lineheight/4;
}
ul, .bbox, .geo {
display: inline-block;
vertical-align: top;
max-width: 65%;
}
ul p {
margin-left: 0;
margin-bottom: 0;
}
h4 {
float: left;
width: 33.3333%;
display: inline-block;
vertical-align: top;
}
}
body.browse #sidebar_content {
.browse-section {
padding: 20px;
border-bottom: 1px solid #CCC;
.bbox {
div {
width: 33.3333%;
text-align: center;
padding: $lineheight/4 0;
overflow: hidden;
text-overflow: ellipsis;
float: left;
ul {
margin: 0;
}
}
.max_lat,
.min_lat {
margin-left: auto;
margin-right: auto;
width: 100%;
}
}
#browse_map .secondary-actions {
display: none;
margin-bottom: $lineheight/2;
.browse-field {
margin-bottom: 10px;
h4 {
margin: 0;
padding: 5px 0 5px 10px;
font-size: 12px;
border: 1px solid #CCC;
border-radius: 4px 4px 0 0;
background-color: #F6F6F6;
}
p {
margin: 0;
padding: 7px 10px;
font-size: 12px;
background-color: #FFF;
border: 1px solid #CCC;
border-top: 0;
border-radius: 0 0 4px 4px;
}
}
.browse-tag-list {
border: 1px solid #CCC;
border-radius: 4px;
font-size: 12px;
li {
border-bottom: 1px solid #CCC;
}
li:last-child {
border-bottom: 0;
}
.browse-tag-k,
.browse-tag-v {
display: inline-block;
width: 50%;
height: 30px;
float: left;
padding: 9px 10px;
}
.browse-tag-k {
font-weight: bold;
background-color: #F6F6F6;
border-radius: 4px 0 0 4px;
}
.browse-tag-v {
border-left: 1px solid #CCC;
}
}
}
/* Rules for the trace list shown by the traces tab etc */

5
app/assets/stylesheets/small.css.scss
View file

@ -46,11 +46,6 @@ h2, h3, h4 {
/* Rules for greeting bar in the top right corner */
#browse_map ul.secondary-actions {
float: right;
font-size: 10px;
}
#map {
border: 0;
}

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

@ -1,78 +0,0 @@
<div class='column-1'>
<div class='browse-section common'>
<div>
<h4><%= t 'browse.changeset_details.created_at' %></h4>
<p><%= l changeset_details.created_at %></p>
</div>
<div>
<h4><%= t 'browse.changeset_details.closed_at' %></h4>
<p><%= l changeset_details.closed_at %></p>
</div>
<% if changeset_details.user.data_public? %>
<div>
<h4><%= t 'browse.changeset_details.belongs_to' %></h4>
<p><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></p>
</div>
<% end %>
</div>
<%= render :partial => "tag_details", :object => changeset_details %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.bounding_box' %></h4>
<% unless changeset_details.has_valid_bbox? %>
<p><%= t 'browse.changeset_details.no_bounding_box' %></p>
<% else bbox = changeset_details.bbox.to_unscaled %>
<div class='bbox'>
<div class='max_lat'><%=bbox.max_lat -%></div>
<div class='min_lon'><%=bbox.min_lon -%></div>
<div class='box'>(<%= 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') %>)</div>
<div class='max_lon'><%=bbox.max_lon -%></div>
<div class='min_lat'><%= bbox.min_lat -%></div>
</div>
<% end %>
</div>
<% unless @nodes.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
<% end %>
<% unless @ways.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
<ul>
<% @ways.each do |way| %>
<li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
<%=
#render :partial => "containing_relation", :collection => changeset_details.containing_relation_members
%>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
<% end %>
<% unless @relations.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
<ul>
<% @relations.each do |relation| %>
<li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
<% end %>
</div>

10
app/views/browse/_common_details.html.erb
View file

@ -1,5 +1,5 @@
<div class='browse-section common'>
<div>
<div class='browse-field'>
<% if common_details.visible? %>
<h4><%= t 'browse.common_details.edited_at' %></h4>
<% else %>
@ -9,7 +9,7 @@
</div>
<% if common_details.changeset.user.data_public? %>
<div>
<div class='browse-field'>
<% if common_details.visible? %>
<h4><%= t 'browse.common_details.edited_by' %></h4>
<% else %>
@ -19,18 +19,18 @@
</div>
<% end %>
<div>
<div class='browse-field'>
<h4><%= t 'browse.common_details.version' %></h4>
<p><%= h(common_details.version) %></p>
</div>
<div>
<div class='browse-field'>
<h4><%= t 'browse.common_details.in_changeset' %></h4>
<p><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></p>
</div>
<% if common_details.changeset.tags['comment'].present? %>
<div>
<div class='browse-field'>
<h4><%= t 'browse.common_details.changeset_comment' %></h4>
<p><%= linkify(h(common_details.changeset.tags['comment'])) %></p>
</div>

43
app/views/browse/_navigation.html.erb
View file

@ -1,43 +0,0 @@
<% type = (@next || @prev).class.name.downcase %>
<ul class='secondary-actions clearfix pager'>
<% if @prev %>
<li>
<%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
{ :id => @prev.id },
{ :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
</li>
<% end %>
<% if @next %>
<li>
<%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
{ :id => @next.id },
{ :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
</li>
<% end %>
</ul>
<% if @next_by_user or @prev_by_user %>
<ul class='secondary-actions pager clearfix'>
<% if @prev_by_user %>
<li>
<%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
{ :id => @prev_by_user.id },
{ :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %>
</li>
<% end %>
<li>
<%=
user = (@prev_by_user || @next_by_user).user.display_name
link_to h(user),
{ :controller => "changeset", :action => "list", :display_name => user },
{ :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
%>
</li>
<% if @next_by_user %>
<li>
<%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
{ :id => @next_by_user.id },
{ :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %>
</li>
<% end %>
</ul>
<% end %>

7
app/views/browse/_node_details.html.erb
View file

@ -6,13 +6,6 @@
<% else %>
<%= render :partial => "common_details", :object => node_details %>
<% if node_details.visible -%>
<div class='browse-section'>
<h4><%= t 'browse.node_details.coordinates' %></h4>
<div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div>
</div>
<% end -%>
<% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
<div class='browse-section'>
<h4><%= t 'browse.node_details.part_of' %></h4>

5
app/views/browse/_tag.html.erb
View file

@ -1 +1,4 @@
<li><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></li>
<li class='clearfix'>
<span class='browse-tag-k'><%= format_key(tag[0]) %></span>
<span class='browse-tag-v'><%= format_value(tag[0], tag[1]) %></span>
</li>

6
app/views/browse/_tag_details.html.erb
View file

@ -1,6 +1,8 @@
<% unless tag_details.tags.empty? %>
<div class='browse-section'>
<h4><%= t'browse.tag_details.tags' %></h4>
<ul><%= render :partial => "tag", :collection => tag_details.tags.sort %></ul>
<ul class='browse-tag-list'>
<%= render :partial => "tag", :collection => tag_details.tags.sort %>
</ul>
</div>
<% end %>
<% end %>

1
app/views/browse/_way_details.html.erb
View file

@ -29,6 +29,7 @@
<ul>
<%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
</ul>
</div>
<% end %>
<% end %>
</div>

70
app/views/browse/changeset.html.erb
View file

@ -1,18 +1,72 @@
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
<div class='browse-section common'>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.created_at' %></h4>
<p><%= l @changeset.created_at %></p>
</div>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.closed_at' %></h4>
<p><%= l @changeset.closed_at %></p>
</div>
<% if @changeset.user.data_public? %>
<div class='browse-field'>
<h4><%= t 'browse.changeset_details.belongs_to' %></h4>
<p><%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %></p>
</div>
<% end %>
</div>
<%= render :partial => "tag_details", :object => @changeset %>
<% unless @nodes.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
<% end %>
<% unless @ways.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
<ul>
<% @ways.each do |way| %>
<li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
<% end %>
<% unless @relations.empty? %>
<div class='browse-section clearfix'>
<h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
<ul>
<% @relations.each do |relation| %>
<li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<% end %>
</ul>
</div>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
<li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
</ul>
<% end %>
<%= render :partial => "navigation" %>
<% if @changeset.has_valid_bbox? %>
<%= render :partial => "map", :object => @changeset %>
<% end %>
<%= render :partial => "changeset_details", :object => @changeset %>
<%= render :template => 'layouts/map' %>

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

@ -2,12 +2,17 @@
@name = printable_name @node
@title = t('browse.node.node') + ' | ' + @name
%>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
<%= render :partial => "node_details", :object => @node %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %></li>
<li><%= link_to(t('browse.node.view_history'), :action => "node_history") %></li>
@ -16,12 +21,5 @@
<% end -%>
</ul>
<% end %>
<%= render :partial => "navigation" %>
<% if @node.visible -%>
<%= render :partial => "map", :object => @node %>
<% end -%>
<div class='column-1'>
<%= render :partial => "node_details", :object => @node %>
</div>
<%= render :template => 'layouts/map' %>

21
app/views/browse/node_history.html.erb
View file

@ -2,24 +2,23 @@
@name = printable_name @node
@title = t('browse.node_history.node_history') + ' | ' + @name
%>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %></li>
<li><%= link_to(t('browse.node_history.view_details'), :action => "node") %></li>
</ul>
<% end %>
<% if @node.visible -%>
<%= render :partial => "map", :object => @node %>
<% end -%>
<div class='column-1'>
<% @node.old_nodes.reverse.each do |node| %>
<%= render :partial => "node_details", :object => node %>
<% end %>
</div>
<%= render :template => 'layouts/map' %>

34
app/views/browse/note.html.erb
View file

@ -1,19 +1,10 @@
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<h2>
<%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
</h2>
<% end %>
<%= render :partial => "navigation" %>
<%= render :partial => "map", :object => @note %>
<div class='column-1'>
<% content_for :sidebar do %>
<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
<% if @note.comments.find { |comment| comment.author.nil? } -%>
<div class='browse-section common'>
@ -22,29 +13,29 @@
<% end -%>
<div class='browse-section common'>
<div>
<div class='browse-field'>
<h4><%= t "browse.note.opened" %></h4>
<p><%= note_event(@note.created_at, @note.author) %></p>
</div>
<% if @note.status == "closed" %>
<div>
<div class='browse-field'>
<h4><%= t "browse.note.closed" %></h4>
<p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
</div>
</div>
<% elsif @note.comments.length > 1 %>
<div>
<div class='browse-field'>
<h4><%= t "browse.note.last_modified" %></h4>
<p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
</div>
</div>
<% end %>
<div id="c<%= @note.comments.first.id %>">
<div class='browse-field' id="c<%= @note.comments.first.id %>">
<h4><%= t "browse.note.description" %></h4>
<p><%= h(@note.comments.first.body.to_html) %></p>
</div>
<div>
<div class='browse-field'>
<h4><%= t "browse.node_details.coordinates" %></h4>
<p class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
</div>
@ -63,5 +54,6 @@
</ul>
</div>
<% end %>
<% end %>
</div>
<%= render :template => 'layouts/map' %>

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

@ -2,20 +2,21 @@
@name = printable_name @relation
@title = t('browse.relation.relation') + ' | ' + @name
%>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
<%= render :partial => "relation_details", :object => @relation %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %></li>
<li><%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></li>
</ul>
<% end %>
<%= render :partial => "navigation" %>
<%= render :partial => "map", :object => @relation %>
<div class='column-1'>
<%= render :partial => "relation_details", :object => @relation %>
</div>
<%= render :template => 'layouts/map' %>

18
app/views/browse/relation_history.html.erb
View file

@ -2,21 +2,23 @@
@name = printable_name @relation
@title = t('browse.relation_history.relation_history') + ' | ' + @name
%>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
<li><%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></li>
</ul>
<% end %>
<%= render :partial => "map", :object => @relation %>
<div class='column-1'>
<% @relation.old_relations.reverse.each do |relation| %>
<%= render :partial => "relation_details", :object => relation %>
<% end %>
</div>
<%= render :template => 'layouts/map' %>

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

@ -2,12 +2,17 @@
@name = printable_name @way
@title = t('browse.way.way') + ' | ' + @name
%>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
<%= render :partial => "way_details", :object => @way %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %></li>
<li><%= link_to(t('browse.way.view_history'), :action => "way_history") %></li>
@ -15,9 +20,4 @@
</ul>
<% end %>
<%= render :partial => "navigation" %>
<%= render :partial => "map", :object => @way %>
<div class='column-1'>
<%= render :partial => "way_details", :object => @way %>
</div>
<%= render :template => 'layouts/map' %>

18
app/views/browse/way_history.html.erb
View file

@ -2,21 +2,23 @@
@name = printable_name @way
@title = t('browse.way_history.way_history') + ' | ' + @name
%>
<% content_for :head do %>
<%= stylesheet_link_tag 'browse' %>
<%= stylesheet_link_tag 'browse' %>
<%= javascript_include_tag 'index' %>
<% end %>
<% content_for :heading do %>
<% content_for :sidebar do %>
<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<% end %>
<ul class='secondary-actions clearfix'>
<li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
<li><%= link_to(t('browse.way_history.view_details'), :action => "way") %></li>
</ul>
<% end %>
<%= render :partial => "map", :object => @way %>
<div class='column-1'>
<% @way.old_ways.reverse.each do |way| %>
<%= render :partial => "way_details", :object => way %>
<% end %>
</div>
<%= render :template => 'layouts/map' %>

50
config/locales/en.yml
View file

@ -97,7 +97,7 @@ en:
browse:
changeset:
title: "Changeset"
changeset: "Changeset: %{id}"
changeset: "Changeset %{id}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
@ -127,30 +127,20 @@ en:
prev_note_tooltip: "Previous note"
next_note_tooltip: "Next note"
changeset_details:
created_at: "Created at:"
closed_at: "Closed at:"
belongs_to: "Belongs to:"
bounding_box: "Bounding box:"
no_bounding_box: "No bounding box has been stored for this changeset."
show_area_box: "Show Area Box"
box: "box"
has_nodes:
one: "Has the following %{count} node:"
other: "Has the following %{count} nodes:"
has_ways:
one: "Has the following %{count} way:"
other: "Has the following %{count} ways:"
has_relations:
one: "Has the following %{count} relation:"
other: "Has the following %{count} relations:"
created_at: "Created"
closed_at: "Closed"
belongs_to: "Author"
has_nodes: "Nodes (%{count})"
has_ways: "Ways (%{count})"
has_relations: "Relations (%{count})"
common_details:
edited_at: "Edited at:"
edited_by: "Edited by:"
deleted_at: "Deleted at:"
deleted_by: "Deleted by:"
version: "Version:"
in_changeset: "In changeset:"
changeset_comment: "Comment:"
edited_at: "Edited At"
edited_by: "Edited By"
deleted_at: "Deleted At"
deleted_by: "Deleted By"
version: "Version"
in_changeset: "Changeset"
changeset_comment: "Comment"
containing_relation:
entry: "Relation %{relation_name}"
entry_role: "Relation %{relation_name} (as %{relation_role})"
@ -266,7 +256,7 @@ en:
way: "Way %{id}"
# There is no 'relation' type because it is not represented in OpenLayers
tag_details:
tags: "Tags:"
tags: "Tags"
wiki_link:
key: "The wiki description page for the %{key} tag"
tag: "The wiki description page for the %{key}=%{value} tag"
@ -292,13 +282,13 @@ en:
title: "Note"
open_title: "Unresolved note: %{note_name}"
closed_title: "Resolved note: %{note_name}"
opened: "Opened:"
last_modified: "Last modified:"
closed: "Closed:"
opened: "Opened"
last_modified: "Last modified"
closed: "Closed"
at_html: "%{when} ago"
at_by_html: "%{when} ago by %{user}"
description: "Description:"
comments: "Comments:"
description: "Description"
comments: "Comments"
changeset:
changeset_paging_nav:
showing_page: "Page %{page}"