From d92755f8051793193640a213097424472e877cb8 Mon Sep 17 00:00:00 2001
From: baiyu <316257774@qq.com>
Date: Wed, 21 Aug 2013 09:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_show.html.erb  | 28 ++++++++++++++--------------
 public/javascripts/application.js  |  2 +-
 public/stylesheets/application.css |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb
index d9995b69a..6292e35d1 100644
--- a/app/views/bids/_bid_show.html.erb
+++ b/app/views/bids/_bid_show.html.erb
@@ -1,6 +1,6 @@
 <!-- fq -->
 
-<!-- <% bids.each do |bid|%>
+<% bids.each do |bid|%>
 
 <table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
 <tr>
@@ -13,17 +13,17 @@
 <tr>
 <td width="500">
 <table border="0">
-<tr>
+<tr><td>
 <% if bid.reward_type.nil? or bid.reward_type == 1%>
-<td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td>
-<% elsif bid.reward_type == 2%>
-<td style="color: #15bccf;"><strong><%= l(:label_reward) %><%= bid.budget%></strong></td>
-<% else %>
-<td style="color: rgb(60, 180, 30);"><strong><%= l(:label_grade) %><%= bid.budget%></strong></td>
-<% end %>
-<td class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></td>
-<td class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></td>
-<td class="font_lighter">(<%= link_to bid.watcher_users.count, respond_path(bid)%>)<%= l(:label_followers) %></td>
+				<strong>奖励方式：<span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑">奖金&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong>
+				<% elsif bid.reward_type == 2%>
+				<strong>奖励方式：<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
+				<% else %>
+				<strong>奖励方式：<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= bid.budget%>分</span></strong>
+				<% end %>
+<span class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></span>
+<span class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></span>
+<span class="font_lighter">(<%= link_to bid.watcher_users.count, respond_path(bid)%>)<%= l(:label_followers) %></span></td>
 </tr>
 </table></td>
 <td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
@@ -46,10 +46,10 @@
 <ul>
 <%= pagination_links_full bid_pages %>
 <ul>
-</div> -->
+</div> 
 
 <!--new-->
-<% bids.each do |bid|%>
+<!-- <% bids.each do |bid|%>
 <table width="98%" border="0" style="padding-left: 20px; padding-top: 10px;">
 	<tr>
 		<td valign="top" width="50px"><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
@@ -98,4 +98,4 @@
 	<ul>
 		<%= pagination_links_full bid_pages %>
 		<ul>
-			</div>
+			</div> -->
\ No newline at end of file
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index b726cce3a..e843b3ba5 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -143,7 +143,7 @@ function buildFilterRow(field, operator, values) {
   case "list_subprojects":
     tr.find('td.values').append(
       '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
-      ' <span class="toggle-multiselect">&nbsp;</span></span>'
+      ' <span class="toggle-multiselect"><a>复选/multi-select</a></span></span>'
     );
     select = tr.find('td.values select');
     if (values.length > 1) { select.attr('multiple', true); }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7295037bf..1ce530e6d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1043,7 +1043,7 @@ fieldset#filters td.values select {min-width:130px;}
 fieldset#filters td.values input {height:1em;}
 fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
 
-.toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
+.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png)*/ no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
 .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}