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

app/views/bids/show.html.erb

@@ -20,10 +20,6 @@
 			<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
 		<% end %>
 		</div>
-		<span id="praise_tread" style="float: right"> 
-			<%= render :partial => "/praise_tread/praise_tread",
-			:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
-		</span>	
 	</span>
 </div>
 <div style="clear: both;"></div>
@@ -35,6 +31,6 @@
 <div class="pagination" style="float:left;">
 	<ul>
 		<%= pagination_links_full @feedback_pages %>
-		<ul>
-		</div>
+    </ul>
+</div>