jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace table with div + css ---- bids/show

This commit is contained in:
nieguanghui 2014-01-02 16:07:59 +08:00
parent 2c1e53bfec
commit 8b1264c99e
2 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/views/bids/show.html.erb
View File

@ -1,49 +1,34 @@
<!-- fq --> <div style="margin-left: 20px;">
<table width="660px" border="0" align="center"> <span class="portrait"><%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%></span>
<tr> <span class="body">
<td width="50" valign="top"><%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%></td> <h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %></h3>
<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>
<% if @bid.reward_type.nil? or @bid.reward_type == 1%> <% if @bid.reward_type.nil? or @bid.reward_type == 1%>
<p>
<td><strong><%= l(:label_bids_reward_method) %> <strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= l(:label_call_bonus) %>&nbsp;
<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"> <%= l(:label_RMB_sign) %><%= @bid.budget %></span></strong>
<%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= @bid.budget%> </p>
</span></strong></td>
<% elsif @bid.reward_type == 2%> <% elsif @bid.reward_type == 2%>
<p>
<td><strong><%= l(:label_bids_reward_method) %> <strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @bid.budget%></span></strong>
<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"> </p>
<%= @bid.budget%> <% else %>
</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} %>
<% end %> <% end %>
</td></tr> <p class="bid_description">
</table></td> <%= @bid.description %>
<td> </p>
<!-- 在这里添加赞和踩--> <% if @bid.attachments.any?%>
<span id="praise_tread" style="float: right"> <% options = {:author => true} %>
<%= render :partial => "/praise_tread/praise_tread", <%= render :partial => 'attachments/links',
:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%> :locals => {:attachments => @bid.attachments, :options => options} %>
</span> <% end %>
</td> <span id="praise_tread" style="float: right">
</tr> <%= render :partial => "/praise_tread/praise_tread",
</table> :locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
</span>
</span>
<div style="clear: both;"></div>
</div>
<!-- 这里是用户的反馈输入框 -->
<div id="history"> <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>
@ -54,4 +39,3 @@
<ul> <ul>
</div> </div>
<!-- end -->

12
public/themes/redpenny-master/stylesheets/application.css
View File

@ -2155,4 +2155,16 @@ ul.messages-for-user-reply li {
.toomuch { .toomuch {
color: red; color: red;
}
.bonus {
color: #ed8924;
font-size: 13px;
}
.bid_description {
width: 90%;
float: left;
margin: 0;
padding: 0;
} }