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

Fix up issues with notes in the data browser

Browse source
This commit is contained in:
Tom Hughes 2012-10-14 15:58:40 +01:00
parent 5cb9f2b022
commit c6be5f3a6f
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ $(document).ready(function () {
setMapCenter(centre, 16);
addMarkerToMap(centre);
var bbox = getMapExtent();
var bbox = unproj(map.getExtent());
$("#loading").hide();
$("#browse_map .geolink").show();

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

@ -2,7 +2,7 @@
</iframe>
<div id="browse_map">
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
<% content_for :head do %>
<%= javascript_include_tag "browse" %>
@ -23,7 +23,7 @@
data = {
:type => "note",
:lon => map.lon,
:lon => map.lat
:lat => map.lat
}
else
data = {
@ -39,7 +39,7 @@
<% if map.instance_of? Note -%>
<%= link_to t("browse.map.larger.area"),
root_path(:note => "yes"),
root_path(:notes => "yes"),
:id => "area_larger_map",
:class => "geolink bbox" %>
<% else -%>

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

@ -11,18 +11,18 @@
<tr>
<th><%= t "browse.note.opened" %></th>
<td><%= t "browse.note.at_by", :when => friendly_date(@note.created_at), :user => note_author(@note) %></td>
<td><%= t "browse.note.at_by_html", :when => friendly_date(@note.created_at), :user => note_author(@note) %></td>
</tr>
<% if @note.status == "closed" %>
<tr>
<th><%= t "browse.note.closed" %></th>
<td><%= t "browse.note.at_by", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %></td>
<td><%= t "browse.note.at_by_html", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %></td>
</tr>
<% elsif @note.comments.length > 1 %>
<tr>
<th><%= t "browse.note.last_modified" %></th>
<td><%= t "browse.note.at_by", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %></td>
<td><%= t "browse.note.at_by_html", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %></td>
</tr>
<% end %>
@ -33,7 +33,7 @@
<tr>
<th><%= t "browse.node_details.coordinates" %></th>
<td><div class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></div></td>
<td><div 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"} %></div></td>
</tr>
<% if @note.comments.length > 1 %>
@ -46,7 +46,7 @@
<td>
<%= h(comment.body) %>
<br />
<span class="by"><%= t "browse.note.at_by", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
<span class="by"><%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
</td>
</tr>
<% end %>

2
config/locales/en.yml
View file

@ -291,7 +291,7 @@ en:
opened: "Opened:"
last_modified: "Last modified:"
closed: "Closed:"
at_by: "%{when} ago by %{user}"
at_by_html: "%{when} ago by %{user}"
description: "Description:"
comments: "Comments:"
changeset: