diff --git a/app/helpers/words_helper.rb b/app/helpers/words_helper.rb index fb9d3264..a183f5a2 100644 --- a/app/helpers/words_helper.rb +++ b/app/helpers/words_helper.rb @@ -54,4 +54,3 @@ module WordsHelper end end end - \ No newline at end of file diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index 9a4e7759..f65c973a 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,9 +1,32 @@ - -<%= form_tag({:controller => 'words', -:action => 'create_reply'}) do %> -<%= text_area_tag 'project_respond', "", :class => 'noline', :style => "resize: none;", :rows => 4, :placeholder => l(:label_projects_feedback_respond_content) %> - -<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> -<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn", :style => "margin-top: 1px;"%> - -<% end %> \ No newline at end of file + + diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index e6bde6c7..1201bae2 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -25,23 +25,20 @@ <%= l :label_comment_time %>:  <%= format_time journal.created_on %> - - <% if @user == User.current %> - <% ids = 'project_respond_form_'+ journal.id.to_s%> - <%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %> + <% if @user == User.current %> + <%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, + :method => 'post', :title => l(:button_quote))%> + <%= 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 %> + <% else %> + <%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, + :method => 'post', :title => l(:button_quote))%> <% end %> - -
style="display: none;width: 80%; margin: auto;"> - <%= render :partial => 'words/new_respond', :locals => {:journal => journal} %> -
-
- <%#= render :partial => "words/journal_reply", :locals => {:journal => journal} %> -
<% end %> <% end %>