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

[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 2d2560ef2ff51a5e52b584cc07962f0b8b3a034e..fb186e55e49130f1360939fe687c815cd890f300 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,50 +1,76 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<% set_title(t(".title", :id => @note.id)) %>

 
 

-<% if @note.comments.find { |comment| comment.author.nil? } -%>
-<div class='browse-section common'>
-  <p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
-</div>
-<% end -%>
+<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>

 
 

-<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>
+  <h4><%= t(".description") %></h4>
+  <div class="note-description">
+    <%= h(@note_comments.first.body.to_html) %>

   </div>
 
   </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 class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
+    <ul class="list-unstyled">
+      <li><%= note_event("opened", @note.created_at, @note.author) %></li>
+      <% if @note.status == "closed" %>
+        <li><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></li>
+      <% end %>
+      <li>
+        <%= t "browse.location" %>
+        <%= link_to(t(".coordinates_html",
+                      :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
+                      :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
+                    root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
+      </li>
+    </ul>
+  </div>
+
+  <% if @note_comments.find { |comment| comment.author.nil? } -%>
+    <p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <% end -%>
+
+  <% if @note_comments.length > 1 %>
+    <div class='note-comments'>
+      <ul class="list-unstyled">
+        <% @note_comments.drop(1).each do |comment| %>
+          <li id="c<%= comment.id %>">
+            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <%= comment.body.to_html %>
+          </li>
+        <% end %>
+      </ul>

     </div>
   <% end %>
 
     </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>
-  </div>
+  <% if @note.status == "open" %>
+    <% if current_user -%>
+      <form class="mb-3" action="#">
+        <div class="mb-3">
+          <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
+        </div>
+        <div class="btn-wrapper">
+          <% if current_user.moderator? -%>
+            <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">
+          <% end -%>
+          <input type="submit" name="close" value="<%= t("javascripts.notes.show.resolve") %>" class="btn btn-primary" 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") %>" class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1">
+        </div>
+      </form>
+    <% end -%>
+  <% else %>
+    <form class="mb-3" action="#">
+      <input type="hidden" name="text" value="" autocomplete="off">
+      <div class="btn-wrapper">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" 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") %>" class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>">
+        <% end -%>
+      </div>
+    </form>
+  <% end %>

 
 

-  <div class='browse-field'>
-    <h4><%= t "browse.node_details.coordinates" %></h4>
-    <p 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"} %></p>
-  </div>
+  <% if current_user && current_user != @note.author %>
+    <p><small class="text-muted"><%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %></small></p>
+  <% end %>

 </div>
 </div>

-
-<% if @note.comments.length > 1 %>
-  <div class='browse-section clearfix'>
-    <h4><%= t "browse.note.comments" %></h4>
-    <ul>
-      <% @note.comments[1..-1].each do |comment| %>
-        <li id="c<%= comment.id %>">
-          <%= comment.body.to_html %>
-          <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>