From 8b1264c99eb65f02487ecde973931cd41b1a6cf4 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Thu, 2 Jan 2014 16:07:59 +0800
Subject: [PATCH] replace table with div + css ---- bids/show

---
 app/views/bids/show.html.erb                  | 70 +++++++------------
 .../stylesheets/application.css               | 12 ++++
 2 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 22cc1dcd..78ef3a56 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -1,49 +1,34 @@
-<!-- fq -->
-<table width="660px" border="0" align="center">
-  <tr>
-    <td width="50" valign="top"><%=  image_tag(url_to_avatar(@bid.author), :class => "avatar")%></td>
-    <td><table width="100%" border="0">
-      <tr>
-        <td><h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %></h3></td>    
-      </tr>
-      <tr>
+<div style="margin-left: 20px;">
+	<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%>
-      	
-				<td><strong><%= l(:label_bids_reward_method) %>
-					<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">
-						<%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= @bid.budget%>
-					</span></strong></td>
+			<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%>
-				
-				<td><strong><%= l(:label_bids_reward_method) %>
-					<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑">
-						<%= @bid.budget%>
-						</span></strong></td>
-				<% else %>
-				<!-- <td><strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑">
-					<%= l(:label_bids_credit) %>&nbsp;<%= @bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong></td> -->
-				<% end %>
-      </tr>
-      <!--modified by baiyu-->
-      <tr><td style="font-size: 13px; color: rgb(0,0,0);"><%= @bid.description %>
-		<% if @bid.attachments.any?%>
-		<% options = {:author => true} %>
-		<%= render :partial => 'attachments/links',
-        :locals => {:attachments => @bid.attachments, :options => options} %>
+			<p>		
+				<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @bid.budget%></span></strong>
+			</p>
+		<% else %>
 		<% end %>
-	</td></tr>
-    </table></td>
-    <td>
-    <!-- 在这里添加赞和踩-->
-	      <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>	
-    </td>
-  </tr>
-</table>
+			<p class="bid_description">
+				<%= @bid.description %>
+			</p>
+		<% if @bid.attachments.any?%>
+			<% options = {:author => true} %>
+			<%= 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>
 
-<!-- 这里是用户的反馈输入框  -->
 <div id="history">
 <%= render :partial => 'history', :locals => { :bid => @bid, :journals => @jour, :state => false} %>
 </div>
@@ -54,4 +39,3 @@
 	<ul>
 </div>
 
-<!-- end -->
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index d56dbff8..2e48b814 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -2155,4 +2155,16 @@ ul.messages-for-user-reply li {
 
 .toomuch {
 	color: red;
+}
+
+.bonus {
+	color: #ed8924;
+	font-size: 13px; 
+}
+
+.bid_description {
+	width: 90%; 
+	float: left; 
+	margin: 0; 
+	padding: 0; 
 }
\ No newline at end of file