X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/51a21e6738c5fe524472971e8171bf2442bea415..e4504399ae55525f22a7fb47e0c47434cef8cf0a:/app/views/browse/note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index dbf384799..12842f87c 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,5 +1,17 @@
-<div class='browse-section header'>
-  <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<% set_title("#{t('browse.note.title')} | #{@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 %>
+</h2>
+<div class="browse-section">
+  <h4>
+    <%= 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 %>
+  </h4>
 </div>
 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>
@@ -9,26 +21,9 @@
 <% end -%>
 
 <div class='browse-section common'>
-  <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 class='browse-field'>
-      <h4><%= t "browse.note.closed" %></h4>
-      <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
-    </div>
-  <% elsif @note.comments.length > 1 %>
-    <div class='browse-field'>
-      <h4><%= t "browse.note.last_modified" %></h4>
-      <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
-    </div>
-  <% end %>
-
   <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>
+    <%= h(@note.comments.first.body.to_html) %>
   </div>
 
   <div class='browse-field'>
@@ -38,15 +33,34 @@
 </div>
 
 <% if @note.comments.length > 1 %>
-  <div class='browse-section clearfix'>
-    <h4><%= t "browse.note.comments" %></h4>
+  <div class='browse-section clearfix 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 %>
-          <small class='deemphasize'><%= note_event(comment.created_at, comment.author) %></small>
         </li>
       <% end %>
     </ul>
   </div>
 <% end %>
+<div class="browse-section">
+  <% 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>