From 356ed9b116cd4213580ce00c45e73eb94d80e3f1 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 1 Nov 2014 11:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=95=99=E8=A8=80=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/_history.erb | 12 ++++++------
 public/stylesheets/application.css     |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb
index 985427b08..a837bbea9 100644
--- a/app/views/homework_attach/_history.erb
+++ b/app/views/homework_attach/_history.erb
@@ -26,18 +26,18 @@
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
                   <span style="float: right">
-                    <% if reply_allow %>
-                      <%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal},
-                                  :remote => true,:method => 'post', :title => l(:button_quote))%>
-                        <%= link_to l(:label_bid_respond_quote),'',
-                                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} %>
-                    <% end %>
                     <% if @user==User.current|| User.current.admin? %>
                       <%= link_to(l(:label_bid_respond_delete),
                                   {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
                                   :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
+                    <% if reply_allow %>
+                        <%= link_to l(:label_bid_respond_quote),'',
+                                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal},
+                                    :remote => true,:method => 'post', :title => l(:button_quote))%>
+                    <% end %>
                 </span>
               <span class="font_lighter" style="float: right">
                   <%= l(:label_bids_published) %>&nbsp;
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2cb87d87e..7b5f4e976 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1271,6 +1271,14 @@ a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
 
 #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
 #sidebar a.selected:hover {text-decoration:none;}
+#sidebar #attachment_ a {
+    background-position: 0% 50%;
+    background-repeat: no-repeat;
+    font-family: '微软雅黑'; /*modify by men*/
+    padding-left: 20px !important;
+    padding-top: 2px !important;
+    padding-bottom: 3px !important;
+}
 #admin-menu a {line-height:1.7em;}
 #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}