diff --git a/app/models/project.rb b/app/models/project.rb
index eec60cdde..c64dd5060 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -67,9 +67,6 @@ class Project < ActiveRecord::Base
   #ADDED BY NIE
   has_many :project_infos, :dependent => :destroy 
   has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
-  has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
-  has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
-  has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
   has_many :user_grades, :class_name => "UserGrade", :dependent => :destroy
   #end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 4196b3030..40e142e92 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -152,6 +152,15 @@ class User < Principal
   }
   scope :sorted, lambda { order(*User.fields_for_order_statement)}
   
+  scope :like, lambda {|arg|
+    if arg.blank?
+      where(nil)
+    else
+      pattern = "%#{arg.to_s.strip.downcase}%"
+      where(" LOWER(concat(lastname, firstname)) LIKE :p ", :p => pattern)
+    end
+  }
+  
   
    ###添加留言   fq
   def add_jour(user, notes, reference_user_id = 0)
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index cc4672ea6..0a40e3d0e 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -5,9 +5,6 @@
 	<table width="100%" valign="center">
 		<tr>
 			<td width="16%"><span style="margin-left:0px"><%= l(:label_task_plural)%></span></td>
-			
-           
-           
             <td align="right">
 			<div class="project-search">
 				<%= text_field_tag 'student_id', params[:student_id], :size => 30 %>
diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb
index 5250a361d..cf9f8df30 100644
--- a/app/views/bids/_new.html.erb
+++ b/app/views/bids/_new.html.erb
@@ -1,41 +1,4 @@
 <!-- fq -->
-<style>
-	input[type="submit"].bid_btn {
-		vertical-align: middle;
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("../images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		/*margin-right: -4px;*/
-	}
-	input[type="button"].bid_btn {
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("../images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		margin-right: -2px;
-	}
-	textarea:focus {
-		border: #d5dee9 1px solid;
-	}
-</style>
-
 <script type="text/javascript" language="javascript">
 	function clearInfo(id, content) {
 		var text = $('#' + id);
@@ -73,12 +36,16 @@
 	</tr>
 </table>
 <%= f.text_field :reference_user_id, :style=>"display:none"%>
+
+<!-- modified by bai -->
 <table border="0" width="525px" align="center">
 	<tr>
-		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" %>
-		<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "btn_bid"  %> </td>
+		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
+		<%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 	</tr>
 </table>
+<!-- end -->
+
 <% else %>
 <div style="font-size: 14px;margin:10px;">
 	<%= l(:label_user_login_tips) %>
diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb
index 34f3e71eb..501cefbb5 100644
--- a/app/views/bids/contest.html.erb
+++ b/app/views/bids/contest.html.erb
@@ -1,37 +1,37 @@
 <!-- huang-->
-<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
-<div class="project-search-block">
-	<table width="100%" valign="center">
+<!-- modified by huang -->
+<div class="top-content">
+	<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
+	<table width="940px">
 		<tr>
-			<td width="16%"><span style="margin-left:0px">				
-				<%= l(:label_contest_list) %>
-				</span></td>
-			<td valign="center"><% if User.current.logged? %>
-	
-		<!-- <div class='icon icon-add'> -->
-			<% if User.current.user_extensions.identity == 0 %>					
+			<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_contest_innovate) %></td>
+			<td class="location-list"><strong>当前位置 : </strong></td>
+			<td rowspan="2">
+			<% if User.current.logged? %>
+			<% unless User.current.user_extensions.identity == 1 %>					
 			<%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %>		
-			<% end %>				
-			<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
-		<!-- </div> -->
-	<% end %></td>
-	
-	<td align="right">
-	<div class="project-search">
-		<%= text_field_tag 'name', params[:name], :size => 30 %>
-		<%= hidden_field_tag 'project_type', params[:project_type] %>
-		<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+			<% end %>		
+			<% end %>	
+			</td>
+			<td rowspan="2" >	
+			<div class="project-search" style="float: right">
+			<div class="project-search">
+			<%= text_field_tag 'name', params[:name], :size => 30 %>
+			<%= hidden_field_tag 'project_type', params[:project_type] %>
+			<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 		
-	</div></td>
-	</tr></table>
-</div>
-<%end%>
-
-<% if User.current.logged? %>
-<div id="put-bid-form" style="display: none">
-	<%= render :partial => 'new_bid' %>
-</div>
-<% end %>
+	</div>
+			</div>			
+			</td>
+		</tr>
+		<tr>
+			<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/contest", :controller => 'bids', :action => 'index' %> </a></td>
+	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %></td>
+		</tr>
+	</table>
+	<% end %>
+</div>						
+<!-- end -->
 
 <%= sort_contest(@s_state)%>
 
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb
index 52ee990ca..5b7897c3f 100644
--- a/app/views/bids/index.html.erb
+++ b/app/views/bids/index.html.erb
@@ -1,61 +1,53 @@
 <!-- fq -->
-<%= form_tag(calls_path, :method => :get) do %>
-<div class="project-search-block">
-	<table width="100%" valign="center">
+<!-- modified by huang -->
+<div class="top-content">
+	<%= form_tag(calls_path, :method => :get) do %>
+	<table width="940px">
 		<tr>
-			<td width="16%"><span style="margin-left:0px">
-				<% if @project_type == '1' %>
-				<%= l(:label_bids_task_list) %>
-				<% else %>
-				<%= l(:label_call_list)%>
-				<% end %></span></td>
-			<td valign="center"><% if User.current.logged? %>
-	
-		<!-- <div class='icon icon-add'> -->
-			<% unless @project_type == '1' %>
+			<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_requirement_enterprise ) %></td>
+			<td class="location-list"><strong>当前位置 : </strong></td>
+			<td rowspan="2">
+			<% if User.current.logged? %>
 			<%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %>
-			<% end %>
-			<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
-		<!-- </div> -->
-	<% end %></td>
-	
-	<td align="right">
-	<div class="project-search">
-		<%= text_field_tag 'name', params[:name], :size => 30 %>
+			<% end %>	
+			</td>
+			<td rowspan="2" >	
+			<div class="project-search" style="float: right">
+			<%= text_field_tag 'name', params[:name], :size => 28 %>
+			<%= hidden_field_tag 'reward_type', params[:reward_type] %>
+			<%= hidden_field_tag 'project_type', params[:project_type] %>
+			<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+			</div>			
+			</td>
+		</tr>
+		<tr>
+			<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/calls", :controller => 'bids', :action => 'index' %> </a></td>
+	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_requirement_enterprise), :controller => 'bids', :action => 'index' %></td>
+		</tr>
+	</table>
+	<% end %>
+</div>						
+<!-- end -->
+
 		
-		<%= hidden_field_tag 'reward_type', params[:reward_type] %>
-		<%= hidden_field_tag 'project_type', params[:project_type] %>
-		
-		<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-		
-	</div></td>
-	</tr></table>
-</div>
-<%end%>
 
-<% if User.current.logged? %>
-<div id="put-bid-form" style="display: none">
-	<%= render :partial => 'new_bid' %>
-</div>
-<% end %>
+			<%= sort_bid(@s_state, @project_type)%>
 
-<%= sort_bid(@s_state, @project_type)%>
+			<!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 15px" >
+			<ul style="margin-right:0px">
+			<li>
+			<%= link_to l(:label_sort_by_time), calls_path(:bid_sort_type => '0') %></li>
 
-<!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 15px" >
-<ul style="margin-right:0px">
-	<li>
-		<%= link_to l(:label_sort_by_time), calls_path(:bid_sort_type => '0') %>
-	</li>
-	<li>
-		<%= link_to l(:label_sort_by_active), calls_path(:bid_sort_type => '1') %>
-	</li>
-	<!-- <li>
-		<%= link_to l(:label_sort_by_influence), calls_path(:bid_sort_type => '2') %>
-	</li> -->
-<!-- </ul>
-</div>  -->
+			<li>
+			<%= link_to l(:label_sort_by_active), calls_path(:bid_sort_type => '1') %>
+			</li>
+			<!-- <li>
+			<%= link_to l(:label_sort_by_influence), calls_path(:bid_sort_type => '2') %>
+			</li> -->
+			<!-- </ul>
+			</div>  -->
 
-<div id="bid-show">
-	<%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
-</div>
+			<div id="bid-show">
+			<%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
+			</div>
 
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 1b1f22eb2..2cd973009 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -28,7 +28,7 @@
 					<%=render :partial => 'layouts/base_header'%>
 					<% end %>
 					
-					<div id="main" class="">
+					<div id="main">
 			<!-- added by bai	 -->
 						<div class="top-content">
 									<table>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 679910e14..64afdc8b2 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -46,7 +46,7 @@
 								</tr>
 							</table>							
 						</div>
-						<!--end-->
+						<!-- end -->
 						<!--project page-->
 						<div id="sidebar">
 							<div class="spaceleft">
diff --git a/app/views/projects/_course.html.erb b/app/views/projects/_course.html.erb
index c3a1b9d78..614710556 100644
--- a/app/views/projects/_course.html.erb
+++ b/app/views/projects/_course.html.erb
@@ -14,13 +14,13 @@
 	</p>
 	<p >
 		<%= content_tag('span', "#{l(:label_institution_name)}:", :class => "course-font")%>
+		<% @admin = @project.project_infos%>
 		<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
 		    <%= @admin.first.user.user_extensions.occupation %> 
 		<% end %>
 	</p>
 	<p >
 		<%= content_tag('div', "#{l(:field_teacher_name)}:", :class => "info course-font teacher") %>
-		<% @admin = @project.project_infos%>
 		<% if @admin.size > 0 %>
 		   <%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe)  %>
 		<% end %>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index 118e714b0..416ee8978 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -12,7 +12,7 @@
 		</table>
 		<table border="0" width="525px" align="center">
 			<tr>
-				<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "enterprise" %></td>
+				<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %></td>
 			</tr>
 		</table>
 		<% end %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index f487457b6..697f21e09 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -2,24 +2,34 @@
 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
-<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
-<div class="project-search-block">
-	<table width="100%" valign="center">
+<!-- modified by huang -->
+<div class="top-content">
+	<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
+	<table width="940px">
 		<tr>
-			<td width="16%"><span style="margin-left:0px"><%= l(:label_project_plural)%></span></td>
-			
-            <td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>          
-           
-            <td align="right">
-			<div class="project-search">
-				<%= text_field_tag 'name', params[:name], :size => 30 %>
-				<%= hidden_field_tag 'project_type', params[:project_type] %>
-				<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
-			</div></td>
+			<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_project_deposit) %></td>
+			<td class="location-list"><strong>当前位置 : </strong></td>
+			<td rowspan="2">
+			<% if User.current.logged? %>
+			<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+			<% end %>	
+			</td>
+			<td rowspan="2" >	
+			<div class="project-search" style="float: right">
+			<%= text_field_tag 'name', params[:name], :size => 30 %>
+			<%= hidden_field_tag 'project_type', params[:project_type] %>
+			<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+			</div>			
+			</td>
+		</tr>
+		<tr>
+			<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> </a></td>
+	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_project_deposit), :controller => 'projects', :action => 'index', :project_type => 0 %></td>
 		</tr>
 	</table>
-</div>
-<% end %>
+	<% end %>
+</div>						
+<!-- end -->
 
 <%= sort_project(@s_type, @project_type) %>
 
diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb
new file mode 100644
index 000000000..6fd22e422
--- /dev/null
+++ b/app/views/users/_user_show.html.erb
@@ -0,0 +1,49 @@
+<div class="autoscroll">
+	<% for user in @users -%>
+	<% unless user.id == 1%>
+	<div class="well">
+
+		<%= content_tag "p", "#{format_date(user.created_on)} #{l(:label_member_since)}", :class => "float_right member_since" %>
+		<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
+
+		<div>
+			<%= image_tag(url_to_avatar(user), :class => 'avatar')  %>
+			<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
+			<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
+				<%= l(:label_user_grade) %>: <span style="color:#ec6300"><%= user.user_status.grade %></span>
+			</div>
+
+		</div>
+
+		<div style="margin-top: 20px;margin-left:66px">
+			<%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
+			<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
+
+		</div>
+		<div class="user-bottom">
+			<% unless user.memberships.empty? %>
+			<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
+			<% memberships = user.memberships.all(:conditions => cond) %>
+			<%= l(:label_x_contribute_to, :count => memberships.count) %>
+			<% for member in memberships %>
+			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+			<% end %>
+			<% end %>
+
+			<p>
+				<% unless user.memberships.empty? %>
+				<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
+				<% memberships = user.memberships.all(:conditions => cond) %>
+				<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
+				<% for member in memberships %>
+				<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+				<% end %>
+				<% end %>
+			</p>
+
+			<%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
+		</div>
+	</div>
+	<% end -%>
+	<% end -%>
+</div>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 8488881e8..832f1eea8 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -5,7 +5,7 @@
 
 <h3><%= l(:label_user_plural)%></h3>
 
-<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
+	<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
 <fieldset>
 	<legend>
 		<%= l(:label_filter_plural) %>
@@ -22,7 +22,7 @@
 	<%= text_field_tag 'name', params[:name], :size => 30 %>
 	<%= submit_tag l(:label_search), :class => "small", :name => nil %><!--Modified by young-->
 </fieldset>
-<% end %>
+	<% end %>
 &nbsp;
 
 <div class="autoscroll">
@@ -33,7 +33,7 @@
 				<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
 				<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
 				<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
-	
+
 				<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
 				<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
 				<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
@@ -66,71 +66,56 @@
 <% html_title(l(:label_user_plural)) -%>
 
 <% else  %>
-
-<div class="project-search-block">
-<span><%= l(:label_user_plural)%></span>
-
-<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
-
-	<div class="project-search">
-	<%= text_field_tag 'name', params[:name], :size => 30 %>
-	
-	<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %><!--Modified by young-->
-	
-
-<% end %>
-</div>
-</div>
-
+<!-- modified by huang -->
+<div class="top-content">
+	<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
+	<table width="940px">
+		<tr>
+			<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_software_user ) %></td>
+			<td class="location-list"><strong>当前位置 : </strong></td>
+			<td rowspan="2">				
+			</td>
+			<td rowspan="2" >	
+			<div class="project-search" style="float: right">
+			
+			<div class="project-search">
+			<%= text_field_tag 'name', params[:name], :size => 30 %>	
+			<%= submit_tag l(:label_search), :class => "small", :name => nil %>
+			
+			</div>			
+			</td>
+		</tr>
+		<tr>
+			<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/users", :controller => 'users', :action => 'index' %> </a></td>
+	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_software_user), :controller => 'users', :action => 'index' %></td>
+		</tr>
+	</table>
+	<% end %>
+</div>						
+<!-- end -->
 
 <%= sort_user(@s_type, @project_type)%>
 
+<!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 0px">
+<ul style="margin-right:0px">
+<li>
+<%= link_to l(:label_sort_by_time), users_path(:user_sort_type => '0') %>
+</li>
+<li>
+<%= link_to l(:label_sort_by_active), users_path(:user_sort_type => '1') %>
+</li>
+<li>
+<%= link_to l(:label_sort_by_influence), users_path(:user_sort_type => '2') %>
+</li>
+</ul>
+</div> -->
 
+<%= render :partial => 'user_show' %>
 
-
-
-<div class="autoscroll">
-	<% for user in @users -%>
-	<% unless user.id == 1%>
-	<div class="well">
-		
-		<%= content_tag "p", "#{format_date(user.created_on)} #{l(:label_member_since)}", :class => "float_right member_since" %>
-		<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
-		
-	<div>
-		<%= image_tag(url_to_avatar(user), :class => 'avatar')  %>
-		<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-		<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
-		<%= l(:label_user_grade) %>: <span style="color:#ec6300"><%= user.user_status.grade %></span>
-	</div>
-	 
-
-	</div>
-	
-	  <div style="margin-top: 20px;margin-left:66px">
-		<%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
-		<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
-		
-	  </div>
-
-	 
-		<div class="user-bottom">
-			<% unless user.memberships.empty? %>
-			<%= l(:label_x_contribute_to, :count => user.memberships.count) %>
-			<% for member in user.memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<% end %>
-			<%= user.changesets.count == 0 ? '' : ",#{l(:label_x_total_commit, :count => user.changesets.count)}" %> 
-		</div>
-	</div>
-	<% end -%>
-	<% end -%>
-</div>
 <div class="pagination">
 	<ul>
 		<%= pagination_links_full @user_pages, @user_count %>
-		</ul>
+	</ul>
 </div>
 <% html_title(l(:label_user_plural)) -%>
 <% end -%>
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index 0349ebcab..5596acd96 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -20,7 +20,7 @@
 
 	<label for='name'><%= l(:label_user) %>:</label>
 	<%= text_field_tag 'name', params[:name], :size => 30 %>
-	<%= submit_tag l(:label_search), :class => "small", :name => nil %><!--Modified by young-->
+	<%= submit_tag l(:label_search), :class => "small", :name => nil %>
 </fieldset>
 <% end %>
 &nbsp;
@@ -66,75 +66,54 @@
 <% html_title(l(:label_user_plural)) -%>
 
 <% else  %>
-<!-- <div class="contextual">
-	<%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
-</div> -->
+
 <div class="project-search-block">
 <span><%= l(:label_user_plural)%></span>
 
 <%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
-<!-- <fieldset>
-	<legend>
-		<%= l(:label_filter_plural) %>
-	</legend> -->
 	<div class="project-search">
 	<%= text_field_tag 'name', params[:name], :size => 30 %>
-	<%= submit_tag l(:label_search), :class => "small", :name => nil %><!--Modified by young-->
-<!-- </fieldset> -->
+	<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 <% end %>
 </div>
 </div>
 
-
-<!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 0px">
-<ul style="margin-right:0px">
-	<li>
-		<%= link_to l(:label_sort_by_time), users_path(:user_sort_type => '0') %>
-	</li>
-	<li>
-		<%= link_to l(:label_sort_by_active), users_path(:user_sort_type => '1') %>
-	</li>
-	<li>
-		<%= link_to l(:label_sort_by_influence), users_path(:user_sort_type => '2') %>
-	</li>
-</ul>
-</div> -->
-
-
 <div class="autoscroll">
-	<% for user in @users -%>
-	<% unless user.id == 1%>
-	<div class="well">
-		
-		<%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
-		<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
-		<!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user),  :class => "avatar") :  (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> -->
-	<div>
-		<%= image_tag(url_to_avatar(user), :class => 'avatar')  %>
-		<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-	</div>
-	  <div style="margin-top: 20px;margin-left:66px">
-		<%= l(:label_has_fans,:count=>user.watcher_users.count)%>
-		<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
-	  </div>
+	<% if @users.size > 0 %>
+	    <% @users.each do |user| -%>
+	        <% unless user.id == 1%>
+	    <div class="well">
+		    <%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
+		    <%= image_tag "/images/time_member.png", :class => "img_member_time"%>
+	    <div>
+		    <%= image_tag(url_to_avatar(user), :class => 'avatar')  %>
+		    <%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
+	    </div>
+	    <div style="margin-top: 20px;margin-left:66px">
+		    <%= l(:label_has_fans,:count=>user.watcher_users.count)%>
+		    <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
+	    </div>
 	 
 		<div class="user-bottom">
 			<% unless user.memberships.empty? %>
-			<%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
+			    <%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
 			<% for member in user.memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+			    <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 			<% end %>
 			<% end %>
 			<%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %> 
 		</div>
 	</div>
-	<% end -%>
-	<% end -%>
+	       <% end -%>
+	   <% end -%>
+  <% else %>
+    <div style="width: 400px; height: 60px; margin-left: 22px;color:#6c5524; background-color: #FFD9BF; vertical-align: center;">如果没有搜到希望的结果，请清除用户姓和名之间的空格，或者重新输入搜索关键词！</div>
+  <% end %>
 </div>
 <div class="pagination">
 	<ul>
 		<%= pagination_links_full @user_pages, @user_count %>
-		<ul>
+	<ul>
 </div>
 <% html_title(l(:label_user_plural)) -%>
 <% end -%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bed8f4ecf..fa1b47d57 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1358,7 +1358,7 @@ zh:
   label_RMB_sign: ￥
   label_investment_budget: 投资预算：
   label_investment_time_limit: 投资时限：
-  label_my_respond: 我要反馈：
+  label_my_respond: 问题交流请踩这里^-^
   label_my_question: 请在此处留下您的意见或者问题~  # modified by bai
   label_respond_requirement: 对需求进行了反馈
   label_question_requirement: 对作业提出了问题！
@@ -1571,7 +1571,12 @@ zh:
   label_endup_time: 结课时间
   label_class_period: 整体课时
   label_class_hour: 学时
-  
+ 
+  label_course_contribute_to: 参与了 %{project_count} 个项目：
+  label_x_course_contribute_to:
+    zero: "参与了 %{count} 个课程："
+    one: "参与了 %{count} 个课程："
+    other: "参与了 %{count} 个课程："
   
   #end
   
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 30703d294..c90e8bed4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,12 +11,17 @@ h4 {border-bottom: 1px dotted #bbb;}
 
 /*new by huang*/
 /**/
+.location-list{
+	width: 180px;
+	color: #15bccf;
+}
+	
 .top-content{
 	background-color: #f7f7f7;
-	height: 50px;
+	height: 52px;
 	width: 940px;
 	line-height: 1.2em;
-	padding-top: 5px;
+	padding-top: 6px;
 	margin-bottom: 10px;
 }
 
@@ -1147,7 +1152,41 @@ margin-left:-10px;
 /*end*/
 .splitcontentright{float:right; width:49%;}
 form {display: inline;}
-input, select {font-family: 微软雅黑;vertical-align: middle; margin-top: 1px; margin-bottom: 1px;} /*modify by men*/
+
+/*added by bai*/
+	input[type="submit"].bid_btn {
+		padding-bottom: 5px;
+	width: 55px;
+	height: 25px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: #fff;
+    padding: 0px;
+    background: #15bccf; 
+    border-radius: 4px;
+    border: 1px solid #15bccf;
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
+}
+
+input[type="button"].bid_btn {
+		padding-bottom: 5px;
+	width: 55px;
+	height: 25px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: #fff;
+    padding: 0px;
+    background: #15bccf; 
+    border-radius: 4px;
+    border: 1px solid #15bccf;
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
+	}
+/*end	*/
+	
 fieldset {border: 1px solid #e4e4e4; margin:0;}
 legend {color: #484848;}
 hr { width: 100%; height: 1px; background: #ccc; border: 0; color:#000000;}
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 92338525f..b0339d866 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1862,24 +1862,24 @@ div.tableline{
 /* 统一按钮风格 
  * 
  * @2013-09-27
- * added by william */
+ /*added by bai*/
 input[type="submit"] {
-	width: auto;
+	padding-bottom: 5px;
+	width: 55px;
+	height: 25px;
     font-family: '微软雅黑',Arial,Helvetica,sans-serif;
     font-size: 12px;
-    color: rgb(5, 5, 5);
+    color: #fff;
     padding: 0px;
-    background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent;
+    background: #15bccf; 
     border-radius: 4px;
-    border: 1px solid rgb(148, 148, 148);
+    border: 1px solid #15bccf;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
     cursor: pointer;
 }
 
-
-
-
+/*end*/
 
 /*added by bai*/
 a.font-user-color{