Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/welcome/contest.html.erb

@@ -170,7 +170,7 @@
 				</div>
 				
 				<div  style="float: left;margin:5px; margin-left: 12px; margin-bottom: 2px; width: 380px;">
-					<span class='font_lighter' title =<%=contest.description.to_s%>><%=contest.description.to_s%></span>
+					<span class='font_lighter' title ='<%=contest.description%>'><%=contest.description.truncate(100, omission: '...')%></span>
 				</div><br />
 				
 				<div style="padding-left: 57px; clear: left;">

app/views/welcome/index.html.erb

@@ -75,7 +75,7 @@
 					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			
 				</div>
 				<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;">
-					<span class='font_lighter' title =<%=project.description.to_s%>><%=project.description%></span>
+					<span class='font_lighter' title ='<%=project.short_description%>'><%=project.description.truncate(100, omission: '...')%></span>
 				</div>
 				<div >
                   <%# issue_count = project.issues.count %>