From d23b196eaae8cbe3f5bc91353f8061bcbcfd9c19 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 3 Jan 2014 22:18:22 +0800
Subject: [PATCH] zz

---
 app/views/bids/show.html.erb | 42 +++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 78ef3a56..aec3bb7e 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -2,40 +2,38 @@
 	<span class="portrait"><%=  image_tag(url_to_avatar(@bid.author), :class => "avatar")%></span>
 	<span class="body">
 		<h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %></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>
-			</p>
+		<% 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>
+		</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 %>
-			<p class="bid_description">
+		<div class="bid_description">
 				<%= @bid.description %>
-			</p>
-		<% if @bid.attachments.any?%>
+			<% if @bid.attachments.any?%>
 			<% options = {:author => true} %>
-			<%= render :partial => 'attachments/links',
-	        :locals => {:attachments => @bid.attachments, :options => options} %>
+			<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
 		<% end %>
-		    <span id="praise_tread" style="float: right"> 
-				<%= render :partial => "/praise_tread/praise_tread",
-				:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
-			</span>	
-    </span>
-    <div style="clear: both;"></div>
+		</div>
+		<span id="praise_tread" style="float: right"> 
+			<%= render :partial => "/praise_tread/praise_tread",
+			:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
+		</span>	
+	</span>
 </div>
+<div style="clear: both;"></div>
 
 <div id="history">
-<%= render :partial => 'history', :locals => { :bid => @bid, :journals => @jour, :state => false} %>
+	<%= render :partial => 'history', :locals => { :bid => @bid, :journals => @jour, :state => false} %>
 </div>
 
 <div class="pagination" style="float:left;">
 	<ul>
 		<%= pagination_links_full @feedback_pages %>
-	<ul>
-</div>
+		<ul>
+		</div>