From 4b408241113647caf2d5e3adb60f4d047df80416 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 15 Oct 2014 17:04:46 +0800
Subject: [PATCH] =?UTF-8?q?#1341=E4=BF=AE=E5=A4=8D=E5=88=9B=E6=96=B0?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B--=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=EF=BC=9A=E5=9B=9E=E5=A4=8D=E7=95=99=E8=A8=80=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/_history.html.erb     | 6 +-----
 app/views/contests/show_contest.html.erb | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/views/contests/_history.html.erb b/app/views/contests/_history.html.erb
index f59bc0fc7..b62f91146 100644
--- a/app/views/contests/_history.html.erb
+++ b/app/views/contests/_history.html.erb
@@ -32,7 +32,6 @@
 
                         <span>
                            <% if reply_allow %>
-                               <%#= link_to(l(:button_quote), {:controller => 'contests', :action => 'new', :id => contest, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%>
                                <%= link_to(l(:button_quote),
                                            contests_path(:id => contest,
                                                          :journal_id => journal),
@@ -43,15 +42,12 @@
                                    <%= link_to l(:label_bid_respond_quote),
                                                '',
                                              {:focus => 'project_respond',
-                                              :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}: '); $('##{ids} textarea') ;return false;"
+                                              :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user}: '); $('##{ids} textarea') ;return false;"
                                              }
                                    %>
                            <% end %>
 
                             <% if @user==User.current|| User.current.admin? %>
-                               <%#= link_to(l(:label_bid_respond_delete), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm),
-                                    :remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) %>
-                              <!-- modified by longjun -->
                                <%= link_to(l(:label_bid_respond_delete),
 
                                            words_destroy_path(:user_id => @user, :object_id => journal),
diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index 5435f67fe..cc1210751 100644
--- a/app/views/contests/show_contest.html.erb
+++ b/app/views/contests/show_contest.html.erb
@@ -19,10 +19,6 @@
 		</p>		
 		<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
 			<%= @contest.description %>
-			<!-- <%# if @contest.attachments.any?%>
-				<%# options = {:author => true} %>
-				<%#= 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",