From 0bce2ae8f3454a13516f5306983cfb4a88850180 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 30 Dec 2014 09:48:30 +0800
Subject: [PATCH] =?UTF-8?q?#1752=E2=80=9C=E7=AB=9E=E8=B5=9B=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E2=80=9D=EF=BC=8C=E2=80=9C=E5=8F=82=E5=8A=A0=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E2=80=9D=E6=97=B6,=E5=B7=A6=E4=BE=A7=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=8A=E6=96=B9=E5=B8=83=E5=B1=80=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/contests_controller.rb     |  3 +-
 app/views/layouts/base_newcontest.html.erb | 59 ++++++++++++++--------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index 6213b2315..d3edde756 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -134,9 +134,8 @@ class ContestsController < ApplicationController
     @state = false
 
     respond_to do |format|
-      layout_file = 'base_newcontest'
       format.html {
-        render :layout => layout_file
+        render :layout => 'base_newcontest'
       }
       format.api
     end
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 494cc1f7a..3bd03ed5d 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -25,7 +25,7 @@
 					<%=render :partial => 'layouts/base_header'%>
 					<div id="main" class="">
 						<div class="top-content">
-                            <table>
+                            <table style="font-size: 13px !important;">
                                 <tr>
                                     <td class="info_font" style="width: 240px; color: #15bccf" rowspan="2">
                                       <a href="http://<%= Setting.host_contest%>" style="color: #15bccf;">
@@ -33,7 +33,9 @@
                                       </a>
                                     </td>
                                     <td style="width: 430px; color: #15bccf">
-                                      <strong><%= l(:label_user_location) %> : </strong>
+                                      <strong>
+                                        <%= l(:label_user_location) %> :
+                                      </strong>
                                     </td>
                                     <td rowspan="2" width="250px">
                                         <script type="text/javascript">
@@ -74,11 +76,14 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><%=link_to l(:field_homepage), home_path %> >
-                                      <a><%= l(:label_contest_innovate) %></a> >
-                                        <span title="<%= @contest.name%>">
-                                          <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>
-                                        </span>
+                                    <td>
+                                      <%=link_to l(:field_homepage), home_path %> >
+                                      <a>
+                                        <%= l(:label_contest_innovate) %>
+                                      </a> >
+                                      <span title="<%= @contest.name%>">
+                                        <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>
+                                      </span>
                                     </td>
                                 </tr>
                             </table>
@@ -89,7 +94,7 @@
 								<div class="spaceleft">
 									<div class="inf_user_image">
 										<table>
-											<tr>
+											<tr style="line-height: normal;">
 												<td align="left" width="100px">
 													<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
 												</td>
@@ -137,7 +142,7 @@
 			                 <!-- 参与人和参与项目的数量显示   -->
 								<div class="user_fans">
 									<table width="240" border="0">
-										<tr align="center" width="80px">
+										<tr align="center" width="80px" style="line-height: normal;">
 											<!--关注人数-->
 											<td class="font_index">
 												<span id="watcher_count_span">
@@ -152,27 +157,27 @@
 													<%=link_to "#{@contest.contesting_softapplications.count}",show_attendingcontest_contest_path(@contest) %>
 												<% end %>
 											</td>
-
-											</tr>
+										</tr>
 										<tr class="font_aram">
-											<td align="center" width="70px"> <%= l(:label_contest_watchers) %></td>
-											<td align="center" width="70px"> <%= l(:label_contest_work) %></td>
-
+											<td align="center" width="70px">
+                                              <%= l(:label_contest_watchers) %>
+                                            </td>
+											<td align="center" width="70px">
+                                              <%= l(:label_contest_work) %>
+                                            </td>
 										</tr>
 									</table>
 									<div class="user_underline"></div>
 								</div>
-
 									<div class="user_underline"></div>
 
-								<div class="inf_user_context">
+								<div class="inf_user_context" style="line-height: normal;margin-top: 10px;">
 									<div class="font_title_left">
 										<%= l(:label_project_overview) %>
 									</div>
 									<div style="padding-bottom: 8px">
 										<% if @contest.description.size>0 %>
 										<div class="font_lighter_sidebar">
-
 											<%= textilizable @contest.description %>
 										</div>
 										<% else %>
@@ -205,7 +210,9 @@
 									<div class="user_fans">
 										<div class="user_underline"></div>
 										<div class="font_title_left">
-											<strong><%= l(:label_x_followers, :count => @contest.watcher_users.count) %></strong>
+											<strong>
+                                              <%= l(:label_x_followers, :count => @contest.watcher_users.count) %>
+                                            </strong>
 											 <% if show_more_fans?(@contest) %>
 											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), show_contest_user_contest_path(@contest) %></span>
 											<% end %>
@@ -234,9 +241,15 @@
 							<% if display_main_menu?(@contest) %>
 							<div class="tabs_new">
 								<ul>
-                                  <li><%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %></li>
-                                  <li><%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %></li>
-                                  <li><%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %></li>
+                                  <li>
+                                    <%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %>
+                                  </li>
+                                  <li>
+                                    <%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %>
+                                  </li>
+                                  <li>
+                                    <%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %>
+                                  </li>
                                 </ul>
 							</div>
 							<% end %>
@@ -251,7 +264,9 @@
 			</div>
 
 			<div id="ajax-indicator" style="display:none;">
-				<span><%= l(:label_loading) %></span>
+				<span>
+                  <%= l(:label_loading) %>
+                </span>
 			</div>
 			<div id="ajax-modal" style="display:none;"></div>