Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 59c96c4aa2bc78c791c0ec5e8e347c43ca20f483..a677a7c14e72684bbb6c776961bd6236d57900f0 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,58 +1,69 @@
-<%= render :partial => "navigation" %>
+<% set_title(t('.title', :id => @note.id)) %>

 
 <h2>
 
 <h2>

-  <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
-  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t ".#{@note.status}_title", :note_name => @note.id %>

 </h2>
 
 </h2>
 

-<%= render :partial => "map", :object => @note %>
+<div class="browse-section">
+  <h4><%= t('.description') %></h4>
+  <div class="note-description">
+    <%= h(@note_comments.first.body.to_html) %>
+  </div>

 
 

-<table class="browse_details">
+  <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 %>
+  </div>

 
 

-  <tr>
-    <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_comments.find { |comment| comment.author.nil? } -%>
+    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <% end -%>

 
 

-  <% 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>  
+  <% if current_user && current_user != @note.author %>
+    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>

   <% end %>
 
   <% end %>
 

-  <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>
-
-  <% 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>
+  <% 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 %>
 
   <% end %>
 

-</table>
+  <% if @note.status == "open" %>
+    <form action="#">
+      <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
+      <div class="buttons clearfix">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <% end -%>
+        <% if current_user -%>
+          <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+        <% end -%>
+        <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">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <% end -%>
+        <% if current_user -%>
+          <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+        <% end -%>
+      </div>
+    </form>
+  <% end %>
+</div>