From c893227609d390f5a006dda0dfa061c52ce61a5e Mon Sep 17 00:00:00 2001
From: Wen <wsm911120@126.com>
Date: Wed, 30 Apr 2014 17:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=A6=E6=A0=A1=E9=80=89=E6=8B=A9=E6=A1=86=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 37 +++++++++++++++++++++++------------
 public/stylesheets/nyan.css   | 10 +++++++---
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 341c050d7..58f684009 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -108,22 +108,23 @@
 		<!-- added by Wen -->
 		
 
-		<p style="width:357px;padding-left: 26px;">
+		<p style="padding-left: 26px;">
 			<% unless User.current.user_extensions.school.nil? %>
-				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province, User.current.user_extensions.school.province), :onclick => "get_options(this.value)" %>
-				<input id="occupation" name="occupation" type="hidden" value="<%=User.current.user_extensions.school.id%>" />
-				<input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
-				
-				
-				
+              
+				    <%= l(:field_occupation) %>&nbsp;<span class="required">*</span>
+
+                    <input id="province" name="province" type="text" value="<%=User.current.user_extensions.school.province%>" readonly />
+				    <input id="occupation" name="occupation" type="hidden" value="<%=User.current.user_extensions.school.id%>" />
+				    <input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
+			
 
-				<!--<%= select_tag "occupation", 
-					options_for_select([[User.current.user_extensions.school.name, User.current.user_extensions.school.id]])  %>-->
 			<% else %>
-				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onclick => "get_options(this.value)" %>
+         
+				    <%= l(:field_occupation) %>&nbsp;<span class="required">*</span>
+                    <input id="province" name="province" type="text" value="请单击选择省份及学校" readonly >
+				    <input id="occupation" name="occupation" type="hidden" />
+				    <input id="occupation_name" type="text" readonly />		
 
-				<input id="occupation" name="occupation" type="hidden" />
-				<input id="occupation_name" type="text" readonly />		
 			<% end %>
 		<!--	<input id="occupation" readonly />-->
 		</p>		
@@ -131,6 +132,18 @@
 		<div id="WOpenWindow">
 			<a class="modal_close" href="#"></a>
 			<h2>学校列表</h2>
+            <div class="pcontent">
+                <ul id="provincelist" class="school_list">
+                    <% @ss = School.find_by_sql("select distinct province from schools") %>
+                    <% @ss.each do |s| %>
+                        <li style="width: 15%; float: left;">
+                            <a style="cursor: pointer;"  onclick = "get_options('<%= s.province %>')"><%= s.province %>
+                            </a>
+                        </li>
+                    <% end %>
+                </ul>
+            </div>
+            <hr/>
 			<div class="content" style="font-size: 13px">
 				<ul id="schoollist" class="school_list">
 				
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 62c47abb2..85751a088 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -227,17 +227,15 @@ body {
   display: none;
   padding-bottom: 2px;
   width: 1000px;
-  height: 500px;
   z-index: 100;
   left: 50%;
   margin-left: -202px;
   opacity: 1;
   position: fixed;
   top: 200px;
-  overflow: scroll;
 }
 #WOpenWindow .school_list{
-	width：1000px;
+  width: 900px;
 	line-height: 20px;
 	
 }
@@ -259,6 +257,12 @@ body {
 }
 #WOpenWindow .content{
 	width: 1000px;
+  height: 220px;
+  overflow: scroll;
+}
+
+#WOpenWindow .pcontent{
+
 }