From 08115c9de4ad2c3bbb79f7ba5a555404b2ab1000 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 14 Aug 2014 14:11:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=96=87=E6=9C=AC=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=8C=89=E9=92=AE=E6=8F=8F=E8=BF=B0=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 20 ++++++++++----------
 app/views/bids/_history.html.erb  |  2 +-
 app/views/bids/_new.html.erb      |  2 +-
 app/views/bids/show.html.erb      |  4 ++--
 app/views/issues/_list.html.erb   |  2 +-
 config/locales/zh.yml             |  1 +
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6ade665f9..4d8b53e3c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -679,15 +679,15 @@ module ApplicationHelper
   def textilizable(*args)
     options = args.last.is_a?(Hash) ? args.pop : {}
     case args.size
-    when 1
-      obj = options[:object]
-      text = args.shift
-    when 2
-      obj = args.shift
-      attr = args.shift
-      text = obj.send(attr).html_safe.to_s
-    else
-      raise ArgumentError, 'invalid arguments to textilizable'
+      when 1
+        obj = options[:object]
+        text = args.shift
+      when 2
+        obj = args.shift
+        attr = args.shift
+        text = obj.send(attr).to_s
+      else
+        raise ArgumentError, 'invalid arguments to textilizable'
     end
     return '' if text.blank?
     project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
@@ -727,7 +727,7 @@ module ApplicationHelper
       when 2
         obj = args.shift
         attr = args.shift
-        text = obj.send(attr).html_safe.to_s
+        text = obj.send(attr).to_s
       else
         raise ArgumentError, 'invalid arguments to textilizable'
     end
diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb
index b0bc22479..0961e3cf8 100644
--- a/app/views/bids/_history.html.erb
+++ b/app/views/bids/_history.html.erb
@@ -5,7 +5,7 @@
 <div id='leave-message'>
 	<%= render :partial => 'new', :locals => {:bid => @bid, :sta => @state} %>
 </div>
-<% label = '';
+<% label = ''
   case @bid.reward_type
     when 1
       label = l(:label_respond_requirement)
diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb
index cf9f8df30..7dd7492c0 100644
--- a/app/views/bids/_new.html.erb
+++ b/app/views/bids/_new.html.erb
@@ -41,7 +41,7 @@
 <table border="0" width="525px" align="center">
 	<tr>
 		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-		<%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+		<%= submit_tag l(:button_clear_meassge), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 	</tr>
 </table>
 <!-- end -->
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 96ed4ea75..3107d8bd6 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -4,11 +4,11 @@
 	<span class="body">
 		<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>  
+		<p>
 			<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>		
+		<p>
 			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @bid.budget%></span></strong>
 		</p>
 		<% else %>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 0a8402609..4c2a63844 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -39,7 +39,7 @@
 				<ul class="list-group-item-meta">
 					<div class="issue-list-description">
                       <div class="wiki">
-                        <p style="word-break:break-all;width: 100%;"><%= textAreailizable issue, :description %></p>
+                        <%= textilizable issue, :description %>
                       </div>
 						<!-- <#%= l(:field_description)%>:&nbsp;<#%= issue.short_description %> -->
 					</div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8800ec253..9fce654b4 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1415,6 +1415,7 @@ zh:
  
   #fq
   button_leave_meassge: 留言
+  button_clear_meassge: 清除留言
   label_leave_message_to: 给用户 %{name}留言
   label_leave_message: 留言内容
   label_message: 留言板