Refactor creating a new report to use a ReportsController

[rails.git] / app / views / diary_entry / _diary_entry.html.erb

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 9af5586d3414882c31d72b716f0d416980df9eee..872e31b3aa347c7e27c69b314ea62bbbeb5d347b 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -6,12 +6,10 @@
 
     <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
 
-    <% if @user and diary_entry.user.id != @user.id %>
-      <div class="report-button">
-          <%= link_to new_issue_url(reportable_id: diary_entry.id, reportable_type: diary_entry.class.name, reported_user_id: diary_entry.user.id), :title => t('diary_entry.diary_entry.report') do %>
-            <%= image_tag('notice.png', size: '10x10') %>
+    <% if current_user and diary_entry.user != current_user %>
+           <%= link_to new_report_url(reportable_id: diary_entry.id, reportable_type: diary_entry.class.name), :title => t('diary_entry.diary_entry.report') do %>
+            &nbsp;&#9872;
           <% end %>
-      </div>
     <% end %>
 
     <small class='deemphasize'>
@@ -39,7 +37,6 @@
       <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
     <% end %>
 
-
     <%= if_administrator(:li) do %>
       <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %>
     <% end %>