Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/contests/show_attendingcontest.html.erb

@@ -159,8 +159,9 @@
                       </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 %>'>
@@ -176,6 +177,7 @@
                           <%= f.submit :value => l(:button_submit), :class => "submit" %>
 						<% end %>	
 					</span>
+
                      </td>
                        <% end %>
                     </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>
 				<!-- 评价应标项目的表单 -->

config/locales/zh.yml

@@ -2224,7 +2224,7 @@ zh:
   label_project_deposit: 项目托管
   label_course_practice: 课程实践
   label_forum_all: 公共贴吧 
-  label_school_all: 中国高校
+ 
   label_enterprise_all: 组织
   label_contest_innovate: 创新竞赛  
   label_software_user: 软件创客

lib/email_verifier

@@ -1 +1 @@
-Subproject commit 3cabcc643f36939939685e6f55273dfbf89da545
+Subproject commit 222a9bdd72014f197baf2131ab71cc41660111ed