diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 21f781a1a..87c1e288b 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -19,28 +19,28 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
-    # @homework_type = "1"
-    #
-    # @homework = HomeworkCommon.new
-    # @homework.safe_attributes = params[:homework_common]
-    # @homework.late_penalty = 2
-    # @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 = 2
-    #   @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 = 2
+    @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 = 2
+      @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/boards/_form.html.erb b/app/views/boards/_form.html.erb
index 47ae0672d..a4f58dcc3 100644
--- a/app/views/boards/_form.html.erb
+++ b/app/views/boards/_form.html.erb
@@ -1,7 +1,7 @@
 <%= error_messages_for @board %>
 
 <div class="box tabular">
-<p style="width:666;">
+<p style="width:666px;">
   <%= f.text_field :name, :required => true %>
 </p><!--by young-->
 <p>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 5520f526d..609294161 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,12 +1,5 @@
 <style type="text/css">
     div.talk_new .ke-container{margin-left:2px;}
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    div.ke-toolbar .ke-outline{border:none;}*/
     .break_word {width:100%;}
 </style>
 <script type="text/javascript">
@@ -16,14 +9,14 @@
         for (var i=0; i<menuids.length; i++){
             var div = document.getElementById(menuids[i]);
             if(div == undefined)continue;
-            var ultags=div.getElementsByTagName("ul")
+            var ultags=div.getElementsByTagName("ul");
             for (var t=0; t<ultags.length; t++){
-                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle"
+                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle";
                 ultags[t].parentNode.onmouseover=function(){
-                    this.getElementsByTagName("ul")[0].style.display="block"
+                    this.getElementsByTagName("ul")[0].style.display="block";
                 }
                 ultags[t].parentNode.onmouseout=function(){
-                    this.getElementsByTagName("ul")[0].style.display="none"
+                    this.getElementsByTagName("ul")[0].style.display="none";
                 }
             }
         }
@@ -46,46 +39,6 @@
 
 <script type="text/javascript">//侧导航
 
-//window.onload = function () {
-//    var topic_id = getParam('topic_id');
-//    document.getElementById(topic_id).focus();
-//}
-//
-//var getParam = function(name){
-//    var search = document.location.search;
-//    var pattern = new RegExp("[?&]"+name+"\=([^&]+)", "g");
-//    var matcher = pattern.exec(search);
-//    var items = null;
-//    if(null != matcher){
-//        try{
-//            items = decodeURIComponent(decodeURIComponent(matcher[1]));
-//        }catch(e){
-//            try{
-//                items = decodeURIComponent(matcher[1]);
-//            }catch(e){
-//                items = matcher[1];
-//            }
-//        }
-//    }
-//    return items;
-//};
-//
-//function show_newtalk()
-//{
-//    $("#about_newtalk").toggle();
-//
-//
-//
-//}
-//
-//function show_newtalk1(id)
-//{
-//    $(id).toggle();
-//    $(id).focus();
-//
-//
-//}
-
 function nh_check_field(params){
     var result=true;
     if(params.subject!=undefined){
diff --git a/app/views/homework_common/_homework_detail_manual_form.html.erb b/app/views/homework_common/_homework_detail_manual_form.html.erb
index 3af12973a..59294f82d 100644
--- a/app/views/homework_common/_homework_detail_manual_form.html.erb
+++ b/app/views/homework_common/_homework_detail_manual_form.html.erb
@@ -53,7 +53,7 @@
         <span class="fl mt5">&nbsp;分</span>
         <div class="cl"></div>
       </li>
-      <li >
+      <li style="display: none;">
         <label class="label02" >是否匿评：&nbsp;</label>
         <%= f.check_box :homework_type, :class => "mb10 mt5 fl" %>
         <div class="cl"></div>
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>
diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 4220aceca..25a949df4 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -33,7 +33,6 @@ zh:
   label_account_identity_studentID: 请输入学号
 
   field_brief_introduction_my: 个人签名
-  field_description: 个人简介
   field_is_required: 必填
   field_firstname: 名字或组织名
   firstname_empty: 名字不能为空
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index e47cd476c..e456dc456 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -363,7 +363,6 @@ zh:
   #     
   label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
   field_name: 名称
-  field_description: 描述
   field_identifier: 标识
   field_enterprise_name: 组织名称
   label_organization_choose: --请选择组织--