From 797db5a93f1d95299bd83508539658b0cb2c5a39 Mon Sep 17 00:00:00 2001
From: zhangyang <zhangyanggfkd@gmail.com>
Date: Tue, 6 Aug 2013 20:09:52 +0800
Subject: [PATCH] =?UTF-8?q?"=E6=88=91=E7=9A=84=E5=A4=B4=E5=83=8F"=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=98=BE=E7=A4=BA=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb  |  2 +-
 app/views/users/_form.html.erb | 12 +++++++++---
 config/locales/zh.yml          |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 6f79fd155..fcd3c86c1 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -11,7 +11,7 @@
 <fieldset class="box" style="margin:10px;">
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
-			<%= "我的头像"%>
+			<%= l(:label_my_photo)%>
 		</legend>
 		<div>
 		<!--upload profiles-->
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index ddc826fa8..287c5f202 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -2,7 +2,15 @@
 
 <div id="user_form">
 <!--[form:user]-->
-<div class="splitcontentleft">
+<div class="splitcontent">
+	<fieldset class="box">
+		<legend><%= l(:label_my_photo)%></legend>
+		<div>
+		<!--upload profiles-->
+			<%= render :partial=> "avatar/avatar_form", :locals=>{source:@user} %>
+		<!--upload-->
+		</div>
+	</fieldset>
 <fieldset class="box tabular">
   <legend><%=l(:label_information_plural)%></legend>
   <p><%= f.text_field :login, :required => true, :size => 25  %></p>
@@ -33,9 +41,7 @@
   <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
   </div>
 </fieldset>
-</div>
 
-<div class="splitcontentright">
 <fieldset class="box">
   <legend><%=l(:field_mail_notification)%></legend>
   <%= render :partial => 'users/mail_notifications' %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7515bdd2d..2b496b27c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -503,6 +503,7 @@ zh:
   label_versions_settings: 显示配置
   label_versions_progress: 完成进度
   label_versions_description: 版本描述
+  label_my_photo: 我的头像
   #end
   label_my_page: 我的工作台
   label_my_account: 我的帐号