From 205c78454f150988d49117eb960bf8bb7013b911 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 28 Oct 2014 14:28:14 +0800
Subject: [PATCH] =?UTF-8?q?#1414=E8=AE=BE=E7=BD=AE=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=94=E8=B4=B4=E5=90=A7=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=94=B9=E4=B8=BA9=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb | 56 +++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 4fc08d41f..171b2b764 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -56,7 +56,9 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hot">
     <h3 style="margin-left: 5px; color: #e8770d;">
-      <strong><%= l(:lable_hot_projects)%></strong>
+      <strong>
+        <%= l(:lable_hot_projects)%>
+      </strong>
     </h3>
 	<span style="margin-top: -20px;float: right; display: block;">
       <% if User.current.logged? %>
@@ -83,14 +85,16 @@
 				<!-- 上左下右 -->
 				<div style="float: left; margin-left: 10px; width: 380px;">
                   <% unless project.is_public %>
-                     <span class="private_project"><%= l(:label_private) %></span>
+                     <span class="private_project">
+                       <%= l(:label_private) %>
+                     </span>
                   <% end %>
 					<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
-					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			
+					(<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)
 				</div>
-				<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;">
+				<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;min-height: 42px;">
 					<span class='font_lighter' title ='<%=project.short_description%>'>
-                      <%=project.description.truncate(100, omission: '...')%>
+                      <%=project.description.truncate(90, omission: '...')%>
                     </span>
 				</div>
 				<div >
@@ -109,33 +113,37 @@
 
 <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>
-			<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank"  %></span>
+			<h3 style="color: rgb(21, 188, 207)">
+              <strong>
+                <%= l(:lable_user_active)%>
+              </strong>
+            </h3>
+			<span style="margin-top: -20px;float: right; display: block;">
+              <%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank"  %>
+            </span>
 			<div class="user-message-box-list" style="margin-top: 10px;">
 				<%activities = find_all_activities%>
                 <% activities.each do |event| %>
-                      <!--<%# cache cache_key_for_event(event) do %> -->
                     <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) %>
-                            <%= time_tag_welcome event.event_datetime %>前
-                          </span>
-                          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                          <span style="float: right; color: rgb(172, 174, 177);">
-                            <%= show_event_reply event %>
-                          </span>
-                        </p>
+                          <p style="margin-top: 4px;">
+                            <span style="color: rgb(172, 174, 177)">
+                              <%= l(:field_updated_on) %>
+                              <%= time_tag_welcome event.event_datetime %>前
+                            </span>
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <span style="float: right; color: rgb(172, 174, 177);">
+                              <%= show_event_reply event %>
+                            </span>
+                          </p>
                         </div>
                     </li>
                 <% end  %>
@@ -148,14 +156,18 @@
       <!--<%# cache 'forum_links' do %> -->
 		<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>
+			<strong>
+              <%= l(:lable_bar_active)%>
+            </strong>
 			<%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
 			<%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
           </h3>
-            <span style="margin-top: -30px;float: right; display: block;"><%= link_to l(:label_more), forums_path %></span>
+          <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(7) %>
+			<% topics = find_new_forum_topics(6) %>
 		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
               <!--<%# cache cache_key_for_topic(topic) do %> -->
                 <li class="message-brief-intro">