diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 89aa9f906..0aba4ed26 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -89,7 +89,9 @@ class MyController < ApplicationController
        se = @user.user_extensions
        se.occupation = params[:occupation]
        se.gender = params[:gender]
+       if params[:province] && params[:city]
        se.location = params[:province]+params[:city]
+       end
        se.save      
       end
      # end 
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 1f09ba6ab..ce666940e 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -1,4 +1,4 @@
-<!-- added by bai -->
+<!-- added by bai 增加地区-->
 <script type="text/javascript" language="javascript">
 	function showcity(province, cityField) {
 	switch (province) {
@@ -213,9 +213,22 @@
 
 <!-- added by bai  增加了身份、性别和地区-->
 
-<p><em class="info"><%= l(:label_identity) %><%= select_tag 'identity', "<option value = '0'>#{l(:label_teacher)}</option><option value = '1'>#{l(:label_student)}</option><option value = '2'>#{l(:label_other)}</option>".html_safe %></em></p>
-<p><em class="info"><%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></em></p>
-<p><%= l(:label_location) %><select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince">
+
+<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_identity) %><span class="required"> *</span></strong></td>
+	          <td class="info" style="width: 10px">
+	          	<%= select_tag 'identity', "<option value = '0'>#{l(:label_teacher)}</option>
+	          								<option value = '1'>#{l(:label_student)}</option>
+	          								<option value = '2'>#{l(:label_other)}</option>".html_safe %></td></tr></table></p>
+
+
+<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %></strong></td>
+	          <td class="info" style="width: 10px">
+	          	<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
+	          	                          <option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></td></tr></table></p>
+
+<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_location) %><span class="required"> *</span></strong></td>
+	          <td class="info" style="width: 80px">
+	<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince">
 	<option value="">--请选择省份--</option>
 	<option value="北京">北京</option> 
 	<option value="上海">上海</option> 
@@ -252,9 +265,14 @@
 	<option value="澳门">澳门特别行政区</option>
 	<option value="台湾">台湾</option> 
 	<option value="海外">海外</option>
-</select>
-<select name="city" id="userCity"></select></p>
+</select></td>
+<td class="info" style="width: 100px">
+<select name="city" id="userCity"></select></td></tr></table></p>
 <!-- end -->
+</div>
+
+<p><table><tr><td><%= submit_tag l(:button_submit) %></td></tr></table></p>
+<% end %>
 
 <% if Setting.openid? %>
   <p><%= f.text_field :identity_url  %></p>
@@ -267,5 +285,4 @@
 </div>
 
 
-<%= submit_tag l(:button_submit) %>
-<% end %>
+
diff --git a/app/views/git_usage/ch_usage.html.erb b/app/views/git_usage/ch_usage.html.erb
index f2937be17..5fca6b156 100644
--- a/app/views/git_usage/ch_usage.html.erb
+++ b/app/views/git_usage/ch_usage.html.erb
@@ -143,7 +143,7 @@ body table tr td span6 {
     <td><p >在桌面上点击鼠标右键，选择TortoiseGit的Settings进行设置</p></td>
   </tr>
   <tr>
-    <td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,<span5> 其中的name和email要和forge.trustie.net上的登陆名和密码保持一致</span5>
+    <td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,<span5> 其中的name和email要和forge.trustie.net上的登陆名和邮箱保持一致</span5>
     ，方便代码贡献统计    ）。 </td>
   </tr>
   <tr>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 043baec3e..55db4d9bb 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -58,7 +58,8 @@
 											
 											<strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users(@user.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist" %></strong>
 										
-										    <p><%= toggle_link l(:label_brief_introduction), 'introduction', {:focus => 'new_form_project_message'} %></p>
+										<!-- added by bai 个人签名-->
+										    <p><%= toggle_link l(:label_brief_introduction), 'introduction', {:focus => 'new_form_user_introduction'} %></p>
 										    
 										    <% unless @user.user_extensions.nil? %>
 										    <%= @user.user_extensions.brief_introduction %>														    
@@ -70,16 +71,22 @@
 											<table border="0" width="100%" align="center" >
 
 											<tr>
-												<td><%= f.text_area 'user_introduction', :rows => 3, :cols => 65, :placeholder => "#{l(:label_my_brief_introduction)}", :style => "resize: none;", :class => 'noline'%></td>
+												<td><%= f.text_area 'user_introduction', :rows => 3, 
+																						 :cols => 65, 
+																						 :placeholder => "#{l(:label_my_brief_introduction)}", 
+																						 :style => "resize: none;", 
+																						 :class => 'noline'%></td>
 											</tr>
 										</table>
 										<table border="0" width="200px" align="center">
 											<tr>
-												<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %></td>
+												<td align="right"> <%= submit_tag l(:button_submit), :name => nil , 
+																									 :class => "bid_btn" %></td>
 											</tr>
 										</table>
 										<% end %>
 										</div>
+										<!-- end -->
 										    
 									</div>
 
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 7d9f4198b..5a1a55f31 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -35,18 +35,18 @@
 		<!-- added by bai  增加账户里的性别-->
 		<% unless @user.user_extensions.nil? %>
 		<% if @user.user_extensions.gender == 0 %>
-			<p>
-				<%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %>
+			<p style="width:400px;padding-left: 26px;">
+				<%= l(:label_gender) %>&nbsp;&nbsp;<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %>
 			</p>
 			
 			<% else %>
-			<p>
-				<%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe  %>
-			</p>
+			<p style="width:400px;padding-left: 26px;">
+				<%= l(:label_gender) %>&nbsp;&nbsp;<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %>
 			</p>
+			
 			<% end %>
 		<% else %>
-				<p><%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe  %></p>
+				<p style="width:400px;padding-left: 26px;"><%= l(:label_gender) %>&nbsp;&nbsp;<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %></p>
 		</p>
 		<% end %>
 		
@@ -61,10 +61,10 @@
 		
 		<!-- added by bai 单位-->
 		<% unless @user.user_extensions.nil?%>
-		<p><%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation%>
+		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
 		</p>
 		<%else%>
-		<p><%= l(:field_occupation)%><%= text_field_tag "occupation"%>
+		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%>
 		</p>
 		<%end%>
 		
@@ -284,7 +284,8 @@ $().ready(funtion(){
 	});
 				});
 </script> -->
-<p><%= l(:label_location) %><select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince">
+<p style="width:400px;padding-left: 26px;"><%= l(:label_location) %>
+	<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince" class="location">
 	<option value="">--请选择省份--</option>
 	<option value="北京">北京</option> 
 	<option value="上海">上海</option> 
@@ -322,7 +323,7 @@ $().ready(funtion(){
 	<option value="台湾">台湾</option> 
 	<option value="海外">海外</option>
 </select>
-<select name="city" id="userCity"></select></p>
+<select name="city" id="userCity" class="location"></select></p>
 		<!-- end -->
 			
 		<% if Setting.openid? %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ea267ce04..1ca807976 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1421,5 +1421,7 @@ en:
   label_gender_male: male
   label_gender_female: female
   label_location: Location
+  label_brief_introduction: Modified my status
+  label_my_brief_introduction: Howdy guys! please leave your foot print~
 #end
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9543c4cb0..b3e974410 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1173,7 +1173,13 @@ ul.properties li span {font-style:italic;}
 
 .total-hours { font-size: 110%; font-weight: bold; }
 .total-hours span.hours-int { font-size: 120%; }
-.gender { width: 20%; }
+
+/*added by bai 增加了性别、地区和单位的样式 */
+#my_account_form select.gender { width: 20%; }
+#my_account_form select.location {width: 31%;}
+#my_account_form .occupation { width: 56%; }
+/*end*/
+
 .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
 #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 60%; }
 
@@ -1195,7 +1201,7 @@ p.pagination {margin-top:8px; font-size: 90%}
   margin: 0;
   padding: 3px 0 3px 0;
   padding-left: 100px; /* width of left column containing the label elements *//*by young*/
-  min-height: 1.8em;
+  /*/*min-height: 1.8em;*/  by bai*/
   clear:left;
 }
 
@@ -1284,9 +1290,10 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 
 a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
 
-em.info {font-style:normal;font-size:90%;color:#888;display:block;}
+/*modified by bai 改变了字体颜色和加粗*/
+em.info {font-style:normal; font-size:90%; color:#505050; font-weight:bold; display:block;}
 em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
-
+/*end*/
 textarea.text_cf {width:90%;}
 
 #tab-content-modules fieldset p {margin:3px 0 4px 0;}