From ea19f199734318ccc62e32812b2863409b1b4041 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 3 Jun 2016 16:30:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_custom_left2.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb index 53169506e..f07053566 100644 --- a/app/views/organizations/_org_custom_left2.html.erb +++ b/app/views/organizations/_org_custom_left2.html.erb @@ -30,7 +30,7 @@ <% else %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %> <% end %> - <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %> + <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.content, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %> <%= time_from_now activity.updated_on %> <% elsif act.org_act_type == "News" %> From 65bf816ea4ea9abafde502cce55af54b014a5a41 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 3 Jun 2016 17:03:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AE=BE=E4=B8=BA?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BA=8C=E4=B8=AD=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_custom_left1.html.erb | 6 +++--- app/views/organizations/_org_custom_left2.html.erb | 2 +- app/views/organizations/_org_custom_left3.html.erb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb index 335ed1b2c..91c0e320e 100644 --- a/app/views/organizations/_org_custom_left1.html.erb +++ b/app/views/organizations/_org_custom_left1.html.erb @@ -9,7 +9,7 @@ <% end %> -
- - -
+ + + +
diff --git a/app/views/organizations/_org_students_list.html.erb b/app/views/organizations/_org_students_list.html.erb index 4f768d29f..d3db6fbf6 100644 --- a/app/views/organizations/_org_students_list.html.erb +++ b/app/views/organizations/_org_students_list.html.erb @@ -33,12 +33,12 @@ function hide(content, id){ if (content.text() == '设为学霸') $.ajax({ - url: "/organizations/set_excellent_teacher?user=" + id + "&type=student", + url: "/organizations/set_excellent_student?user=" + id , type: "post" }); else $.ajax({ - url: "/organizations/reset_excellent_teacher?user=" + id + "&type=student", + url: "/organizations/reset_excellent_student?user=" + id , type: "post" }); } diff --git a/app/views/organizations/reset_excellent_student.js.erb b/app/views/organizations/reset_excellent_student.js.erb new file mode 100644 index 000000000..29684c7e4 --- /dev/null +++ b/app/views/organizations/reset_excellent_student.js.erb @@ -0,0 +1 @@ +$("#hide_<%= @ex_student.id %>").text("设为学霸"); \ No newline at end of file diff --git a/app/views/organizations/reset_excellent_teacher.js.erb b/app/views/organizations/reset_excellent_teacher.js.erb index 8b7c6cc71..fdf160bc4 100644 --- a/app/views/organizations/reset_excellent_teacher.js.erb +++ b/app/views/organizations/reset_excellent_teacher.js.erb @@ -1 +1 @@ -$("#hide_<%= @ex_teacher.id %>").text(<%= params[:type]== "student" ? "设为学霸" : "设为名师"%>); \ No newline at end of file +$("#hide_<%= @ex_teacher.id %>").text("设为名师"); \ No newline at end of file diff --git a/app/views/organizations/set_excellent_student.js.erb b/app/views/organizations/set_excellent_student.js.erb new file mode 100644 index 000000000..a8bb963c8 --- /dev/null +++ b/app/views/organizations/set_excellent_student.js.erb @@ -0,0 +1 @@ +$("#hide_<%= @ex_student.id %>").text("取消设置"); \ No newline at end of file