diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 3446a86d4..3dccdcc2b 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -194,7 +194,7 @@
                     <% time=project.updated_on %>
                     <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                     <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_timetime ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                     <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                       项目名称：<%=project.name %><br />
                       创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 5be1334c3..23a469188 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -193,7 +193,7 @@
                 <% time=project.updated_on %>
                 <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                 <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_timetime ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                 <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                   项目名称：<%=project.name %><br />
                   创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
diff --git a/app/views/users/_jour_form.html.erb b/app/views/users/_jour_form.html.erb
index 13bf6d79a..4ad9fef54 100644
--- a/app/views/users/_jour_form.html.erb
+++ b/app/views/users/_jour_form.html.erb
@@ -8,8 +8,8 @@
   <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
   <%= f.kindeditor :content, :editor_id => 'jour_content_editor',
                    :width => '99.7%',
-                   :height => 40,
-                   :minHeight=>40,
+                   :height => 100,
+                   :minHeight=>100,
                    :input_html => { :id => 'jour_content',
                                     :class => 'talk_text fl',
                                     :maxlength => 5000 }%>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index d4169bc47..c8d599af4 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -111,7 +111,7 @@
                 <% case user_activity.act_type.to_s %>
                 <% when 'JournalsForMessage' %>
                     <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
-                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>true} %>
+                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
                     <% end %>
                 <% end %>
             <% end %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 04c8b8f0a..36b2be34f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -195,7 +195,7 @@
                     <% time=project.updated_on %>
                     <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                     <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_timetime ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                     <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                       项目名称：<%=project.name %><br />
                       创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 70cce2374..e30fd1824 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -16,7 +16,7 @@
             <% end %>
         <% end %>
       </div>
-      <% if is_activity %>
+      <% if is_activity.to_i == 1 %>
           <div class="homepagePostTitle break_word list_style upload_img">
             <% if activity.parent %>
                 <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 6993a7e91..c73344a7a 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -22,7 +22,7 @@
                     init_activity_KindEditor_data(<%= jour.id%>, null, "87%", "<%=jour.class.to_s%>");
                 });
             </script>
-            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>false} %>
+            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
             <%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
         <% end %>
     <%end%>
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index 8d6674845..d4d9a2cd7 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -3,7 +3,7 @@
         <% if @reply_type == 'user' %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
         <% else %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         <% end %>
         init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
     <% else %>
diff --git a/db/schema.rb b/db/schema.rb
index fb021e9ae..b31ebc5c2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1371,6 +1371,7 @@ ActiveRecord::Schema.define(:version => 20160122094829) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
+    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index f273f0b77..b6301afad 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -75,7 +75,7 @@ function private_jour_submit(){
 function jourReplyVerify() {
     var content = jour_content_editor.html();//$.trim($("#message_content").val());
     if (jour_content_editor.isEmpty()) {
-        $("#jour_content_span").text("回复不能为空");
+        $("#jour_content_span").text("留言不能为空");
         $("#jour_content_span").css('color', '#ff0000');
         $("#submit_feedback_user").one('click',function() {
             jour_submit();
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 1e3c68c83..a0052b97a 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -513,7 +513,7 @@ a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3
 .st_list{ width:670px;}
 .st_search{ }
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
-.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:200px; padding-left:5px; margin-bottom:5px;}
+.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:220px; padding-left:5px; margin-bottom:5px;}
 .st_search a{ background:#1c9ec7; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:60px; height:20px; float:left; font-size:12px; }
 .st_search a:hover{ background:#048fbb; text-decoration:none;}
 .classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f1b0c5846..29c099d3d 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -414,7 +414,7 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor
 .st_list{ width:670px;}
 .st_search{ }
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
-.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:200px; padding-left:5px; margin-bottom:5px;}
+.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:220px; padding-left:5px; margin-bottom:5px;}
 .st_search a{ background:#1c9ec7; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:60px; height:20px; float:left; font-size:12px; }
 .st_search a:hover{ background:#048fbb; text-decoration:none;}
 .classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
@@ -1167,4 +1167,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
 
 /*问题跟踪局部修改属性*/
 .proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
-.proInfoBox2 ul li{ height:24px; position:relative;}
+.proInfoBox2 ul li{ height:24px; position:relative;}