From 75fb5a2cd3c98ebd7ed25cac262d384d95868e0c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 11 Oct 2014 15:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_history.html.erb      | 77 +++++++++++++++------------
 app/views/words/_new_respond.html.erb | 18 ++++---
 2 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb
index 00a497e78..b67421823 100644
--- a/app/views/bids/_history.html.erb
+++ b/app/views/bids/_history.html.erb
@@ -19,41 +19,48 @@
 
 
 <% if journals.size >0 %>
-<ul class="message-for-user">
-  <% for journal in journals%>
-    <li id='word_li_<%= journal.id.to_s %>' class="outer-message-for-user">
-      <span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
-			<span class="body">	
-				<span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
-				<span class="font_lighter"><%= label %></span>
-                <div> <%= textilizable journal.notes%> </div>
-				<span class="font_lighter"><%= l(:label_bids_published) %>&nbsp;<%= time_tag(journal.created_on).html_safe %>&nbsp;<%= l(:label_bids_published_ago) %></span>
+    <ul class="message-for-user">
+      <% for journal in journals%>
+        <li id='word_li_<%= journal.id.to_s %>' class="outer-message-for-user">
+          <span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
+                <span class="body">
+                    <span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
+                    <span class="font_lighter"><%= label %></span>
+                    <div> <%= textilizable journal.notes%> </div>
+                    <span class="font_lighter">
+                      <%= l(:label_bids_published) %>&nbsp;
+                      <%= time_tag(journal.created_on).html_safe %>&nbsp;
+                      <%= l(:label_bids_published_ago) %>
+                    </span>
                     <% ids = 'project_respond_form_'+ journal.id.to_s%>
-				<span>
-                <% 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 %>
-				</span>
-			</span>
-			<div style="clear: both;"></div>
-      <% ids = 'project_respond_form_'+ journal.id.to_s%>
-      <% if reply_allow %>
-      <div id='<%= ids %>' class="respond-form">
-        <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
-      </div>
+                    <span>
+                    <% 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 %>
+                    </span>
+                </span>
+                <div style="clear: both;"></div>
+          <% ids = 'project_respond_form_'+ journal.id.to_s%>
+          <% if reply_allow %>
+          <div id='<%= ids %>' class="respond-form">
+            <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
+          </div>
+          <% end %>
+          <div style="clear: both;"></div>
+          <div>
+            <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
+          </div>
+        </li>
       <% end %>
-      <div style="clear: both;"></div>
-      <div>
-        <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
-      </div>
-		</li>
-	<% end %>
-</ul>
+    </ul>
 <% end %>
diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index d3f4145a8..64b83d777 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -1,13 +1,15 @@
 
 <%= form_tag({:controller => 'words', :action => 'create_reply'}, :remote => true) do %>
-<%= text_area_tag 'user_notes', "", :class => 'noline', 
-									:style => "resize: none;", :rows => 4,
- 									:placeholder => l(:label_projects_feedback_respond_content),
- 									:maxlength => 250 %>
+    <%= text_area_tag 'user_notes', "", :class => 'noline',
+                                        :style => "resize: none;", :rows => 4,
+                                        :placeholder => l(:label_projects_feedback_respond_content),
+                                        :maxlength => 250 %>
 
-<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
-<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
-<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
-<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise", :style => "float: right; margin-top: 1px; margin-right: 4px;"%> 
+    <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
+    <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
+    <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
+    <%= submit_tag l(:button_projects_feedback_respond), :name => nil ,
+                   :class => "enterprise",
+                   :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
 
 <% end %>
\ No newline at end of file