From f7fc4d06a2901c787aede124d7f31ac9913cba3d Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 12 Jun 2014 16:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B4=E5=90=A7=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B6=E8=B8=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/show.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 5f1fcdc65..06bdb5bf3 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,4 +1,6 @@
 <div class="lz">
+  <!-- 在这里添加赞和踩-->
+  <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id}%> </span>
 	<div class="lz-left">	
 		<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>