From 75853bca014454f4a747a9b3154a1a35e2bd2f79 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 14 May 2014 17:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81=E5=90=84=E9=A1=B9=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contests/show_attendingcontest.html.erb   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index 04ba3a61b..f3f788c64 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -229,7 +229,7 @@
 			<!-- 评价显隐控制按钮-->
 		<% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
 			<td valign="top" align="right" width="10%">		       
-				<span> <%= toggle_link '评价', c_project.id.to_s %></span>
+				<span> <%= toggle_link '评奖', c_project.id.to_s %></span>
 				<!-- 评价应标项目的表单 -->
 				<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| %>
@@ -264,29 +264,31 @@
 			<td> <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> </td>		
 		</tr></br>
 	</div>
+	
 	<div style="padding-left: 68px">
 		<tr>
-			<td>简介:</td>
+			<td><strong>简介:</strong></td>
 			<td> <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> </td>
 		</tr></br>
 	</div>
-	<div style="padding-left: 68px; padding-bottom: 8px">
-		<span>发布时间：<%= format_time c_softapplication.created_at %></span>
-		<span style="padding-left: 50px">最终得分：<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s%>分</span>
-
-		
+	
+	<div style="padding-left: 68px; pading-bottom: 8px">
+		<span><strong>发布时间：</strong><%= format_time c_softapplication.created_at %></span>
+		<span style="padding-left: 240px"><strong>发布人员：</strong><%= c_softapplication.softapplication.user.name %></span>		
 	</div>
+	
 	<!--获奖及教师评奖-->
-	<div style="padding-left: 68px">
-		<tr>
-			<td style="color: #ec6300;" align="right" valign="0.1em" width="16%">
+	<div style="padding-left: 18px">
+		<span style="padding-left: 50px"><strong>最终得分：</strong></span><span style="color: red"><%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s%>分</span>
+		<span style="padding-left: 334px">
+			<td>
 				<strong>
-					<span id="reward_result_<%=c_softapplication.id%>"> <!-- 调用js进行刷新 -->
+					<span id="reward_result_<%=c_softapplication.id%>" > <!-- 调用js进行刷新 -->
 						<% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %>
 							<% if  @contest.deadline < Date.today %>
-						    	  <%= l(:label_noawards)%>
+						    	  <span><%= l(:label_noawards)%></span>
 						   	<% else%>
-						   		  <%= l(:label_noawards_current)%>	
+						   		  <span style="color: red"><%= l(:label_noawards_current)%></span>
 						    <% end %>
 						<% else %>
 							<%  case get_prize(c_softapplication) %>
@@ -313,7 +315,7 @@
 			<!-- 评价显隐控制按钮-->
 		<% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
 			<td valign="top" align="right" width="10%">		       
-				<span> <%= toggle_link '评价', c_softapplication.id.to_s %></span>
+				<span> <%= toggle_link '评奖', c_softapplication.id.to_s %></span>
 				<!-- 评价应标项目的表单 -->
 				<span style="display: none; vertical-align: top " id = '<%= c_softapplication.id %>'>					    		
 					<%= form_for "set_reward_softapplication",:remote=>true,:url=>set_reward_softapplication_contest_path do |f| %>
@@ -330,9 +332,7 @@
 				</span>	 
 			</td>
 		<% end %>
-		</tr>
-		<tr>
-		</tr>
+		</span>
 	</div>
 </div>
 <% end %>