From c40bc242cd4d53a877057f5489915100ac87cea2 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 29 Apr 2014 08:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=EF=BC=9B=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E7=AB=9E=E8=B5=9B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=8F=82=E8=B5=9B=E5=BA=94=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=AE=80=E4=BB=8B=E7=9A=84=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=88=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=98=BE=E7=A4=BA=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6=EF=BC=89=EF=BC=9B=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=BA=86=E5=85=B7=E4=BD=93=E5=8F=82=E8=B5=9B=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=BA=94=E7=94=A8=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=AE=80=E4=BB=8B=E7=9A=84=E9=95=BF=E5=BA=A6=EF=BC=88?=
 =?UTF-8?q?=E5=B0=86=E5=8E=9F=E6=9D=A5=E7=9A=84=E9=99=90=E5=88=B6=E4=B8=BA?=
 =?UTF-8?q?150=E6=94=B9=E4=B8=BA=E4=B8=8D=E9=99=90=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BE=BF=E4=BA=8E=E8=AF=BB=E8=80=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/_list_softapplications.html.erb            | 2 +-
 .../layouts/_base_softapplication_index_top_content.html.erb  | 4 ++--
 app/views/softapplications/show.html.erb                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb
index eb179718a..256c1d5af 100644
--- a/app/views/contests/_list_softapplications.html.erb
+++ b/app/views/contests/_list_softapplications.html.erb
@@ -14,7 +14,7 @@
 			<tr>
 				<td>简介:</td>
 				<td>
-					<%= c_softapplication.softapplication.description %>
+					<%= c_softapplication.softapplication.description.truncate(100, omission: '...') %>
 				</td>
 			</tr></br>
 			</div>
diff --git a/app/views/layouts/_base_softapplication_index_top_content.html.erb b/app/views/layouts/_base_softapplication_index_top_content.html.erb
index 5366661d3..0a41036f1 100644
--- a/app/views/layouts/_base_softapplication_index_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_index_top_content.html.erb
@@ -3,9 +3,9 @@
 		<tr>
 			<td class="info_font" style="width: 240px; color: #15bccf">创新竞赛社区</td>
 			<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
-			<td rowspan="2" width="250px">
+			<td rowspan="2" width="300px">
 				<div class="project-search" style="float: right">			
-					<%= text_field_tag 'name', params[:name], :size => 30 %>
+					<%= text_field_tag 'name', params[:name], :size => 25 %>
 					<%= hidden_field_tag 'project_type', params[:project_type] %>
 					<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>		
 				</div>				
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb
index 32ab3474b..dda52858f 100644
--- a/app/views/softapplications/show.html.erb
+++ b/app/views/softapplications/show.html.erb
@@ -57,7 +57,7 @@
 
 <div style="height: auto; padding-bottom: 10px">
 	<strong><div style="font-size: 15px">应用简介：</div></strong>
-	<div><%= @softapplication.description.truncate(150, omission: '...') %></div>
+	<div><%= @softapplication.description %></div>
 </div>
 <div class="underline-contests_one"></div>