jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
cxt 2015-12-11 18:11:48 +08:00
parent 42f0fc62e9 df1d1a4685
commit dfd0c95f2a
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/forums/show.html.erb
View File

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

2
app/views/my/account.html.erb
View File

@ -30,7 +30,7 @@
<li>&nbsp;&nbsp;</li> <li>&nbsp;&nbsp;</li>
</ul> </ul>
<ul class="setting_right "> <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><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
<li> <li>

2
app/views/users/_user_message_course.html.erb
View File

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

1
public/javascripts/init_activity_KindEditor.js
View File

@ -159,4 +159,5 @@ function init_activity_KindEditor_data(id){
div_form = $("div[nhname='new_message_" + id + "']"); div_form = $("div[nhname='new_message_" + id + "']");
$(".ke-edit", div_form).css("height","33px"); $(".ke-edit", div_form).css("height","33px");
$(".ke-edit-iframe",div_form).css("height","33px");
} }