diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index ad9195804..280d378f3 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -115,10 +115,7 @@
$.ajax({
url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
type:'post',
- data:{
- 'memo[content]':$("#memo_content").val(),
- 'memo[subject]':$("#memo_subject").val()
- },
+ data:$("#new_memo").serialize(),
success:function(data){
},
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 94f62638e..604953ad9 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
- - <%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%>
+ - <%= f.text_field :login,:no_label=>true, :required => true,:style=>"color:grey", :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%>
- <%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%>
-
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 1ca8f5e1a..9f7b90ee4 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -180,7 +180,7 @@
<%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好!
- 该作业已经被关闭了匿评。作业信息如下:
+ 该作业已经关闭了匿评。作业信息如下:
- 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 977c62117..a23b83607 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -159,4 +159,5 @@ function init_activity_KindEditor_data(id){
div_form = $("div[nhname='new_message_" + id + "']");
$(".ke-edit", div_form).css("height","33px");
+ $(".ke-edit-iframe",div_form).css("height","33px");
}
\ No newline at end of file