From 8f645f840cfe0139d5796fdb6094fcd47b9470b0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Jun 2015 11:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AD=A5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_homework_detail_manual_form.html.erb     |  1 -
 .../_homework_detail_programing_form.html.erb | 49 +++++++++++--------
 app/views/homework_common/new.html.erb        |  4 +-
 3 files changed, 31 insertions(+), 23 deletions(-)

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 fa45397f0..f70ec6017 100644
--- a/app/views/homework_common/_homework_detail_manual_form.html.erb
+++ b/app/views/homework_common/_homework_detail_manual_form.html.erb
@@ -10,7 +10,6 @@
   <div class="cl"></div>
   <li >
     <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
-    <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
     <div style="width: 83%;float: left;">
       <% if edit_mode %>
           <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
index d0556745b..12e6b7074 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -1,41 +1,50 @@
 <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" >
+    <label class="label02 mb10">
+      <span class="c_red">*</span>
+      &nbsp;<%= l(:field_name)%>：&nbsp;
+    </label>
+    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
+    <p id="homework_name_span" class="c_red ml110"></p>
   </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>
+    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
+    <div style="width: 83%;float: left;">
+      <% if edit_mode %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor_1',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+      <% else %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor_1' %>
+      <% end %>
+    </div>
   </li>
   <div class="cl"></div>
-  <li >
+  <li class="mt10">
     <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>
+    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
   </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>
+    <label class="label02">
+      <span class="c_red">*</span>
+      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
+    </label>
+    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
+    <%= calendar_for('homework_end_time')%>
     <div class="cl"></div>
   </li>
-  <li class="fl ml100">
+  <li class="fl ml100" style="display: none;">
     <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>
+    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
+    <%= calendar_for('homework_publish_time')%>
     <div class="cl"></div>
   </li>
   <div class="cl"></div>
-  <li>
+
+  <li style="display: none;">
     <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>
+    <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
     <span class="fl mt5">&nbsp;分</span>
     <div class="cl"></div>
   </li>
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
index 239987035..6a67c17d1 100644
--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@@ -24,7 +24,7 @@
         <%= hidden_field_tag "homework_common_tyle","homework_detail_manual"%>
         <%= 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>
+        <a href="javascript:void(0);" class="orange_btn_homework fl" onclick="return_homework_common_type()">上一步</a>
         <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
     <% end%>
   </div><!--hwork_new end-->
@@ -37,7 +37,7 @@
         <%= hidden_field_tag "homework_common_tyle","homework_detail_programing"%>
         <%= 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>
+        <a href="javascript:void(0);" class="orange_btn_homework fl" onclick="return_homework_common_type()">上一步</a>
         <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
     <% end%>
   </div><!--hwork_new end-->