From 6b6fd2906fa479ee3bb4fbdbb4c25cb882b933f4 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 14 Jul 2014 09:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=88=97=E8=A1=A8=E3=80=82?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=E5=88=97=E8=A1=A8=E7=9A=84=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/first_page.rb                  |  3 ++-
 app/views/contests/_contest_list.html.erb | 12 ++++++++++--
 app/views/forums/_forum_list.html.erb     |  6 +++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/models/first_page.rb b/app/models/first_page.rb
index 8d8bbcff6..fcb76972c 100644
--- a/app/models/first_page.rb
+++ b/app/models/first_page.rb
@@ -1,3 +1,4 @@
 class FirstPage < ActiveRecord::Base
-  attr_accessible :description, :title, :web_title
+  attr_accessible :description, :title, :web_title,:page_type
 end
+                                                                                                                l
\ No newline at end of file
diff --git a/app/views/contests/_contest_list.html.erb b/app/views/contests/_contest_list.html.erb
index 8b5e34975..61dd6192c 100644
--- a/app/views/contests/_contest_list.html.erb
+++ b/app/views/contests/_contest_list.html.erb
@@ -2,11 +2,19 @@
 <% contests.each do |contest|%>
 <table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
 	<tr>
-		<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(contest.author), :class => 'avatar'), user_path(contest.author), :class => "avatar") %></td>
+		<td colspan="2" valign="top" width="50" >
+            <% unless contest.author.nil? %>
+                <%= link_to(image_tag(url_to_avatar(contest.author), :class => 'avatar'), user_path(contest.author), :class => "avatar") %>
+          <% end %>
+        </td>
 		<td>
 		<table width="100%" border="0">
 			<tr>
-				<td colspan="2" valign="top"><strong><%= link_to(contest.author, user_path(contest.author), :class => 'bid_user') %>: &nbsp;<%= link_to(contest.name, show_contest_contest_path(contest), :class => 'bid_path', :target => "_blank") %></strong></td>
+				<td colspan="2" valign="top"><strong>
+                  <% unless contest.author.nil? %>
+                      <%= link_to(contest.author, user_path(contest.author), :class => 'bid_user') %>:
+                  <% end %>
+                     &nbsp;<%= link_to(contest.name, show_contest_contest_path(contest), :class => 'bid_path', :target => "_blank") %></strong></td>
 			</tr>
 			<tr>
 				<td width="500">
diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index 0bbb0ddd4..2b8f98494 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -3,7 +3,11 @@
 <% if forums.any? %>
 	<% forums.each do |forum| %>
 	<div class="forums-index">
-		<div class="forums-inex-avatar"><%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %></div>
+		<div class="forums-inex-avatar">
+          <% unless forum.creator.nil? %>
+              <%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %>
+          <% end %>
+          </div>
 		<div class="forums-index-content">
 			<p ><%= link_to h(forum.name), forum_path(forum) %></p>
 			<p ><%= forum.description%></p>