From 3546355f70f17a07120f9161046a2176ed85b80d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 28 May 2014 17:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=8A=9F=E8=83=BD=E4=BB=A5=E5=8F=8A=E6=98=B5=E7=A7=B0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb |  1 +
 app/views/my/account.html.erb    | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 0723cf169..a87df4fef 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -54,6 +54,7 @@ class MyController < ApplicationController
       @user.safe_attributes = params[:user]
       @user.pref.attributes = params[:pref]
       @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
+      @user.login = params[:login]
       unless @user.user_extensions.nil?
         if @user.user_extensions.identity == 2
           @user.firstname = params[:enterprise_name]
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index c9390bcc3..805545659 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -55,20 +55,25 @@
     <legend onclick="toggleFieldset(this);">
       <%= l(:label_information_plural) %>
     </legend>
+
+    <!-- 昵称 -->
+    <p style="width:630px;padding-left: 26px;">
+      <%= f.text_field :login, :required => true, :name => "login"%>
+      <span class='font_lighter'><%= l(:label_max_number) %></span>
+      <br/>
+    </p>
+
     <div>
         <span id='name' style='display:none'>
-          <p style="width:630px;padding-left: 26px;">
-            <%= f.text_field :login, :required => true %>
-            <span class='font_lighter'><%= l(:label_max_number) %></span>
-          </p>
-        <p style="width:530px;padding-left: 26px;">
-          <%= f.text_field :lastname, :required => true %>
-          <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>
-        </p>
+
+            <p style="width:530px;padding-left: 26px;">
+              <%= f.text_field :lastname, :required => true %>
+              <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>
+            </p>
         </span>
         
         <span id='enterprise' style='display:none'>