diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index 784fb7ff8..8273c4b04 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -1,6 +1,8 @@ <% reply_allow = JournalsForMessage.create_by_user? User.current %> <% tip1 = (@bid.reward_type == 3) ? l(:label_student_response) : l(:label_user_response) %> -
<%=tip1%>
++ <%=tip1%> +
- <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= @bid.budget %> + + <%= l(:label_bids_reward_method) %> + + <%= l(:label_call_bonus) %> + + <%= l(:label_RMB_sign) %> + <%= @bid.budget %> + +
<% elsif @bid.reward_type == 2%> -- <%= l(:label_bids_reward_method) %><%= @bid.budget%> -
++ + <%= l(:label_bids_reward_method) %> + + <%= @bid.budget%> + + +
<% else %> <% end %>- <%= link_to reply.user.name, user_path(reply.user) %>: - <%= reply.notes %> + + <%= link_to reply.user.name, user_path(reply.user) %> + : + + + <%= reply.notes %> +
- <%= format_time reply.created_on %> - - <% if reply_allow %> - <%= link_to l(:label_projects_feedback_respond),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{m_reply_id.user.name}: '); return false;"} - %> - <% end %> - <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %> - <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user}, - :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %> - <% end %> - + + <%= format_time reply.created_on %> + + + <% if reply_allow %> + <%= link_to l(:label_projects_feedback_respond),'', + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{m_reply_id.user.name}: '); return false;"} %> + <% end %> + <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %> + <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %> + <% end %> +