jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
z9hang 2014-05-09 10:25:26 +08:00
parent bdea0ee36a 14dcb18b96
commit a57d5fd823
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/bids/show.html.erb
View File

@ -20,10 +20,6 @@
<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %> <%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
<% end %> <% end %>
</div> </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> </span>
</div> </div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
@ -35,6 +31,6 @@
<div class="pagination" style="float:left;"> <div class="pagination" style="float:left;">
<ul> <ul>
<%= pagination_links_full @feedback_pages %> <%= pagination_links_full @feedback_pages %>
<ul> </ul>
</div> </div>