Merge branch 'master' into moderation

[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 c6a1f86cafa9292c2c34036d56c5dd0c9f744f42..075ac6462de78eaa2da850e9ca517adc0a1655fa 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -2,13 +2,6 @@
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <% if @user and @user.id!=@note.author.id %>
-    <div class="report-button">
-      <%= link_to new_issue_url(reportable_id: @note.id, reportable_type: @note.class.name, reported_user_id: @note.author.id), :title => t('browse.note.report') do %>
-        <%= image_tag('notice.png', size: '10x10') %>
-      <% end %>
-    </div>
-  <% end %>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
 </h2>
 
@@ -24,6 +17,11 @@
       <br/>
       <%= 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? } -%>