From 00ded2bc3891d37702c515d9f36619fcc5331dc7 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Mon, 14 Apr 2014 08:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E8=BE=93=E5=87=BA=EF=BC=8Cmemo=E5=8F=91?=
 =?UTF-8?q?=E5=B8=96=E4=BA=BA=E7=9A=84=E5=90=8D=E5=AD=97=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E6=B5=AE=E5=8A=A8=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_homework_show.html.erb | 5 ++++-
 app/views/memos/show.html.erb              | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index b44d72b5f..7c8e1468c 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -60,7 +60,10 @@
 							<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
 					</tr>
 					<tr>
-					<td colspan="2" width="580px" ><span class="font_description"><%= bid.description %></span></td>
+					<td colspan="2" width="580px" ><span class="font_description">
+						<%#= bid.description %>
+						<%= textilizable bid, :description %>
+					</span></td>
 					</tr>		
 			<tr>
 					<td align="left"><span class="font_lighter"><span> <%= l(:label_create_time) %> :&nbsp; <%=format_time bid.created_on %></span><span style="float: right">  <%= l(:field_deadline) %> :&nbsp; <%=bid.deadline %></span></td>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index d085c01d2..6ea5b17bc 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,7 +1,7 @@
 <div class="lz">
 	<div class="lz-left">	
-		<div class=""><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>	
-		<p class=""><%=link_to @memo.author.name, user_path(@memo.author) %></p>
+		<div><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>
+		<p class="clearfix"><%=link_to @memo.author.name, user_path(@memo.author) %></p>
 	</div>
 	<div class="memo-section">
 			<div class="contextual-borad">