From eb2bf5b87950838fe520da35a742ce23aff4666b Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Thu, 28 Nov 2013 08:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb    | 9 ++++++++-
 app/views/welcome/index.html.erb | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index c5ac62024..545f4da7d 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -84,7 +84,14 @@ module WelcomeHelper
  def sort_contest_by_hot
     return sort_bid_by_hot_rails 2
  end
- 
+#取得所有活动
+ def find_all_activities
+   
+ end
+#取得论坛数据
+ def find_hot_forum_topics
+   
+ end
  def sort_project_by_hot_rails project_type
     limit = 10
     project_type == 0 ? Project.find_by_sql("
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 6bf624eb6..95b0f92fa 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -167,7 +167,7 @@
 			<p><span>1分钟前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
 			</div>
 		</li>
-		<li style="display: block;height:60px;">
+		<li style="display: block; height:60px;">
 			<div class="inner-right" style="float: left; height: 100%;">
 				<img class="avatar-3" style="width: 40px; height: 40px; margin-top:10px;" src="/images/avatars/User/4861?1385345302"></img>
 			</div>