From 28ffd44e5574df56ce2af8b2cdd48ccbfd58e223 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 16 Apr 2014 21:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E5=85=A5=E7=AB=9E=E8=B5=9B=EF=BC=8C=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_newcontest.html.erb | 45 +++++++++++++---------
 app/views/welcome/contest.html.erb         |  4 +-
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 79118fca7..f8c7056b6 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -56,29 +56,34 @@
 											<tr>
 												<td align="left" width="100px">
 													<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
-													</td>									
+												</td>	
+																				
 												<td>
-												<table>
-													<tr>
-														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @contest.name %></td>
-													</tr>	
-													<% if User.current.login? %>												
-													<tr colspan='3'>
-														<td valign="middle">
-															<span style="display:block; margin-left:20px;"><%= join_in_competition(@contest, User.current)%></span>   
-															<span style="display:block; margin-left:20px;"><span class="icon-fav icon"></span><%= new_watcher_link(@contest, User.current) %></span>   	
-														</td>
-												    </tr>
-												   <% end %>
-
-												</table>									
-							                           <!-- 竞赛的配置 -->
+													<table>
+														<tr>
+															<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @contest.name %></td>
+														</tr>	
+														<% if User.current.login? %>												
+														<tr colspan='3'>
+															<td valign="middle">
+																<span style="display:block; margin-left:20px; margin-bottom: 5px"><%= join_in_competition(@contest, User.current)%></span>   
+																<span style="display:block; margin-left:20px;"><%= new_watcher_link(@contest, User.current) %></span>   	
+															</td>
+													    </tr>
+													   <% end %>
+													   <!-- 竞赛的配置 -->
 														<% if User.current.logged? %>
 													      <% if @contest.author.id == User.current.id %>
-														     <%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %>									
+													      <tr colspan='3'>
+													      	<td valign="middle">
+														     <span style="display:block; margin-left:20px;"><%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %></span>									
+													      	</td>
+													      </tr>
 													      <% end %> 
-													    <% end %>
-						                   </td>
+													    <% end %>	
+													</table>									
+						                   		</td>
+						                   	</tr>
 						               </table>
 						        </div>
 			                 <!-- 参与人和参与项目的数量显示   -->
@@ -201,8 +206,10 @@
 											</table>
 										</div>
 									</div>
+								<div class="user_underline"></div>	
 						    </div>
 						
+						
 						<div id="content">
 							<% if display_main_menu?(@contest) %>
 							<div class="tabs_new">
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 3135595f8..f3d7f092e 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -119,7 +119,7 @@
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
 		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
-			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px;'%>
+			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
@@ -175,7 +175,7 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
-			<% find_new_forum_topics(10).each do |topic|%>
+			<% find_new_forum_topics(11).each do |topic|%>
 			<li class="message-brief-intro" style="min-height: 60px; line-height:2em; ">
 				<div  style="display: inline-block; width: 100%;">
 				  <span style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;