From 44560a679f195771b202445697becd60c8462495 Mon Sep 17 00:00:00 2001
From: Wen <wsm911120@126.com>
Date: Thu, 3 Apr 2014 10:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=20=E7=BA=A7=E8=81=94=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E4=B8=AD=200.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb      | 16 +++++++++++++---
 public/stylesheets/application.css |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index cca7b8546..d34c9ce93 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -61,13 +61,23 @@
 		<% end %>
 		
 		<!-- added by bai 单位-->
-		<% unless @user.user_extensions.nil?%>
-		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%>&nbsp;<%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
+		<!--<% unless @user.user_extensions.nil?%>
+		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%>&nbsp;<span class="required">*</span><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation' %>
 		</p>
 		<%else%>
-		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%>
+		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><span class="required">*</span><%= text_field_tag "occupation", nil, :class => 'occupation' %>
 		</p>
 		<%end%>
+		-->
+		
+		<!-- added by Wen -->
+		<p style="width:357px;padding-left: 26px;">
+			<%= l(:field_occupation) %>&nbsp;<select name='province'><%= options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province) %></select>
+
+			<%= select_tag 'occupation', options_from_collection_for_select(School.all, :name, :name) %>
+		</p>		
+		
+		
 		
 		<!-- added by bai 增加了地区 -->
 		
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e60316841..e5a203a6d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1727,7 +1727,7 @@ ul.properties li span {font-style:italic;}
 /*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%; }
+/*#user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 45%; }*/
 
 #workflow_copy_form select { width: 200px; }
 table.transitions td.enabled {background: #bfb;}