]> git.openstreetmap.org Git - rails.git/blobdiff - app/views/browse/note.html.erb
Merge remote-tracking branch 'upstream/pull/2667'
[rails.git] / app / views / browse / note.html.erb
index 74d1223c79b6c760208511de59bc96b308642c9a..1be7d904170cc1f09edb124345892ff520cc9c7d 100644 (file)
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
-    <p><%= note_event("opened", @note.created_at, @note.author) %></p>
-    <% if @note.status == "closed" %>
-      <p><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
-    <% end %>
+    <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(tag.span(number_with_delimiter(@note.lat), :class => "latitude") + ", " + 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? } -%>
@@ -29,7 +35,7 @@
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
       <ul class="list-unstyled">
-        <% @note_comments[1..-1].each do |comment| %>
+        <% @note_comments[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 %>
@@ -41,7 +47,7 @@
 
   <% if @note.status == "open" %>
     <% if current_user -%>
-      <form action="#">
+      <form action="#" class="standard-form">
         <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         <div class="buttons clearfix">
           <% if current_user.moderator? -%>
@@ -53,7 +59,7 @@
       </form>
     <% end -%>
   <% else %>
-    <form action="#">
+    <form action="#" class="standard-form">
       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>