diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 7b7bcbcf4..fb7214fce 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -547,7 +547,7 @@ module CoursesHelper
     type = []
     month = Time.now.month
     now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
-    year = month < 3 ? now_year - 1 : now_year
+    year = month < 3 && now_year >=Time.now.year ? now_year - 1 : now_year
     for i in (year..year + 10)
       option = []
       option << i
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 6f2819f53..ef0c2eb16 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -254,6 +254,8 @@ class CoursesService
     #course.safe_attributes = params[:course]
     course.time = params[:time]
     course.term = params[:term]
+    course.end_time = params[:end_time]
+    course.end_term = params[:end_term]
     course.class_period = params[:class_period].to_i
     params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
     params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index 3b76689f5..0f7e8a012 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -37,7 +37,7 @@
         <% if options[:length] %>
           <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%>
         <% else %>
-          <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true -%>
+          <%= link_to_short_attachment attachment, :length=> 58,:class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
         <% end %>
       </span>
         <%if is_float%>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 32db48def..617cefc93 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -46,14 +46,15 @@
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time_selected"}  %>
-            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"}  %>
+            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time"}  %>
+            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term"}  %>
           </li>
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
-            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time_selected"}  %>
-            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term_selected"}  %>
+            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time"}  %>
+            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term"}  %>
+            <span class="c_red" id="course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
           <li class="ml45 mb10">
@@ -138,8 +139,6 @@
         $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("anonymos");
     }
-    $("#time_selected").click(select);
-    $("#term_selected").click(select);
-    $("#end_time_selected").click(select);
-    $("#end_term_selected").click(select);
+    $("#time").click(select);
+    $("#term").click(select);
 </script>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index c3278a209..c760e686d 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -84,8 +84,8 @@
         <%= @topic.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @topic, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 304694b39..6d12fe960 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -113,8 +113,8 @@
         <%= @topic.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @topic, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index e5aba7c02..c98f2983e 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -139,8 +139,8 @@
           <%= @topic.content.html_safe%>
         </div>
         <div class="cl"></div>
-        <div class=" fl" style="width: 600px">
-          <%= link_to_attachments_course @topic, :author => false %>
+        <div class="mt10" style="font-weight:normal;">
+          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %>
         </div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 07aaef26d..767c11553 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -89,8 +89,8 @@
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @news, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb
index 98d14c3ab..3e608c177 100644
--- a/app/views/news/_organization_show.html.erb
+++ b/app/views/news/_organization_show.html.erb
@@ -79,8 +79,8 @@
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @news, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 26ff807db..880bd0885 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -89,8 +89,8 @@
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @news, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 26d04924a..405631369 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -29,8 +29,9 @@
             <%= @document.content.html_safe %>
           </div>
       <% end %>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @document, :author => false %>
+      <div class=" fl">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @document} %>
+        <%#= link_to_attachments_course @document, :author => false %>
       </div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index ffee90ede..3446a86d4 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -155,7 +155,9 @@
                       <% break %>
                   <% end %>
               <% end %>
-              <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <% if student_works.count > 5 %>
+                  <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <% end %>
               <div class="cl"></div>
             </div>
         <% end %>
@@ -188,10 +190,11 @@
                     <% else %>
                         <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
                     <% end %>
+                    <% com_time = project.project_score.commit_time %>
                     <% 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 time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</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>
                     <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/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 074d15a42..fb18c0f7f 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -51,7 +51,7 @@
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%= user_activity_id %>">
           <% if activity.author == User.current %>
-            <span class="ml15 likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
           <% else %>
             <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
           <% end %>
@@ -92,7 +92,7 @@
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
                           <% if comment.author == User.current %>
-                            <span class="fr likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
                           <% else %>
                             <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                           <% end %>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index e9db0e43f..d4b44a3d2 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -24,8 +24,8 @@
             <%= document.content.html_safe %>
           </div>
       <% end %>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course document, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
       </div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
diff --git a/app/views/student_work/_work_attachments_status.html.erb b/app/views/student_work/_work_attachments_status.html.erb
index e8d4f144b..c4b2a795e 100644
--- a/app/views/student_work/_work_attachments_status.html.erb
+++ b/app/views/student_work/_work_attachments_status.html.erb
@@ -1,8 +1,16 @@
 <% attachments.each_with_index do |attachment,i| %>
     <div id="attachment_<%= attachment.id%>">
-      <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
+      <span class="fl">
+          <span title="<%= attachment.filename %>">
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw360', :download => true -%>
+          </span>
+      </span>
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author && status != 2 %>
-      <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+      <span class="postAttSize">(<%= number_to_human_size attachment.filesize %>)</span>
+      <span class="author" title="<%= attachment.author%>">
+        <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+        <%= format_time(attachment.created_on) %>
+      </span>
       <div class="cl"></div>
     </div>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index afc97aca9..41ec2b61b 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -166,7 +166,7 @@
         <div id="homeworkDetailHide" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
         <div class="cl"></div>
         <div>
-          <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @homework} %>
           <div class="cl"></div>
         </div>
         <div class="mt5">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 651a284e4..5be1334c3 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -134,7 +134,6 @@
     <% if activity.student_works.count != 0 %>
         <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %>
         <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
-        <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
             <div class="mt10">
@@ -155,7 +154,9 @@
                     <% break %>
                   <% end %>
               <% end %>
-              <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <% if student_works.count > 5 %>
+                <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <% end %>
               <div class="cl"></div>
             </div>
         <% end %>
@@ -188,10 +189,11 @@
                 <% else %>
                     <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
                 <% end %>
+                <% com_time = project.project_score.commit_time %>
                 <% 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 time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</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>
                 <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/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index b3e14d174..04c8b8f0a 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -156,7 +156,9 @@
                       <% break %>
                   <% end %>
               <% end %>
-              <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <% if student_works.count > 5%>
+                <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <% end %>
               <div class="cl"></div>
             </div>
         <% end %>
@@ -189,10 +191,11 @@
                     <% else %>
                         <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %>
                     <% end %>
+                    <% com_time = project.project_score.commit_time %>
                     <% 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 time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</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>
                     <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                       项目名称：<%=project.name %><br />
                       创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
diff --git a/db/migrate/20160122023014_add_commit_time.rb b/db/migrate/20160122023014_add_commit_time.rb
new file mode 100644
index 000000000..d9b860073
--- /dev/null
+++ b/db/migrate/20160122023014_add_commit_time.rb
@@ -0,0 +1,27 @@
+class AddCommitTime < ActiveRecord::Migration
+  def up
+    add_column :project_scores, :commit_time, :datetime, :default => nil
+    count = ProjectScore.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        ProjectScore.page(i).per(30).each do |ps|
+          unless ps.project.nil?
+            unless ps.project.gpid.nil?
+              g = Gitlab.client
+              begin
+                changesets = g.commits(ps.project.gpid)
+                ps.commit_time = changesets[0].created_at
+                ps.save
+              rescue
+                logger.error("The project's rep is not exit!")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 6c2f0af71..fff30dec5 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -193,7 +193,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
+    if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
     {
         $("#edit_course_"+id).submit();
     }
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index c913d9b0c..1e3c68c83 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -95,6 +95,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .mt-2 {margin-top:-2px;}
 .homeworkInfo {background:#F6F6F6; padding:10px; margin-bottom:10px;}
 .homeworkDetail {line-height:18px; font-size:12px; color:#484848; overflow:hidden;}
+.homeworkDetail p,.homeworkDetail div,.homeworkDetail em, .homeworkDetail span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
 .max_h54 {max-height:54px; }
 .homeworkState {padding:3px 5px; background-color:#28be6c; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
 .homeworkClose {padding:3px 5px; background-color:#b2b2b2; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 6827ee83f..abd2c10f9 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -172,6 +172,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .h70{ height:70px;}
 .h150{ height:150px;}
 .p10 {padding-left:10px; padding-right:10px;}
+.mw360 {max-width: 360px !important;}
 .mw400 {max-width: 400px !important;}
 .mh18 {max-height: 18px;}