From 334a99bcefcd1f85eab40a51bbcb3a2143560fbb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 4 Nov 2014 15:41:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E8=80=81=E5=B8=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BD=9C=E4=B8=9A=E6=97=B6=E5=90=AF=E5=8A=A8=E4=BA=92?=
 =?UTF-8?q?=E8=AF=84=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=202=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E6=94=B9=E4=B8=BA=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=203.=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E6=97=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb                 | 2 +-
 app/views/bids/_homework_form.html.erb             | 4 ++--
 app/views/homework_attach/_homework.html.erb       | 4 ++--
 app/views/homework_attach/_homeworks_list.html.erb | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 000752d2b..cbe81c54f 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -1004,7 +1004,7 @@ class BidsController < ApplicationController
   # 启动匿评
   def start_anonymous_comment
     @bid = Bid.find(params[:id])
-    if(@bid.comment_status == 1)
+    if(@bid.comment_status == 0)
       homeworks = @bid.homeworks
       if(homeworks && homeworks.count >= 4)
         @bid.update_column('comment_status', 1)
diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb
index 063daa12c..de4c16960 100644
--- a/app/views/bids/_homework_form.html.erb
+++ b/app/views/bids/_homework_form.html.erb
@@ -37,10 +37,10 @@
   <span id="bid_deadline_span">
   </span>
 </p>
-<p>
+<p style="display: none;">
   <%= f.select :is_evaluation, is_evaluation_option %>
 </p>
-<p style="display: none;">
+<p>
   <%= f.select :proportion, proportion_option %>
 </p>
 <p>
diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb
index 63e398877..be83a93ae 100644
--- a/app/views/homework_attach/_homework.html.erb
+++ b/app/views/homework_attach/_homework.html.erb
@@ -78,7 +78,7 @@
         <% if @bid.comment_status == 1 %>
             <!-- 处于开启匿评阶段，可以正常评分 -->
             <li class="wping">
-              <%= link_to l(:label_work_rating),homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type),:remote => true  %>
+              <%= link_to l(:label_anonymous_comments),homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type),:remote => true  %>
               <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
                   <span class="c_red">&nbsp;&nbsp;迟交！</span>
               <% end %>
@@ -86,7 +86,7 @@
         <% elsif @bid.comment_status == 2%>
             <!-- 处于匿评已关闭阶段,不容许评分 -->
             <li class="wping" title="关闭匿评后不可继续评分">
-              <a style="color:#8e8e8e;">评分</a>
+              <a style="background:#8e8e8e;"><%= l(:label_anonymous_comments) %></a>
               <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
                   <span class="c_red">&nbsp;&nbsp;迟交！</span>
               <% end %>
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index 514820fdd..90710a1ac 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -35,11 +35,11 @@
           <% if @bid.comment_status == 0 %>
               <!-- 老师布置的作业在创建和开启匿评这段时间才允许创建作品 -->
               <li class="wping">
-                <%= link_to "创建作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
+                <%= link_to "提交作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
               </li>
           <% else %>
-              <li class="wping">
-                <a style="width:80px; margin:20px 0 0 350px;">创建作业</a>
+              <li class="wping" title="只有开启匿评之前才能创建作业哦！">
+                <a style="width:80px; margin:20px 0 0 350px;background:#8e8e8e;">提交作业</a>
               </li>
           <% end %>
         </ul>