From 688438241ecf3ebf18f637e99755285e3d2d89d8 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 30 Apr 2014 16:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=94=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...softapplication_index_top_content.html.erb |  2 +-
 app/views/softapplications/index.html.erb     | 38 +------------------
 app/views/softapplications/show.html.erb      |  2 +-
 3 files changed, 4 insertions(+), 38 deletions(-)

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 0a41036f1..93b177b99 100644
--- a/app/views/layouts/_base_softapplication_index_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_index_top_content.html.erb
@@ -3,7 +3,7 @@
 		<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="300px">
+			<td rowspan="2" width="305px">
 				<div class="project-search" style="float: right">			
 					<%= text_field_tag 'name', params[:name], :size => 25 %>
 					<%= hidden_field_tag 'project_type', params[:project_type] %>
diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb
index 950e822a3..ba10b2530 100644
--- a/app/views/softapplications/index.html.erb
+++ b/app/views/softapplications/index.html.erb
@@ -1,37 +1,3 @@
-<!-- <h1>参赛应用</h1>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Description</th>
-    <th>App type</th>
-    <th>App type name</th>
-    <th>Android min version available</th>
-    <th>User</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @softapplications.each do |softapplication| %>
-  <tr>
-    <td><%= softapplication.name %></td>
-    <td><%= softapplication.description %></td>
-    <td><%= softapplication.app_type_id %></td>
-    <td><%= softapplication.app_type_name %></td>
-    <td><%= softapplication.android_min_version_available %></td>
-    <td><%= softapplication.user_id %></td>
-    <td><%= link_to 'Show', softapplication %></td>
-    <td><%= link_to 'Edit', edit_softapplication_path(softapplication) %></td>
-    <td><%= link_to 'Destroy', softapplication, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to '发布新应用', new_softapplication_path %> -->
-
 
 
 <%=render :partial => 'layouts/base_softapplication_index_top_content'%>
@@ -48,9 +14,9 @@
 			</div>
 			<div class="avatar-4"; style="float: left; margin-top: 7px "><%= image_tag('/images/app1.png')%></div>
 			<div style="float: left; width: 600px; padding-top: 6px; margin-left: 8px"><%= softapplication.description.truncate(95, omission: '...') %></div>
-			<div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; line-height: 0.5em">
+			<div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; ">
 				<%contest = softapplication.contests.first%>
-				<p>所属竞赛：<%= contest ? link_to(contest.name, show_softapplication_contest_path(contest) ) : '尚未加入竞赛'%></p>
+				<p>所属竞赛：<%= contest ? link_to(contest.name.truncate(10, omission: '...'), show_softapplication_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%></p>
 				<p>所属类别：<%= softapplication.app_type_name %></p>
 				<p>系统支持：<%= softapplication.android_min_version_available %></p>
 			</div>
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb
index 7d876d6c8..510250ee0 100644
--- a/app/views/softapplications/show.html.erb
+++ b/app/views/softapplications/show.html.erb
@@ -87,7 +87,7 @@
 </div>
 <div class="underline-contests_one"></div>
 
-<div style="height: 240px">
+<div style="height: auto; padding-bottom: 10px">
 	<strong><div style="font-size: 15px">软件截图：</div></strong>
 	<div class="softapplication-img" style="padding-top: 5px">
      <% @image_results.take(4).each do |attachment| %>