From 6a7c7a732cc8914a8a9511b23595399990ee68fb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 7 Mar 2015 17:08:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=8A=A550?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb | 42 ++------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b1a699afa..51139ac89 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -110,45 +110,7 @@
 	</div>
 </div>
 
-<div id="J_Slide" class="d-p-index-box d-p-index-Dynamic">
-		<ul class="user-welcome-message-list">
-			<h3 style="color: rgb(21, 188, 207)">
-              <strong>
-                <%= l(:lable_user_active)%>
-              </strong>
-            </h3>
-			<div class="user-message-box-list" style="margin-top: 10px;">
-				<%activities = find_all_activities%>
-                <% activities.each do |event| %>
-                    <li style="display: block;height:60px; padding-bottom: 4px;">
-                        <div class="inner-right" style="float: left; height: 100%; ">
-                            <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
-                        </div>
-                        <div class="inner-right" style="float: right; width:86%; height: 100%; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" >
-                          <span style="color: green;">
-                            <%= link_to event.event_author, (user_path(event.event_author) if event.event_author),
-                                        :style => "color:green;", :target => "_blank"  %>
-                          </span>
-                          <%= show_user_content event %>
-                          <p style="margin-top: 4px;">
-                            <span style="color: rgb(172, 174, 177)">
-                              <%= l(:field_updated_on) %>
-                              <%= format_time event.event_datetime %>
-                              <%#= l(:field_time_ago) %>
-                            </span>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <span style="float: right; color: rgb(172, 174, 177);">
-                              <%= show_event_reply event %>
-                            </span>
-                          </p>
-                        </div>
-                    </li>
-                  <% end  %>
-			</div>
-		</ul>
-	</div>
-
-<div class="right" style="float: right; width: 48%; ">
+<div class="right" style="float: right; width: 48%; padding-top: 8px;">
 	<ul class="welcome-message-list">
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
 			<h3 style="color: rgb(21, 188, 207);"><strong> <%= l(:lable_bar_active)%> </strong> <%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
@@ -156,7 +118,7 @@
 			<span style="margin-top: -30px;float: right; display: block;"> <%= link_to l(:label_more), forums_path %> </span>
 		</div>
 		<div class="welcome-box-list-new memo_activity">
-			<% topics = find_new_forum_topics(6) %>
+			<% topics = find_new_forum_topics(12) %>
 		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
                 <li class="message-brief-intro" style="line-height:1.4em;">
                     <div class='memo_title text_nowrap'>