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

[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 075ac6462de78eaa2da850e9ca517adc0a1655fa..c7989d789a8991e82aba1af6745dac89d77ce373 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,33 +1,32 @@
-<% set_title(t('browse.note.title', :id => @note.id)) %>
+<% set_title(t(".title", :id => @note.id)) %>

 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+  <%= t ".#{@note.status}_title", :note_name => @note.id %>

 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

-  <h4><%= t('browse.note.description') %></h4>
+  <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 %>">
   <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('open', @note.created_at, @note.author) %>
+    <%= note_event("open", @note.created_at, @note.author) %>

     <% if @note.status == "closed" %>
     <% if @note.status == "closed" %>

-      <br/>
+      <br />

       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% end %>
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% end %>

-    <% if current_user && current_user != @note.author %>
-      <%= link_to new_report_url(reportable_id: @note.id, reportable_type: @note.class.name), :title => t('browse.note.report') do %>
-          &nbsp;&#9872;
-      <% end %>
-    <% end %>

   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>
     <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
   <% end -%>
 
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>
     <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
   <% end -%>
 

+  <% if current_user && current_user != @note.author %>
+    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+  <% end %>
+

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


@@ -43,19 +42,27 @@
 
   <% if @note.status == "open" %>
     <form action="#">
 
   <% if @note.status == "open" %>
     <form action="#">

-      <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+      <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>

       <div class="buttons clearfix">
       <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">
+        <% 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">
       </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') %>">
+        <% 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>
     </form>
   <% end %>