From a11b1676ff3dcdcc7a09b280c9c8c29539fef65d Mon Sep 17 00:00:00 2001
From: william <silentbinary@gmail.com>
Date: Wed, 14 Aug 2013 12:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86=E5=AF=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=88=97=E8=A1=A8=E5=92=8C=E9=97=AE=E9=A2=98=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E9=A1=B6=E3=80=81=E8=B8=A9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9B=20=E5=8F=A6=E5=A4=96=E9=81=97=E7=95=99=E4=BA=86tag?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=BE=85=E8=A7=A3=E5=86=B3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb | 3 ++-
 app/views/issues/show.html.erb  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 9b1a5cf67..b4a28c59b 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -74,6 +74,7 @@
 				<% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
 
 				<!-- 在这里添加赞和踩-->
+				<span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => issue,:show_flag => true,:user_id =>User.current.id}%> </span>
 
 				<% if issue.tracker.name == 'Bug' %>
 				<%= image_tag("/images/task.png", :class => "img-tag-issues") %>
@@ -91,7 +92,7 @@
 					</ul>
 					<ul class="list-group-item-meta">
 						<div class="issue-list-description">
-							<%= l(:field_description)%>:<%= issue.description %>				
+							<%= l(:field_description)%>:<%= issue.description %>
 						</div>
 					</ul>
 					<ul class="list-group-item-meta">
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index c80b150ef..ebf6896d8 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -28,7 +28,9 @@
 </div> 
 
 <!-- 顶和踩  在这里添加  -->
-
+ <span id="praise_tread" style="float: right">
+       <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @issue,:show_flag => true,:user_id =>User.current.id}%>
+  </span>
 	          
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.