From 39bf4ff188af8ce54c0900c8e20ae0c83f0605da Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Sat, 30 Nov 2013 09:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=BC=A0=E6=A0=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb    | 4 ++--
 app/views/welcome/index.html.erb | 6 +++---
 public/stylesheets/welcome.css   | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index fc09041e..fb04f62a 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -60,7 +60,7 @@ module WelcomeHelper
     when 'reply'
       '回复'
     when 'bid'
-      '众包'
+      '作业'
     else
     event.event_type
     end
@@ -119,7 +119,7 @@ module WelcomeHelper
   end
 
   #取得所有活动
-  def find_all_activities limit=5
+  def find_all_activities limit=6
     # users = []
     # activities = Activity.find_by_sql("select distinct user_id from activities order by id DESC limit #{limit}" )
     # activities.each { |activity|
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 56e63f0e..e7bf1c50 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -129,7 +129,7 @@
 				<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
 			</div>
 			<div class="inner-right" style="float: right; width:86%; height: 100%; ">
-			<span style="color: green;"><%= link_to event.event_author, user_path(event.event_author), :style => "color:green;" %></span>&nbsp;发表了<%= find_all_event_type event %>：<span style="color: blue;"><%= link_to truncate(event.event_description, length: 30, omission:'...'), event.event_url %>
+			<span style="color: green;"><%= link_to event.event_author, user_path(event.event_author), :style => "color:green;" %></span>&nbsp;发表了<%= find_all_event_type event %>：<span style="color: blue;"><%= link_to truncate(event.event_title, length: 30, omission:'...'), event.event_url %>
 			</span>
 			<p><span style="color: rgb(172, 174, 177)"><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!-- <span>评论(4)</span></p> -->
 			</div>
@@ -151,7 +151,7 @@
 		  	<div style="float: left; margin-left: 10px; width: 360px;">
     	      <p class="layout">
          	    <%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name",  :title => "#{project.name}")%>
-         	    <span style="display: inline-block; float: right; color: red; background: url('/images/score.png') no-repeat scroll ;background-position: left center;" title="项目得分">&nbsp;&nbsp;&nbsp;&nbsp;<%= show_grade project %></span>
+         	    <span style="display: inline-block; float: right; color: #ec6300; background: url('/images/score.png') no-repeat scroll ;background-position: left center;" title="项目得分">&nbsp;&nbsp;&nbsp;&nbsp;<%= show_grade project %></span>
 		      </p>
     	      <p class="layout-1" >
 			    <!-- <span class="d-p-project-intro" ><%= project.description.truncate(50, omission: '...') %></span> -->
@@ -221,7 +221,7 @@
 	</div>
 </div>
 
-<div class="clr"></div>
+<div class="clr">
 </div>
 
 
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index 6d3d8ba5..bc2e1b7c 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -157,7 +157,7 @@ li {
     line-height: 20px;
     padding: 5px 5px 0px 9px;
     width: 440px;
-    cursor: pointer;
+    /*cursor: pointer;*/
     font: 12px/1.5 tahoma,arial,\5b8b\4f53;
     float: left;
 /*    display:block;*/
@@ -204,6 +204,9 @@ p.layout {
 	width: 45px;
 	height: 45px;
 }
+.d-p-project-intro {
+	cursor: text;
+}
 /*p.clr, .clr { clear:both; padding:0; margin:0; background:none;}*/