-<table width="100%">
- <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>
- </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>
+<% set_title(t('browse.note.title', :id => @note.id)) %>
+
+<h2>
+ <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+ <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+ <% if current_user && @note.author && current_user.id != @note.author.id %>
+ <%= link_to new_issue_url(reportable_id: @note.id, reportable_type: @note.class.name, referer: request.fullpath), :title => t('browse.note.report') do %>
+ ⚐
+ <% end %>
+ <% end %>
+</h2>
- <br />
+<div class="browse-section">
+ <h4><%= t('browse.note.description') %></h4>
+ <div class="note-description">
+ <%= h(@note_comments.first.body.to_html) %>
+ </div>
- <% 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>
+ <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
+ <%= note_event('open', @note.created_at, @note.author) %>
+ <% if @note.status == "closed" %>
+ <br/>
+ <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
<% end %>
-
- <hr />
- </td>
+ </div>
+
+ <% if @note_comments.find { |comment| comment.author.nil? } -%>
+ <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+ <% end -%>
+
+ <% if @note_comments.length > 1 %>
+ <div class='note-comments'>
+ <ul>
+ <% @note_comments[1..-1].each do |comment| %>
+ <li id="c<%= comment.id %>">
+ <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+ <%= comment.body.to_html %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
- <%= render :partial => "map", :object => @note %>
- </tr>
-</table>
+ <% if @note.status == "open" %>
+ <form action="#">
+ <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+ <div class="buttons clearfix">
+ <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+ <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+ <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1">
+ </div>
+ </form>
+ <% else %>
+ <form action="#">
+ <input type="hidden" name="text" value="">
+ <div class="buttons clearfix">
+ <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+ <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+ </div>
+ </form>
+ <% end %>
+</div>
projects / rails.git / blobdiff