From 591aa78dcff0f1161289eeedff1bd316bd638b68 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 28 Oct 2014 17:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=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              | 49 +++++++++++--------
 app/views/bids/show.html.erb                  | 30 +++++++++---
 app/views/words/_journal_reply.html.erb       |  6 +--
 app/views/words/_journal_reply_items.html.erb | 42 +++++++++-------
 app/views/words/_new_respond.html.erb         |  2 +-
 app/views/words/create_reply.js.erb           | 15 +++---
 6 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb
index 784fb7ff8..8273c4b04 100644
--- a/app/views/bids/_history.html.erb
+++ b/app/views/bids/_history.html.erb
@@ -1,6 +1,8 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <% tip1 = (@bid.reward_type == 3) ? l(:label_student_response) : l(:label_user_response) %>
-<p class="font_lighter" style="font-size: 15px; padding-left: 12px; "><%=tip1%></p>
+<p class="font_lighter" style="font-size: 15px; padding-left: 12px; ">
+  <%=tip1%>
+</p>
 
 <div id='leave-message'>
 	<%= render :partial => 'new', :locals => {:bid => @bid, :sta => @state} %>
@@ -22,24 +24,31 @@
     <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>
+            <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;"}
-                         %>
+                            {: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),
@@ -47,14 +56,14 @@
                                   :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
-                    </span>
                 </span>
-                <div style="clear: both;"></div>
+            </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>
+              <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>
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 31baac38d..d9e9a5ae1 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -1,16 +1,34 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <div style="margin-left: 20px;">
-	<span class="portrait"><%=  image_tag(url_to_avatar(@bid.author), :class => "avatar")%></span>
+	<span class="portrait">
+      <%=  image_tag(url_to_avatar(@bid.author), :class => "avatar")%>
+    </span>
 	<span class="body" style="word-break: break-all;word-wrap: break-word;">
-		<h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= link_to(@bid.name,respond_path(@bid)) %></h3>
+		<h3>
+          <%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：
+          <%= link_to(@bid.name,respond_path(@bid)) %>
+        </h3>
 		<% if @bid.reward_type.nil? or @bid.reward_type == 1%>
 		<p>
-			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= l(:label_call_bonus) %>&nbsp; <%= l(:label_RMB_sign) %><%= @bid.budget %></span></strong>
+			<strong>
+              <%= l(:label_bids_reward_method) %>
+              <span class="bonus">
+                <%= l(:label_call_bonus) %>
+                &nbsp;
+                <%= l(:label_RMB_sign) %>
+                <%= @bid.budget %>
+              </span>
+            </strong>
 		</p>
 		<% elsif @bid.reward_type == 2%>
-		<p>
-			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @bid.budget%></span></strong>
-		</p>
+            <p>
+                <strong>
+                  <%= l(:label_bids_reward_method) %>
+                  <span class="bonus">
+                    <%= @bid.budget%>
+                  </span>
+                </strong>
+            </p>
 		<% else %>
 		<% end %>
 		<div class="bid_description">
diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb
index 6f87443c4..d9b9b4587 100644
--- a/app/views/words/_journal_reply.html.erb
+++ b/app/views/words/_journal_reply.html.erb
@@ -1,7 +1,7 @@
 
 <% id = "journal_reply_ul_" + journal.id.to_s%>
 <ul class="messages-for-user-reply" id = '<%= id %>' >
-           <% fetch_user_leaveWord_reply(journal).each do |reply|%>
-             <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %>
-			<% end %>
+    <% fetch_user_leaveWord_reply(journal).each do |reply|%>
+        <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %>
+    <% end %>
 </ul>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 0c33bedd3..030a0cdcd 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -2,33 +2,39 @@
 <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
 <li id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
 	<span class="portrait">
-		    <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
+        <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
 	</span>
 	<div class="message-body">
-		    <% id = 'project_respond_form_'+ reply.id.to_s %>
+		<% id = 'project_respond_form_'+ reply.id.to_s %>
 		<p>
-		    <span><%= link_to reply.user.name, user_path(reply.user) %>:&nbsp;</span>
-		    <span class="message-notes"> <%= reply.notes %></span>
+		    <span>
+              <%= link_to reply.user.name, user_path(reply.user) %>
+              :&nbsp;
+            </span>
+		    <span class="message-notes">
+              <%= reply.notes %>
+            </span>
 	    </p>
 	    <p>
-	    	<span class="time"><%= format_time reply.created_on %></span>
-	    	<span style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
-	    	<% if reply_allow %>
-					 <%= link_to l(:label_projects_feedback_respond),'',
-	                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{m_reply_id.user.name}: '); return false;"}
-	                 %>
-	      <% end %>
-	      <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %>
-						 <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
-						 :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
-					 <% end %>
-	    	</span>
+            <span class="time">
+              <%= format_time reply.created_on %>
+            </span>
+            <span style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
+                <% if reply_allow %>
+                         <%= link_to l(:label_projects_feedback_respond),'',
+                            {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{m_reply_id.user.name}: '); return false;"} %>
+                <% end %>
+                <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %>
+                  <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
+                             :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
+                <% end %>
+            </span>
 	    </p>
 	</div>
 	<div id='<%=id%>' class="respond-form">
-		    	<% if reply_allow %>
+        <% if reply_allow %>
             <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id} %>
-          <% end %>
+        <% end %>
   </div>
   <div style="clear: both;"></div>
 </li>
\ No newline at end of file
diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index 64b83d777..5671bcfa5 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -1,5 +1,5 @@
 
-<%= form_tag({:controller => 'words', :action => 'create_reply'}, :remote => true) do %>
+<%= form_tag(words_create_reply_path, :remote => true) do %>
     <%= text_area_tag 'user_notes', "", :class => 'noline',
                                         :style => "resize: none;", :rows => 4,
                                         :placeholder => l(:label_projects_feedback_respond_content),
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index 6af90ef02..b24f46641 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -5,15 +5,12 @@
 		) %>').hide();
 	$('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append);
 	pre_append.fadeIn(600);
-
-var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
-textarea.val('');
-$('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
-
-var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
-textarea1.val('');
-$('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
-
+    var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
+    textarea.val('');
+    $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
+    var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
+    textarea1.val('');
+    $('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
 	setMaxLengthItem(pre_append.find('textarea')[0]);
 <% else %>
 	alert("<%= l(:label_feedback_fail) %>");