Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

app/views/forums/show.html.erb

@@ -115,10 +115,7 @@
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
                 type:'post',
-                data:{
+                data:$("#new_memo").serialize(),
-                    'memo[content]':$("#memo_content").val(),
-                    'memo[subject]':$("#memo_subject").val()
-                },
                 success:function(data){
 
                 },

app/views/my/account.html.erb

@@ -30,7 +30,7 @@
           <li>&nbsp;&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
+          <li><%= f.text_field :login,:no_label=>true, :required => true,:style=>"color:grey", :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>

app/views/users/_user_message_course.html.erb

@@ -180,7 +180,7 @@
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              该作业已经被关闭了匿评。作业信息如下：
+              该作业已经关闭了匿评。作业信息如下：
             </p>
             <ul class="ul_grey">
               <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>

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");
 }