From ac5a9c87acae384b920d9441ec439d6e8b821837 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 14:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=90=8C=E6=84=8F|=E6=8B=92=E7=BB=9D?= =?UTF-8?q?=E2=80=9D=E8=B0=83=E6=95=B4=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_apply_homework_course_message.html.erb | 27 ++++++++ .../_join_course_course_message.html.erb | 37 ++++++++++ app/views/users/_user_message_course.html.erb | 69 ++----------------- .../users/dealwith_apply_homework.js.erb | 12 +--- app/views/users/dealwith_apply_request.js.erb | 12 +--- public/stylesheets/new_user.css | 2 + 6 files changed, 72 insertions(+), 87 deletions(-) create mode 100644 app/views/users/_apply_homework_course_message.html.erb create mode 100644 app/views/users/_join_course_course_message.html.erb diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb new file mode 100644 index 000000000..cf048bcd6 --- /dev/null +++ b/app/views/users/_apply_homework_course_message.html.erb @@ -0,0 +1,27 @@ +
    • +
  • + <%= link_to User.find(ma.apply_user_id).show_name, + user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %> + ">申请引用作业： +
    • +
  • + <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %> + <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + + +
    • + +
  • + + <% if ma.apply_result == 0 || ma.apply_result.nil?%> + <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%> + | + <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%> + <% elsif ma.apply_result == 1%> + 您已经同意了该申请 + <% elsif ma.apply_result == 2%> + 您已经拒绝了该申请 + <%end %> + +
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb new file mode 100644 index 000000000..28675b7eb --- /dev/null +++ b/app/views/users/_join_course_course_message.html.erb @@ -0,0 +1,37 @@ +
    • +
  • + 系统提示 + ">您有了新的课程成员申请： +
    • +
  • + + <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9' ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + + + +
    • + +
  • + + <% if ma.status == 0 || ma.status.nil?%> + <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%> + | + <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%> + <% elsif ma.status == 1%> + 您已经同意了该申请 + <% elsif ma.status == 2%> + 您已经拒绝了该申请 + <%end %> + +
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 6736b1de2..d278c7d74 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -230,34 +230,8 @@ <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %> - <% end %> <% if ma.course_message_type == "JoinCourseRequest" %> -