diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e8d512a2e..5d0403099 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -45,7 +45,7 @@ class UsersController < ApplicationController
     :activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index,
     :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,
     :user_resource,:user_resource_create,:user_resource_delete,:rename_resource,:search_user_course,:add_exist_file_to_course,
-    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages, :edit_brief_introduction]
+    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages,:edit_brief_introduction,:user_new_homework]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
@@ -333,6 +333,38 @@ class UsersController < ApplicationController
   end
   end
 
+  def user_new_homework
+    if params[:homework_common]
+      homework = HomeworkCommon.new
+      homework.name = params[:homework_common][:name]
+      homework.description = params[:homework_common][:description]
+      homework.end_time = params[:homework_common][:end_time]
+      homework.publish_time = Time.now
+      homework.homework_type = 1
+      homework.late_penalty = 0
+      homework.user_id = User.current.id
+      homework.course_id = params[:course_id]
+
+      homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(homework)
+
+      #匿评作业相关属性
+      homework_detail_manual = HomeworkDetailManual.new
+      homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+      homework_detail_manual.comment_status = 1
+      homework_detail_manual.evaluation_start = Time.now
+      homework_detail_manual.evaluation_end = Time.now
+      homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+      homework_detail_manual.absence_penalty = 0
+      homework.homework_detail_manual = homework_detail_manual
+
+      if homework.save
+        homework_detail_manual.save if homework_detail_manual
+        redirect_to user_homeworks_user_path(User.current.id)
+      end
+    end
+  end
+
 
   include CoursesHelper
   def user_courses
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 342ee70be..ebfd9f881 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -537,4 +537,16 @@ module UsersHelper
     end
   end
 
+  #获取指定用户作为老师的课程
+  def get_as_teacher_courses user
+    type = []
+    user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
+      option = []
+      option << course.name
+      option << course.id
+      type << option
+    end
+    type
+  end
+
 end
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 5a74b6814..9fc312c96 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo" style="word-break:break-all;">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,12 +12,12 @@
         <% end %> TO
         <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle" style="word-break:break-all;">
         <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
-          <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(activity.id), :class=> "c_blue" %>
+          <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(:homework => activity.id), :class=> "c_blue" %>
         </div>
         <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
       </div>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 3d0c1b171..48f2636c4 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -4,7 +4,7 @@
           <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostDes">
-          <div class="homepagePostTo">
+          <div class="homepagePostTo" style="word-break:break-all;">
             <% if activity.try(:author).try(:realname) == ' ' %>
                 <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
             <% else %>
@@ -13,16 +13,17 @@
             TO
             <%= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
           </div>
-          <div class="homepagePostTitle">
+          <div class="homepagePostTitle" style="word-break:break-all;">
             <% if activity.parent_id.nil? %>
-              <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", course_boards_path(Board.where('id=?',activity.board_id).first.course_id), :class=> "postGrey", :style=>"word-break:break-all" %>
+              <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
             <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", course_boards_path(Board.where('id=?',activity.board_id).first.course_id), :class=> "postGrey", :style=>"word-break:break-all"%>
+                <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%>
             <% end %>
           </div>
           <div class="homepagePostSubmitContainer">
             <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
           </div>
+          <div class="homepagePostIntro" style="word-break:break-all">（描述）<%= activity.content.html_safe %></div>
           <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
             <ul>
               <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 044ce9c6e..28eb5bc0f 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo" style="word-break:break-all;">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %> TO
         <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle" style="word-break:break-all;">
         <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 01991d379..26e928dbf 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -5,7 +5,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo" style="word-break:break-all;">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -15,13 +15,13 @@
         <%= link_to Course.find(activity.polls_group_id).name.to_s+"(课程名称)", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle" style="word-break:break-all;">
         <a href="javascript:void(0);" class="postGrey"><%=activity.polls_name.to_s%>(问卷名称)</a>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">时间：<%= format_date(activity.created_at) %></div>
       </div>
-      <div class="homepagePostIntro">（问卷描述）<%=activity.polls_description.to_s%></div>
+      <div class="homepagePostIntro" style="word-break:break-all;">（问卷描述）<%=activity.polls_description.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 6661043a7..d43925ba6 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo"  style="word-break:break-all;">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %>  TO
         <%= link_to activity.project.name.to_s+"(项目名称)", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle" style="word-break:break-all;">
         <%= link_to activity.subject.to_s+"(缺陷标题)", issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %>
         <span class="homepagePostProjectState"><%=activity.status.name %></span>
       </div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index d9b87926c..ef7f9eada 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo" style="word-break:break-all;">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -14,16 +14,17 @@
         <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
       </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle" style="word-break:break-all;">
         <% if activity.parent_id.nil? %>
-            <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all" %>
+            <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
         <% else %>
-            <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all"%>
+            <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%>
         <% end %>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
       </div>
+      <div class="homepagePostIntro" style="word-break:break-all">（描述）<%= activity.content.html_safe %></div>
       <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index e0ae950c7..97f7b4c6f 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -22,21 +22,23 @@
                 <% end %>
             <% end %>
         <% when 'Project' %>
-            <% case user_activity.act_type.to_s %>
-            <% when 'Issue' %>
-                <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity =>user_activity} %>
-            <% when 'Message' %>
-                <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity =>user_activity} %>
-                <%# when 'Journal' %>
-                <%#= render :partial => 'project_journal', :locals => {:activity => act,:user_activity =>user_activity} %>
-                <%# when 'News' %>
-                <%#= render :partial => 'project_news', :locals => {:activity => act,:user_activity =>user_activity} %>
-                <%# when 'Document' %>
-                <%#= render :partial => 'project_document', :locals => {:activity => act,:user_activity =>user_activity} %>
-                <%# when 'Attachment' %>
-                <%#= render :partial => 'project_attachment', :locals => {:activity => act,:user_activity =>user_activity} %>
-                <%# when 'ProjectCreateInfo' %>
-                <%#= render :partial => 'project_create', :locals => {:activity => act,:user_activity =>user_activity} %>
+            <% if act  %>
+                <% case user_activity.act_type.to_s %>
+                <% when 'Issue' %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity =>user_activity} %>
+                <% when 'Message' %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Journal' %>
+                    <%#= render :partial => 'project_journal', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'News' %>
+                    <%#= render :partial => 'project_news', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Document' %>
+                    <%#= render :partial => 'project_document', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Attachment' %>
+                    <%#= render :partial => 'project_attachment', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'ProjectCreateInfo' %>
+                    <%#= render :partial => 'project_create', :locals => {:activity => act,:user_activity =>user_activity} %>
+                <% end %>
             <% end %>
         <% end %>
     <% end %>
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 9e198a762..eafa9cf0d 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -1,4 +1,4 @@
-<div class="fl">
+<div class="mt10">
   <span id="attachments_fields" class="attachments_fields">
     <% if defined?(container) && container && container.saved_attachments %>
       <% container.attachments.each_with_index do |attachment, i| %>
@@ -10,8 +10,8 @@
           <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %>
           <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
         </span>
-  <% end %>
-        <% container.saved_attachments.each_with_index do |attachment, i| %>
+      <% end %>
+      <% container.saved_attachments.each_with_index do |attachment, i| %>
         <span id="attachments_p<%= i %>">
           <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
           <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
@@ -20,46 +20,34 @@
           <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %>
           <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
         </span>
-  <% end %>
-<% end %>
-</span>
-  <% project = project %>
-  <span class="add_attachment" style="font-weight:normal;">
-  <%= button_tag l(:button_browse), :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()',:class => 'sub_btn', :style => ie8? ? 'display:none' : '' %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => '_file',
-                       :class => ie8? ? '' : 'file_selector',
-                       :multiple => true,
-                       :onchange => 'addInputFiles(this);',
-                       :style => ie8? ? '' : 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js',:project =>project),
-                               :description_placeholder => l(:label_optional_description),
-                               :field_is_public => l(:field_is_public),
-                               :are_you_sure => l(:text_are_you_sure),
-                               :file_count => l(:label_file_count),
-                               :delete_all_files => l(:text_are_you_sure_all)
-                       } %>
-    <span id="upload_file_count">
-      <%= l(:label_no_file_uploaded)%>
-    </span>
-    (<%= l(:label_max_size) %>:
-    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
-</span>
-
-  <% content_for :header_tags do %>
-      <%= javascript_include_tag 'attachments' %>
-  <% end %>
+      <% end %>
+    <% end %>
+  </span>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => '_file',
+                     :class => ie8? ? '' : 'file_selector',
+                     :multiple => true,
+                     :onchange => 'addInputFiles(this);',
+                     :style => ie8? ? '' : 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js',:project =>nil),
+                             :description_placeholder => l(:label_optional_description),
+                             :field_is_public => l(:field_is_public),
+                             :are_you_sure => l(:text_are_you_sure),
+                             :file_count => l(:label_file_count),
+                             :delete_all_files => l(:text_are_you_sure_all)
+                     } %>
 </div>
+<div class="cl"></div>
 
+<div class="mt5 fl">
+  <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
+  <!--<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>-->
+</div>
 
-<textarea class="InputBox fl W120 " placeholder="截止日期"></textarea>
-<a href="javascript:void(0);" class="fl mr10">
-  <img src="../images/Calendar.png" width="16" height="15" class="calendarContainer calendar1" />
-</a>
-<a href="javascript:void(0);" class="fl mr10">
-  <img src="../images/Calendar_hover.png" width="16" height="15" class="calendarContainer calendar1Active" />
-</a>
\ No newline at end of file
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'attachments' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 3a4c3496c..90fa51715 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -2,20 +2,16 @@
 <div class="HomeWorkCon">
   <div class="mt15">
     <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  W700" maxlength="255" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
+    <p id="homework_name_span" class="c_red mt5"></p>
   </div>
   <div class="cl"></div>
 
   <div class=" mt10">
     <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-    <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120" readonly="readonly" value="<%= homework.end_time%>" >
-    <%= calendar_for('homework_end_time')%>
-    <!--<div class="fl DateBorder mr10">-->
-      <!--<a href="javascript:void(0);" class="pic_date  "></a>-->
-    <!--</div>-->
-    <!--<textarea class="InputBox fl W120 " placeholder="发布日期"></textarea>-->
-    <!--<div class="fl DateBorder" >-->
-      <!--<a href="javascript:void(0);" class="pic_date  "></a>-->
-    <!--</div>-->
+    <div class="calendar_div fl">
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time || (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>" >
+      <%= calendar_for('homework_end_time')%>
+    </div>
   </div>
   <div class="cl"></div>
 
@@ -30,27 +26,17 @@
   <div class="cl"></div>
 
   <div class="mt10">
-    <input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />
+    <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
+    <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox  W700 SearchIcon"}  %>
   </div>
   <div class="cl"></div>
 
-  <div class="mt10">
-    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
-  </div>
-  <div class="cl"></div>
+  <%= render :partial => 'users/user_homework_attachment', :locals => { :container => homework } %>
 
-  <div class="mt5">
-    <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
-    <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
-    <a href="javascript:void(0);" class="BlueCirBtnMini fr">发送</a>
+  <div class="mt5 fr">
+    <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_homework('new_homework_common');">发送</a>
     <span class="fr mr10 mt3">或</span>
     <a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
   </div>
-  <div class="cl"></div>
-  <!--<div class="mt10">-->
-    <!--<a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>-->
-    <!--<div class="DropLine" ></div>-->
-    <!--<div class="cl"></div>-->
-  <!--</div>-->
 </div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 6476f9e71..7998128e0 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -30,7 +30,8 @@
             <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
             <div class="cl"></div>
           </div>
-          <% if is_teacher%>
+          <%# if is_teacher%>
+          <% if false%>
               <div class="homepagePostSetting">
                 <ul>
                   <li class="homepagePostSettingIcon">
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 48666a0cb..0191dca7f 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -20,10 +20,18 @@
         <div class="NewsBannerName">发布作业</div>
       </div>
       <% homework = HomeworkCommon.new %>
-      <%= labelled_form_for homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+      <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
           <%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
       <% end%>
     </div><!----HomeWork end-->
+
+<%else%>
+    <div class="resources mb10">
+      <div class="homepageRightBanner">
+        <div class="NewsBannerName">作业</div>
+      </div>
+    </div>
+    <div class="cl"></div>
 <% end%>
 
 <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %>
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 13b4524ba..b8c5b106d 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -24,7 +24,7 @@
   <!--<div class="users_r_top">-->
     <!--<h2 class="users_r_h2">用户留言</h2>-->
   <!--</div>-->
-<div class="feedBack">
+<div id="users_setting">
 <div class="homepageRightBanner">
   <div class="NewsBannerName">留言</div>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index 6679151e3..f39542562 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -308,6 +308,7 @@ RedmineApp::Application.routes.draw do
   resources :users do
     collection do
       match "tag_saveEx" , :via =>  [:get, :post]
+      post "user_new_homework"
     end
     member do
       match 'user_projects_index', :to => 'users#user_projects_index', :via => :get
@@ -326,7 +327,7 @@ RedmineApp::Application.routes.draw do
       match 'user_visitorlist', :to => 'users#user_visitorlist', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       match 'watch_projects', :to => 'users#watch_projects', :via => :get
-
+      #
       # added by bai
       match 'show_score', :to => 'users#show_score', :via => :get
       match 'topic_score_index', :to => 'users#topic_score_index', :via => [:get, :post]
diff --git a/db/schema.rb b/db/schema.rb
index a77eceb9a..6aa6da41d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -476,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -906,7 +913,6 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1311,6 +1317,7 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
     t.datetime "updated_at",                                                   :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
+    t.integer  "system_score"
   end
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
@@ -1528,7 +1535,6 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 42a1271cd..2b6b94eae 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -54,19 +54,34 @@ function show_more_project(url){
         }
     );
 }
-//
-//$(function(){
-//    $(".newsType").mouseover(function(){
-//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-//    });
-//    $(".newsType").mouseout(function(){
-//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-//    });
-//    $(".resourcesSelected").mouseover(function(){
-//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-//    });
-//    $(".resourcesSelected").mouseout(function(){
-//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-//    });
-//});
-//个人动态 end
\ No newline at end of file
+
+//老师提交 新建/修改 作业
+function submit_homework(id)
+{
+    if(!regex_homework_name())
+    {
+        $("#homework_name").focus();
+    }
+    else
+    {
+        homework_description_editor.sync();
+        $("#"+id).submit();
+    }
+}
+
+//验证新建作业的名字
+function regex_homework_name()
+{
+    var name = $.trim($("#homework_name").val());
+
+    if(name=="")
+    {
+        $("#homework_name_span").text("名称不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_name_span").text("");
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0afeb28e5..22e13709b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -868,11 +868,30 @@ img.ui-datepicker-trigger {
     width:16px;
     height:15px;
     float:left;
+    margin: 7px;
 }
 /*消息*/
 .homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
 .homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;}
+.calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
+.calendar_div{border: 1px solid #d9d9d9;}
 
+#attachments_fields input.filename {
+    border: 0;
+    height: 1.8em;
+    max-width: 670px;
+    color: #7f7f7f;
+    background-color: inherit;
+    background: url(../images/pic_file.png) 0 3px no-repeat;
+    padding-left: 18px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    margin-bottom: 3px;
+}
+.description{display: none !important;}
+.ispublic-label{display: none !important;}
+.is_public_checkbox{display: none !important;}