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

[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 ffc198b0a52ebf6c05db80184cb3fba30ac84a82..0180e26cad8d84103558354ee9a76f1163823116 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,38 +1,43 @@
 <% set_title(t(".title", :id => @note.id)) %>
 
 <% set_title(t(".title", :id => @note.id)) %>
 

-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".#{@note.status}_title", :note_name => @note.id %>
-</h2>
+<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>

 
 

-<div class="browse-section">
+<div>

   <h4><%= t(".description") %></h4>
   <div class="note-description">
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
   <h4><%= t(".description") %></h4>
   <div class="note-description">
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">

-    <%= note_event("opened", @note.created_at, @note.author) %>
-    <% if @note.status == "closed" %>
-      <br />
-      <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
-    <% 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(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? } -%>
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>

-    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+    <p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>

   <% end -%>
 
   <% if current_user && current_user != @note.author %>
   <% end -%>
 
   <% if current_user && current_user != @note.author %>

-    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+    <p class="text-muted"><%= report_link(t(".report"), @note) %></p>

   <% end %>
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
       <ul class="list-unstyled">
   <% end %>
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
       <ul class="list-unstyled">

-        <% @note_comments[1..-1].each do |comment| %>
+        <% @note_comments.drop(1).each do |comment| %>

           <li id="c<%= comment.id %>">
           <li id="c<%= comment.id %>">

-            <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>

             <%= comment.body.to_html %>
           </li>
         <% end %>
             <%= comment.body.to_html %>
           </li>
         <% end %>


@@ -43,25 +48,27 @@
   <% if @note.status == "open" %>
     <% if current_user -%>
       <form action="#">
   <% if @note.status == "open" %>
     <% if current_user -%>
       <form action="#">

-        <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
-        <div class="buttons clearfix">
+        <div class="form-group">
+          <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
+        </div>
+        <div class="btn-wrapper">

           <% if current_user.moderator? -%>
           <% if 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") %>">
+            <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 -%>
           <% end -%>

-          <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") %>">
-          <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">
+          <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 action="#">
       <input type="hidden" name="text" value="">
         </div>
       </form>
     <% end -%>
   <% else %>
     <form action="#">
       <input type="hidden" name="text" value="">

-      <div class="buttons clearfix">
+      <div class="btn-wrapper">

         <% if current_user and current_user.moderator? -%>
         <% 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") %>">
+          <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 -%>
         <% 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") %>">
+          <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>
     </form>