From 2fbf025c2f42d8fd7c4922533adcc5f342e54e03 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Mon, 14 Oct 2013 10:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9C=80=E6=B1=82=E7=9A=84?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=EF=BC=8C=E9=9A=90=E8=97=8F=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=9A=84=E9=A6=96=E9=80=89=E9=A1=B9=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                     | 12 ++++++++++++
 app/views/bids/_list_projects.html.erb |  2 +-
 app/views/bids/_project_list.html.erb  |  9 +++++----
 app/views/my/account.html.erb          |  6 +++---
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 45c7ae645..1bce98052 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -161,6 +161,18 @@ class User < Principal
       false
     end
   end
+  
+  def show_name
+    unless self.user_extensions.nil?
+      if self.user_extensions.identity == 2
+        firstname
+      else
+        lastname+firstname
+      end
+    else
+      lastname+firstname
+    end
+  end
   ## end
   
   def count_new_jour
diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb
index 9a9f2ec70..38e2ece34 100644
--- a/app/views/bids/_list_projects.html.erb
+++ b/app/views/bids/_list_projects.html.erb
@@ -19,7 +19,7 @@
 						
 						<!-- 如果需求到期     并且是该需求的管理员  -->
 						
-						<td style="color: red;" align="right" valign="0.1em" width="35%">
+						<td style="color: red;" align="right" valign="0.1em" width="15%">
 							<strong><span id="reward_result_<%=b_project.id%>">
 						
 							<% if get_prize(b_project).nil? or get_prize(b_project) == "" %>
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb
index 293392b17..50f34d3d8 100644
--- a/app/views/bids/_project_list.html.erb
+++ b/app/views/bids/_project_list.html.erb
@@ -14,7 +14,7 @@
 	<% end %>
 </table>
 
-<% @bidding_project.each do |b_project|%>
+<!-- <% @bidding_project.each do |b_project|%>
 <table width="90%" border="0" align='center'>
 	<tr>
 		<td>
@@ -55,7 +55,7 @@
 		</table></td>
 	</tr>
 </table>
-<% end %>
+<% end %> -->
 
 <% else %>
 <table width="1000px" border="0" style="padding-left: 15px">
@@ -68,7 +68,7 @@
 	<% end %>
 </table>
 
-<% @bidding_project.each do |b_project|%>
+<!-- <% @bidding_project.each do |b_project|%>
 <table width="90%" border="0" align='center'>
 	<tr>
 		<td>
@@ -106,5 +106,6 @@
 		</table></td>
 	</tr>
 </table>
+<% end %> -->
 <% end %>
-<% end %>
+<%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index aa0c2fa7a..0cceb69ac 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -483,13 +483,13 @@ $().ready(function(){
 	    </p></div>
 	</fieldset>
 
-	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
+	<!-- <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
 			<%= l(:label_preferences)%>
 		</legend>
-		<div style="padding-left: 26px;"> <!-- modified by ming -->
+		<div style="padding-left: 26px;"> 
 		<%= render :partial => 'users/preferences' %></div>
-	</fieldset>
+	</fieldset> -->
 	<!-- added by william -->
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;display: none">
 		<legend onclick="toggleFieldset(this);">