diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index cedc05f4b..c90dbf724 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -11,9 +11,11 @@
div.recall_con{width:570px;}
div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
-
- <%# reply_allow = JournalsForMessage.create_by_user? User.current %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
+
+
<%= l(:label_leave_message) %>
<% if !User.current.logged?%>
@@ -23,21 +25,15 @@
<% else %>
- <%= form_for('new_form', :method => :post,
- :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
- <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
- <%#= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
- :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
-
-
- <% end %>
-
-
-
-
取 消
-
- <%= l(:button_leave_meassge)%>
-
+
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_course_message'},:method => "post") do |f|%>
+ <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+
+
+
取消
+
留言
+ <% end%>
<% end %>
@@ -54,106 +50,6 @@
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2eba84efa..8c9111dce 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -61,4 +61,7 @@
<% end %>
<% end %>
-<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% if user_activities.count == 10%>
+ <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% end%>
+
diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb
index bf7443f8c..eb5de9c6a 100644
--- a/app/views/users/show.js.erb
+++ b/app/views/users/show.js.erb
@@ -1,4 +1,2 @@
$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>");
-<% if @user_activities.count < 10%>
-$("#show_more_activities").hide();
-<% end%>
+
diff --git a/public/javascripts/user.js b/public/javascripts/user.js
index ba40af1bd..6a5d93139 100644
--- a/public/javascripts/user.js
+++ b/public/javascripts/user.js
@@ -1,7 +1,7 @@
//个人动态
$(function(){
KindEditor.ready(function(K){
- $("a[nhname='reply_btn']").on('click',function(){
+ $("a[nhname='reply_btn']").live('click',function(){
var params = {};
params.kindutil = K;
params.container = $(this).parent().parent('div');
@@ -35,7 +35,7 @@ $(function(){
},300);
});
- $("a[nhname='sub_reply_btn']").on('click',function(){
+ $("a[nhname='sub_reply_btn']").live('click',function(){
var params = {};
params.kindutil = K;
params.container = $(this).parent().parent('div');
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index bc7f62aea..88455e306 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -769,4 +769,5 @@ a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:
a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
.ProResultUl span { display:block; float:left;}
.ProResultUl li{ line-height:35px; border-bottom:1px solid #dddddd; }
-.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
\ No newline at end of file
+.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
+.mb50{margin-bottom: 50px;}
\ No newline at end of file