From 9e36f9264c956b3ae4e83ba8df73d717e6b3d24a Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 31 Jan 2015 15:46:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E4=BD=9C=E4=B8=9A=E8=AF=84=E5=88=86=E3=80=8B=20Signed?=
 =?UTF-8?q?-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contests/show_attendingcontest.html.erb   | 48 ++++++++++---------
 config/locales/zh.yml                         |  2 +-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index f8c231550..3f8ef4264 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -136,34 +136,35 @@
 							   	<% else %>
 							   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
 							    <% end %>
-							<% else %>
-								<% case get_prize(c_project) %>
-									<% when '-1' %>
-								    	<%= image_tag("/images/bid/special_reward.png") %>
-									<% when '0' %>
-								    	<%= image_tag("/images/bid/first_reward.png") %>
-									<% when '1' %>
-								    	<%= image_tag("/images/bid/second_reward.png") %>
-									<% when '2' %>
-								    	<%= image_tag("/images/bid/third_reward.png") %>
-									<% when '3' %>
-								    	<%= image_tag("/images/bid/forth_reward.png") %>
-									<% when '4' %>
-								    	<%= image_tag("/images/bid/fifth_reward.png") %>
-									<% when '5' %>
-								    	<%= image_tag("/images/bid/qualified.png") %>
-									<% end %>   
-							<% end %>					    
+                        <% else %>
+                            <% case get_prize(c_project) %>
+                                <% when '-1' %>
+                                    <%= image_tag("/images/bid/special_reward.png") %>
+                                <% when '0' %>
+                                    <%= image_tag("/images/bid/first_reward.png") %>
+                                <% when '1' %>
+                                    <%= image_tag("/images/bid/second_reward.png") %>
+                                <% when '2' %>
+                                    <%= image_tag("/images/bid/third_reward.png") %>
+                                <% when '3' %>
+                                    <%= image_tag("/images/bid/forth_reward.png") %>
+                                <% when '4' %>
+                                    <%= image_tag("/images/bid/fifth_reward.png") %>
+                                <% when '5' %>
+                                    <%= image_tag("/images/bid/qualified.png") %>
+                                <% end %>
+                        <% end %>
 						</span>
                         </strong>
                       </td>
 
                       <!-- 评价显隐控制按钮-->
-                      <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
+                      <% if ((User.current.id == @contest.author_id) && (@contest.deadline >= Date.today))||User.current.admin %>
                           <td valign="top" align="right" width="10%">
+
                             <span> <%= toggle_link l(:label_reward), c_project.id.to_s %></span>
                             <!-- 评价应标项目的表单 -->
-					<span style="display: none; vertical-align: top " id='<%= c_project.id %>'>
+						<span style="display: none; vertical-align: top " id='<%= c_project.id %>'>
 						<%= form_for "set_reward_project", :remote => true, :url => set_reward_project_contest_path do |f| %>
 							<%= f.text_field :c_id, :style => "display:none", :value => c_project.id, :size => "0" %>
                           <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
@@ -176,8 +177,9 @@
                           <%= f.submit :value => l(:button_submit), :class => "submit" %>
 						<% end %>	
 					</span>
-                          </td>
-                      <% end %>
+
+                     </td>
+                       <% end %>
                     </div>
                   </div>
                 </div>
@@ -282,7 +284,7 @@
             </td>
 					    
 			<!-- 评价显隐控制按钮-->
-          <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
+          <% if ((User.current.id == @contest.author_id) && (@contest.deadline >= Date.today))||User.current.admin %>
              <div style="text-align: right;width: 100%;">
 				<span style="padding-right: 5px; padding-top: 1px"> <%= toggle_link '评奖', c_softapplication.id.to_s %></span>
 				<!-- 评价应标项目的表单 -->
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 524494f45..13f609aef 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2204,7 +2204,7 @@ zh:
   label_project_deposit: 项目托管
   label_course_practice: 课程实践
   label_forum_all: 公共贴吧 
-  label_school_all: 中国高校
+ 
   :label_enterprise_all: 名企
   label_contest_innovate: 创新竞赛  
   label_software_user: 软件创客

From 4ebd34722d336afc8712bdf16823cd0ed6631fde Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 31 Jan 2015 15:53:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?email=5Fverifier=20=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/email_verifier | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/email_verifier b/lib/email_verifier
index 3cabcc643..222a9bdd7 160000
--- a/lib/email_verifier
+++ b/lib/email_verifier
@@ -1 +1 @@
-Subproject commit 3cabcc643f36939939685e6f55273dfbf89da545
+Subproject commit 222a9bdd72014f197baf2131ab71cc41660111ed