From 71ffdb9164a2173b63b0aaf874c985c05528483c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 19 Jul 2014 13:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=86=E7=B1=BB=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=A1=86=E4=B8=AD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_homework_form.html.erb            |  2 +-
 app/views/contests/show_attendingcontest.html.erb | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb
index 92b162035..f7c753b45 100644
--- a/app/views/bids/_homework_form.html.erb
+++ b/app/views/bids/_homework_form.html.erb
@@ -33,7 +33,7 @@
 <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
 </p>
 <!--
-<p><%= f.select :homework_type, homework_type_option %>
+<p><%#= f.select :homework_type, homework_type_option %>
 </p>
 -->
 <p><%= f.select :is_evaluation, is_evaluation_option %>
diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index b9c09fdef..9b3c62e74 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -105,7 +105,22 @@
 
         </tr>
         <br/>
+        <br/>
+        <br/>
 
+        <tr style="width:800px;">
+          <span><%= l(:label_work_type) %></span>
+          <span class="contest-star"> * </span>:
+          <td style="width: 100px">
+            <span>
+              <%#= select_tag 'app_type_name', work_type_opttion, {:name => 'app_type_name',:style => "width:358px;"} %>
+            </span>
+            <%= f.select :app_type_name,work_type_opttion, {},{:style => "width:358px;"}  %>
+            <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
+          </td>
+        </tr>
+        <br/>
+        <br/>
         <br/>
 
         <tr style="width:800px;">