From 986f48f012e9d210c3d3af917f094816a8abb3ae Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 25 Oct 2014 17:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 61 +++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 57eaa93d1..6776340ac 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -35,7 +35,9 @@
   <%= call_hook(:view_my_account_contextual, :user => @user) %>
 </div>
 
-<h3 style="padding-left: 10px;"><%= l(:label_my_account) %></h3>
+<h3 style="padding-left: 10px;">
+  <%= l(:label_my_account) %>
+</h3>
 <%= error_messages_for 'user' %>
 <fieldset class="box" style="margin:10px;">
 <%= labelled_form_for :user, @user,
@@ -68,17 +70,22 @@
         <span id='name' style='display:none'>
             <p style="width:530px;padding-left: 26px;">
               <%= f.text_field :lastname, :required => true %>
-              <span class='font_lighter'><%= l(:field_lastname_eg) %></span>
+              <span class='font_lighter'>
+                <%= l(:field_lastname_eg) %>
+              </span>
             </p>
             <p style="width:530px;padding-left: 26px;">
               <%= f.text_field :firstname, :required => true %>
-              <span class='font_lighter'><%= l(:field_firstname_eg) %></span>
+              <span class='font_lighter'>
+                <%= l(:field_firstname_eg) %>
+              </span>
             </p>
         </span>
         
         <span id='enterprise' style='display:none'>
         <p style="width:400px;padding-left: 26px;">
-          <%= l(:label_company_name)%><%= text_field_tag :enterprise_name, @user.firstname %>
+          <%= l(:label_company_name)%>
+          <%= text_field_tag :enterprise_name, @user.firstname %>
         </p>
         </span>
 
@@ -230,11 +237,19 @@
       <% unless @user.user_extensions.identity == 2 %>
           <p style="width:400px;padding-left: 26px;">
             <%= l(:label_identity) %>
-            <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
-              <option value=""><%= l(:label_account_identity_choose) %></option>
-              <option value="0"><%= l(:label_account_identity_teacher) %></option>
-              <option value="1"><%= l(:label_account_identity_student) %></option>
-              <option value="3"><%= l(:label_account_identity_developer) %></option>
+            <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location">
+              <option value="">
+                <%= l(:label_account_identity_choose) %>
+              </option>
+              <option value="0">
+                <%= l(:label_account_identity_teacher) %>
+              </option>
+              <option value="1">
+                <%= l(:label_account_identity_student) %>
+              </option>
+              <option value="3">
+                <%= l(:label_account_identity_developer) %>
+              </option>
 
             </select>
             <span id='technical_title' style='display:none'>
@@ -243,9 +258,9 @@
             <span id='no' style='display:none'>
               <!-- modified by fq -->
               <% unless User.current.user_extensions.student_id.nil? %>
-              <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
+                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
               <% else %>
-              <%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
+                <%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
               <% end %>
               <!-- end -->
             </span>
@@ -254,11 +269,21 @@
           <p>
             <span style="display:none">
               <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
-                <option value=""><%= l(:label_account_identity_choose) %></option>
-                <option value="0"><%= l(:label_account_identity_teacher) %></option>
-                <option value="1"><%= l(:label_account_identity_student) %></option>
-                <option value="2"><%= l(:label_account_identity_enterprise) %></option>
-                <option value="3"><%= l(:label_account_identity_developer) %></option>
+                <option value="">
+                  <%= l(:label_account_identity_choose) %>
+                </option>
+                <option value="0">
+                  <%= l(:label_account_identity_teacher) %>
+                </option>
+                <option value="1">
+                  <%= l(:label_account_identity_student) %>
+                </option>
+                <option value="2">
+                  <%= l(:label_account_identity_enterprise) %>
+                </option>
+                <option value="3">
+                  <%= l(:label_account_identity_developer) %>
+                </option>
               </select>
             </span>
           </p>
@@ -267,7 +292,9 @@
 
 
     <% if Setting.openid? %>
-        <p> <%= f.text_field :identity_url %> </p>
+        <p>
+          <%= f.text_field :identity_url %>
+        </p>
     <% end %>
 
     <% @user.custom_field_values.select(&:editable?).each do |value| %>