diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index da10e5c9b..4a3a72aba 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -12,10 +12,14 @@
<%= format_time reply.created_on %>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 5ba80f698..f0d5a651e 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -8,20 +8,25 @@ <%= link_to journal.user, user_path(journal.user)%> <% if @user == User.current %> - <%= l(:label_leave_me_message) %> + <%= l(:label_leave_me_message) %> : <% else %> - <%= l(:label_leave_others_message) %> + <%= l(:label_leave_others_message) %> : <% end %><%= textilizable journal.notes%>
<%= l :label_comment_time %>: <%= format_time journal.created_on %> - <% ids = 'project_respond_form_'+ journal.id.to_s%> - <%#= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %> - - <%= link_to l(:label_projects_feedback_respond),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}:'); return false;"} - %> + <% ids = 'project_respond_form_'+ journal.id.to_s%> + + <%= link_to l(:label_projects_feedback_respond),'', + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}:'); return false;"} + %> + + <% if @user == User.current %> + <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %> + <% end %> +