From fb9e9aa8ee2ef4978ba062664b801b37f1246653 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Thu, 28 Nov 2013 09:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 95b0f92fa..81c1e111e 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -149,6 +149,19 @@
 	<ul class="user-welcome-message-list" style="width: 80%; margin-top: 80px;">
 		<h3 style="margin-left: -5px;">用户动态</h3>
 		<div class="user-message-box-list">
+			<% find_all_activities.each do |event|%>
+		<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>
+				<%= image_tag url_to_avatar(event[:event_author]), :class => "avatar-3"%>
+			</div>
+			<div class="inner-right" style="float: right; width:88%; height: 100%;">
+			<span style="color: green;"><%= event[:event_author] %></span>&nbsp;发表了评论：<span style="color: blue;"><%#= truncate(event[:event_description], length: 15, omission：'...') %>
+			</span>
+			<p><span><%= time_tag event[:date_time] %></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>评论(4)</span></p>
+			</div>
+		</li>
+		    <% end  %>
 		<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>
@@ -219,7 +232,7 @@
          	  <%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{project.name}")%>
 		    </p>
     	    <p class="layout-1" >
-			  <span class="d-p-project-intro"><%= project.description %></span>
+			  <span class="d-p-project-intro"><%= project.description.truncate(50, omission: '... (continued)') %></span>
     	    </p>  
     	    <!-- <p class="layout">
     	      <span><%= project.members.count%></span>
@@ -251,7 +264,7 @@
          	  <%= link_to( contest.name, respond_path(contest.id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{contest.name}")%>
 		    </p>
     	    <p class="layout-1" >
-			  <span class="d-p-project-intro"><%= contest.description %></span>
+			  <span class="d-p-project-intro"><%= contest.description.truncate(50, omission: '... (continued)') %></span>
     	    </p>
     	    <!-- <p style="margin-top: -10px;">
     	      <span><%= contest.created_on %></span>
@@ -283,7 +296,7 @@
          	  <%= link_to( bid.name, respond_path(bid.id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{bid.name}")%>
 		    </p>
     	    <p class="layout-1" >
-			  <span class="d-p-project-intro"><%= bid.description %></span>
+			  <span class="d-p-project-intro"><%= bid.description.truncate(50, omission: '... (continued)') %></span>
     	    </p>  	
           </li>
          <% end %>
@@ -312,7 +325,7 @@
          	  <%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{project.name}")%>
 		    </p>
     	    <p class="layout-1" >
-			  <span class="d-p-project-intro"><%= project.description %></span>
+			  <span class="d-p-project-intro"><%= project.description.truncate(50, omission: '... (continued)') %></span>
     	    </p>  	
           </li>
          <% end %>