From 25baf61185e1100725981f2e7737dd0c581020b0 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Tue, 10 Dec 2013 19:45:38 +0800
Subject: [PATCH] to do

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

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 35bc65c51..83e036f6f 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -104,6 +104,10 @@ module WelcomeHelper
     # or
     searchStudent(project).count
   end
+  #To do
+  def find_new_forum_topics
+    
+  end
 
   private
 
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 3e042df0c..ee495d1fa 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -126,19 +126,40 @@
 
 
 </script>
+<!-- <style>
+	.forum-topic li{
+		float: left;
+	}
+	
+</style> -->
 <!-- info display block -->
 <%= stylesheet_link_tag 'welcome' %>
 <div class="body_resize">
 	
 <div class="left" style="float: left; height: 445px; width: 50%;">  
 <ul class="welcome-message-list" style="width: 90%; ">
-	<h3 style="color: rgb(21, 188, 207);margin-left: 8px;"><strong>论坛热帖</strong></h3>
+	<div class="forum-topic">
+	  <ul>
+		<li>
+	      <h3 style="color: rgb(21, 188, 207);margin-left: 8px;"><strong>论坛动态</strong></h3>
+	    </li>
+	    <!-- <li>
+	    	<h4>最新帖子</h4>
+	    </li>
+	    <li>
+	    	<h4>最热帖子</h4>
+	    </li>
+	    <li>
+	    	<h4>更多主题</h4>
+	    </li> -->
+	  </ul>
+	</div>
 	<div class="welcome-box-list">
 		<% find_hot_forum_topics.each do |topic|%>
 		<li class="message-brief-intro" style="min-height: 25px;">
 			<div  style="display: inline-block; width: 100%;">
 			  <span style="color:gray; display: inline-block;   background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			  <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;"%>
+			    <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;"%>
 			  </span>
 			<br>
 			<span style="margin-left: 20px; color: rgb(172, 174, 177); white-space: nowrap; font-size：　9pt !important;;"><%=l(:field_updated_on)%><%=time_tag_welcome(topic_last_time topic)%>前</span>