Merge remote-tracking branch 'origin/szzh' into szzh

app/views/mailer/send_for_user_activities.html.erb

@@ -187,7 +187,7 @@
 
 <!--项目相关-->
 <% if @issues.first || @project_messages.first || @issues_journals.first || @wiki_contents.first || @project_news.first || @project_news_comments.first || @project_journal_messages.first ||
-        @project_news_comments.first  %>
+         @project_attachments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#474646; "><%= l(:label_project_overview_new)%></h3>
       <% unless @issues.first.nil? || @issues_journals.first.nil? %>

public/stylesheets/new_user.css

@@ -534,7 +534,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
-.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}