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

Get the note browse pages into a vaguely working state

Browse source
This commit is contained in:
Tom Hughes 2011-08-13 13:25:41 +01:00
parent a693862371
commit 81a6c7b7be
6 changed files with 108 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,14 +6,14 @@
</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? %>
<div id="small_map">
</div>
<span id="loading"><%= t 'browse.map.loading' %></span>
<%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
<br />
<%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
<% unless map.instance_of? Changeset %>
<% unless map.instance_of? Changeset or map.instance_of? Note %>
<br />
<%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
<br />
@ -40,7 +40,7 @@
</ul>
</div>
<% 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? %>
<script type="text/javascript">
OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
@ -105,9 +105,25 @@
setMapCenter(centre, 16);
addMarkerToMap(centre);
var bbox = getMapExtent();
$("loading").style.display = "none";
updatelinks(centre.lon, centre.lat, 16, null, null, null, null, null)
$$("#browse_map .geolink").each(function (link) {
link.style.display = "inline";
});
$("remote_area_edit").observe("click", function (event) {
remoteEditHandler(event, bbox);
});
<% if preferred_editor == "remote" %>
$("area_edit").observe("click", function (event) {
remoteEditHandler(event, bbox);
});
<% end %>
updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
<% else %>
var obj_type = "<%= map.class.name.downcase %>";
var obj_id = <%= map.id %>;

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

@ -1,83 +1,58 @@
<table width="100%">
<%= render :partial => "navigation" %>
<h2>
<%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
</h2>
<%= render :partial => "map", :object => @note %>
<table class="browse_details">
<tr>
<td width="100%">
<h2>
<% if @note.status == "closed" %>
<%= image_tag("closed_note_marker.png", :alt => 'closed') %>
<%= t 'browse.note.closed_title', :note_name => @note.id %>
<% else %>
<%= image_tag("open_note_marker.png", :alt => 'open') %>
<%= t 'browse.note.open_title', :note_name => @note.id %>
<% end %>
</h2>
</td>
<td>
<%= render :partial => "navigation" %>
</td>
<th><%= t "browse.note.opened" %></th>
<td><%= t "browse.note.at_by", :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>
</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>
</tr>
<% end %>
<tr>
<th><%= t "browse.note.description" %></th>
<td><%= h(@note.comments.first.body) %></td>
</tr>
<tr valign="top">
<td>
<table>
<tr>
<th><%= t 'browse.note.created_at' %></th>
<td><%= l @note.created_at %></td>
</tr>
<tr>
<th><%= t 'browse.note.edited_at' %></th>
<td><%= l @note.updated_at %></td>
</tr>
<% if @note.status == "closed" %>
<tr>
<th><%= t 'browse.note.closed_at' %></th>
<td><%= l @note.closed_at %></td>
</tr>
<% end %>
<tr>
<th><%= t 'browse.note.opened_by' %></th>
<% if @note.author.nil? %>
<td> <%= @note.author_name %> </td>
<% else %>
<td><%= link_to h(@note.author_name), :controller => "user", :action => "view", :display_name => @note.author_name %></td>
<% end %>
</tr>
<tr>
<th><%= t 'browse.note.description' %></th>
<td><%= h(@note.comments.first.body) %></td>
</tr>
<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>
</tr>
</table>
<br />
<% if @note.comments.length > 1 %>
<table>
<tr>
<th width="20%"> <%= t 'browse.note.comment_by' %></th>
<th width="60%"> <%= t 'browse.note.comment' %></th>
<th width="20%"> <%= t 'browse.note.date' %></th>
</tr>
<% @note.comments[1..-1].each do |comment| %>
<tr>
<td>
<% if comment.author.nil? %>
<%= comment.author_name %>
<% else %>
<%= link_to h(comment.author.display_name), :controller => "user", :action => "view", :display_name => comment.author.display_name %>
<% end %>
</td>
<td> <%= h(comment.body) %> </td>
<td> <%= l comment.created_at %> </td>
</tr>
<% end %>
</table>
<% end %>
<hr />
</td>
<%= render :partial => "map", :object => @note %>
<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>
</tr>
<% if @note.comments.length > 1 %>
<tr valign="top">
<th><%= t "browse.note.comments" %></th>
<td class="browse_comments">
<table>
<% @note.comments[1..-1].each do |comment| %>
<tr>
<td>
<%= h(comment.body) %>
<br />
<span class="by"><%= t "browse.note.at_by", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
</td>
</tr>
<% end %>
</table>
</td>
</tr>
<% end %>
</table>