diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_detail_manual_form.html.erb
similarity index 100%
rename from app/views/homework_common/_homework_common_form.html.erb
rename to app/views/homework_common/_homework_detail_manual_form.html.erb
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
new file mode 100644
index 000000000..d0556745b
--- /dev/null
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -0,0 +1,80 @@
+<ul class="hwork_new_basic">
+  <li >
+    <label class="label02"><span class="c_red">*</span>&nbsp;名称：&nbsp;</label>
+    <input  type="text" name="" class="w548 h26 mb10 fl" >
+  </li>
+  <div class="cl"></div>
+  <li >
+    <label class="label02 ">&nbsp;&nbsp;作业描述及&nbsp;&nbsp;&nbsp;&nbsp;<br />评分依据：&nbsp;</label>
+    <textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>
+  </li>
+  <div class="cl"></div>
+  <li >
+    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
+    <input type="submit" name="" value="文件浏览"  class="sub_btn">&nbsp;&nbsp;&nbsp;&nbsp;<span class=" c_grey ">-文件不超过200MB</span>
+  </li>
+  <div class="cl"></div>
+  <li class="fl">
+    <label class="label02"><span class="c_red">*</span>&nbsp;截止日期：&nbsp;</label>
+    <input  type="text" name="" class="hwork_input02 fl" value="2015-04-03 12:00" >
+    <a href="javascript:void(0);" class="pic_date mt5 ml5"></a>
+    <div class="cl"></div>
+  </li>
+  <li class="fl ml100">
+    <label class="label02">&nbsp;发布日期：&nbsp;</label>
+    <input  type="text" name="" class="hwork_input02 fl" value="2015-04-03 12:00" >
+    <a href="javascript:void(0);" class="pic_date mt5 ml5"></a>
+    <div class="cl"></div>
+  </li>
+  <div class="cl"></div>
+  <li>
+    <label class="label02">迟交扣分：&nbsp;</label>
+    <select class="fl mb10 h26 w70"  name="s2" >
+      <option >1</option>
+      <option selected="selected">2</option>
+      <option >3</option>
+      <option >4</option>
+      <option >5</option>
+    </select>
+    <span class="fl mt5">&nbsp;分</span>
+    <div class="cl"></div>
+  </li>
+</ul><!--hwork_new_basic end--->
+<div class="hwork_new_set">
+  <p class="fl ml20 f14 mb10 c_orange">编程评测设置</p>
+  <div class="cl"></div>
+  <ul>
+    <li >
+      <label class="label02">&nbsp;开发语言：&nbsp;</label>
+      <select class="fl mb10 h26 w150" >
+        <option>C++</option>
+      </select>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <label class="label02">&nbsp;标准代码：&nbsp;</label>
+      <textarea  name=""   class=" w459 h150 mb10 fl"  ></textarea>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <label class="label02">&nbsp;测试输入：&nbsp;</label>
+      <input type="text" class="fl h26 w196 mb10" />
+    </li>
+    <li >
+      <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
+      <input type="text" class="fl h26 w196  mb10" />
+    </li>
+    <li><a class="icon_add ml10 " href="javascript:void(0);" title="添加测试"></a> <span class="green_btn fl ml5">OK&nbsp;!</span></li>
+    <div class="cl"></div>
+    <li >
+      <label class="label02">&nbsp;测试输入：&nbsp;</label>
+      <input type="text" class="fl h26 w196 mb10" />
+    </li>
+    <li >
+      <label class="fl f14 ml10">&nbsp;输出：&nbsp;</label>
+      <input type="text" class="fl h26 w196  mb10" />
+    </li>
+    <li><a class="icon_add ml10 " href="javascript:void(0);" title="添加测试"></a> <a href="javascript:void(0);" class="green_btn fl ml5 ">测试</a></li>
+    <div class="cl"></div>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index f9d3f8b70..87977c6a9 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -8,7 +8,7 @@
 </div>
 <div class="hwork_new">
   <%= form_for @homework do |f| %>
-      <%= render :partial => 'homework_common/homework_common_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
       <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
       <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
   <% end%>
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
index 4fd52c8a0..0c4780133 100644
--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@@ -21,7 +21,7 @@
   <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_common_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+        <%= 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>
         <a href="javascript:void(0);" class="orange_btn_homework fl mr10" onclick="return_homework_common_type()">上一步</a>
         <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
@@ -31,89 +31,13 @@
 </div>
 <div id="homework_detail_programing" class="undis">
   <div class="hwork_new">
-    <ul class="hwork_new_basic">
-      <li >
-        <label class="label02"><span class="c_red">*</span>&nbsp;名称：&nbsp;</label>
-        <input  type="text" name="" class="w548 h26 mb10 fl" >
-      </li>
-      <div class="cl"></div>
-      <li >
-        <label class="label02 ">&nbsp;&nbsp;作业描述及&nbsp;&nbsp;&nbsp;&nbsp;<br />评分依据：&nbsp;</label>
-        <textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>
-      </li>
-      <div class="cl"></div>
-      <li >
-        <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
-        <input type="submit" name="" value="文件浏览"  class="sub_btn">&nbsp;&nbsp;&nbsp;&nbsp;<span class=" c_grey ">-文件不超过200MB</span>
-      </li>
-      <div class="cl"></div>
-      <li class="fl">
-        <label class="label02"><span class="c_red">*</span>&nbsp;截止日期：&nbsp;</label>
-        <input  type="text" name="" class="hwork_input02 fl" value="2015-04-03 12:00" >
-        <a href="javascript:void(0);" class="pic_date mt5 ml5"></a>
-        <div class="cl"></div>
-      </li>
-      <li class="fl ml100">
-        <label class="label02">&nbsp;发布日期：&nbsp;</label>
-        <input  type="text" name="" class="hwork_input02 fl" value="2015-04-03 12:00" >
-        <a href="javascript:void(0);" class="pic_date mt5 ml5"></a>
-        <div class="cl"></div>
-      </li>
-      <div class="cl"></div>
-      <li>
-        <label class="label02">迟交扣分：&nbsp;</label>
-        <select class="fl mb10 h26 w70"  name="s2" >
-          <option >1</option>
-          <option selected="selected">2</option>
-          <option >3</option>
-          <option >4</option>
-          <option >5</option>
-        </select>
-        <span class="fl mt5">&nbsp;分</span>
-        <div class="cl"></div>
-      </li>
-    </ul><!--hwork_new_basic end--->
-    <div class="hwork_new_set">
-      <p class="fl ml20 f14 mb10 c_orange">编程评测设置</p>
-      <div class="cl"></div>
-      <ul>
-        <li >
-          <label class="label02">&nbsp;开发语言：&nbsp;</label>
-          <select class="fl mb10 h26 w150" >
-            <option>C++</option>
-          </select>
-          <div class="cl"></div>
-        </li>
-        <li >
-          <label class="label02">&nbsp;标准代码：&nbsp;</label>
-          <textarea  name=""   class=" w459 h150 mb10 fl"  ></textarea>
-          <div class="cl"></div>
-        </li>
-        <li >
-          <label class="label02">&nbsp;测试输入：&nbsp;</label>
-          <input type="text" class="fl h26 w196 mb10" />
-        </li>
-        <li >
-          <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-          <input type="text" class="fl h26 w196  mb10" />
-        </li>
-        <li><a class="icon_add ml10 " href="javascript:void(0);" title="添加测试"></a> <span class="green_btn fl ml5">OK&nbsp;!</span></li>
-        <div class="cl"></div>
-        <li >
-          <label class="label02">&nbsp;测试输入：&nbsp;</label>
-          <input type="text" class="fl h26 w196 mb10" />
-        </li>
-        <li >
-          <label class="fl f14 ml10">&nbsp;输出：&nbsp;</label>
-          <input type="text" class="fl h26 w196  mb10" />
-        </li>
-        <li><a class="icon_add ml10 " href="javascript:void(0);" title="添加测试"></a> <a href="javascript:void(0);" class="green_btn fl ml5 ">测试</a></li>
-        <div class="cl"></div>
-      </ul>
-    </div><!--hwork_new_set end-->
-    <a href="courses_hworklist.html" class="blue_btn fl mr10 " >提交</a>
-    <a href="javascript:void(0);" class="orange_btn_homework fl mr10" onclick="return_homework_common_type()">上一步</a>
-    <a href="#" target="_blank" class="grey_btn fl  ">取消</a>
+    <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+        <%= hidden_field_tag "course",@course.id%>
+        <%= render :partial => 'homework_common/homework_detail_programing_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>
+        <a href="javascript:void(0);" class="orange_btn_homework fl mr10" onclick="return_homework_common_type()">上一步</a>
+        <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+    <% end%>
   </div><!--hwork_new end-->
   <div class="cl"></div>
 </div>
\ No newline at end of file