diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 34e97e4dd..5324a0d38 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -18,28 +18,28 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
-    # @homework_type = "1"
-    #
-    # @homework = HomeworkCommon.new
-    # @homework.safe_attributes = params[:homework_common]
-    # @homework.late_penalty = 0
-    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-    #
-    # if @homework_type == "1"
-    #   #匿评作业相关属性
-    #   @homework_detail_manual = HomeworkDetailManual.new
-    #   @homework_detail_manual.ta_proportion = 0.6
-    #   @homework_detail_manual.absence_penalty = 0
-    #   @homework_detail_manual.evaluation_num = 3
-    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    #   @homework.homework_detail_manual = @homework_detail_manual
-    # elsif @homework_type == "2"
-    #   #编程作业相关属性
-    #   @homework_detail_programing = HomeworkDetailPrograming.new
-    #   @homework.homework_detail_programing = @homework_detail_programing
-    # end
+    @homework_type = "1"
+
+    @homework = HomeworkCommon.new
+    @homework.safe_attributes = params[:homework_common]
+    @homework.late_penalty = 0
+    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+
+    if @homework_type == "1"
+      #匿评作业相关属性
+      @homework_detail_manual = HomeworkDetailManual.new
+      @homework_detail_manual.ta_proportion = 0.6
+      @homework_detail_manual.absence_penalty = 0
+      @homework_detail_manual.evaluation_num = 3
+      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+      @homework.homework_detail_manual = @homework_detail_manual
+    elsif @homework_type == "2"
+      #编程作业相关属性
+      @homework_detail_programing = HomeworkDetailPrograming.new
+      @homework.homework_detail_programing = @homework_detail_programing
+    end
     respond_to do |format|
       format.html
     end
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
index cdc2ceca0..6fc0fff0e 100644
--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@@ -1,27 +1,17 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= error_messages_for 'homework_common' %>
 <div class="project_r_h">
   <h2 class="project_h2">
     <%= l(:label_course_homework_new)%>
   </h2>
 </div>
-<div class="hwork_new" id="hwork_new">
-  <%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%>
-      <input type="hidden" name="course" value="<%= @course.id%>">
-      <h3 class="c_blue f16 mb10">
-        请选择将要发布的作业类型
-      </h3>
-      <input type="radio" class="mb10 fl" name="homework_common_type" value="1" id="homework_detail_manual_radio" checked/>
-      <span class="ml5 fl">
-          人工评分的作业（支持匿名互评、灵活设置评分比例）
-      </span>
-      <div class="cl"></div>
-      <input type="radio" class="mb20 fl" name="homework_common_type" value="2" id="homework_detail_programing_radio"/>
-      <span class="ml5 fl">
-          自动评测的编程作业（支持C/C++程序的自动评分）
-      </span>
-      <div class="cl"></div>
-      <a href="javascript:void(0);" class=" orange_btn" onclick="$(this).parent().submit();">
-        下一步
-      </a>
+<div class="hwork_new">
+  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+      <%= hidden_field_tag "course",@course.id%>
+      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
+      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
+      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
   <% end%>
 </div><!--hwork_new end-->
 <div class="cl"></div>