From 589c6d37db19d7caef7796de1d799353d11e35bb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 22 Aug 2014 09:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=A5=E6=9C=9F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A1=86=E5=8F=AF=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20#1045?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_homework_form.html.erb    |  4 ++--
 app/views/courses/_homework_form.html.erb |  2 +-
 app/views/memos/_form.html.erb            | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb
index f7c753b45..463b2b621 100644
--- a/app/views/bids/_homework_form.html.erb
+++ b/app/views/bids/_homework_form.html.erb
@@ -26,9 +26,9 @@
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
-<!-- <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+<!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
 	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
-	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
+	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
 </p>
diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb
index 41c059603..bfecb5304 100644
--- a/app/views/courses/_homework_form.html.erb
+++ b/app/views/courses/_homework_form.html.erb
@@ -30,7 +30,7 @@
 	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <% time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d') %>
-<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}") %><%= calendar_for('bid_deadline')%>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}",:readonly => "readonly") %><%= calendar_for('bid_deadline')%>
 </p>
 <p><%= f.select :is_evaluation, is_evaluation_option %>
 </p>
diff --git a/app/views/memos/_form.html.erb b/app/views/memos/_form.html.erb
index d4b517048..116f97149 100644
--- a/app/views/memos/_form.html.erb
+++ b/app/views/memos/_form.html.erb
@@ -2,12 +2,12 @@
 <!--[form:project]-->
 <p><%= l(:label_homeworks_form_new_description) %></p>
     <!-- % unless @memo.parent_id %>
-      <% if @memo.safe_attribute? 'sticky' %>
-       <%= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
-      <% end %>
-      <% if @memo.safe_attribute? 'locked' %>
-       <%= f.check_box :locked %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
-      <% end %>
-    <% end % -->
+      <%# if @memo.safe_attribute? 'sticky' %>
+       <%#= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
+      <%# end %>
+      <%# if @memo.safe_attribute? 'locked' %>
+       <%#= f.check_box :locked %> <%#= label_tag 'memo_locked', l(:label_board_locked) %>
+      <%# end %>
+    <%# end %> -->
 <p><%= f.text_field :content, :required => true, :size => 60, :style => "width:150px;" %></p>
 <p><%= hidden_field_tag 'subject', ||=@memo.subject %>
\ No newline at end of file