From e0273d320cb371abe4d66d91bba7f3cdcd4baf84 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 28 May 2014 15:05:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0js?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8F=AF=E4=BB=A5=E7=94=A8=E6=98=B5=E7=A7=B0?=
 =?UTF-8?q?=E5=92=8C=E9=82=AE=E7=AE=B1=E7=99=BB=E5=BD=95=202.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B5=84=E6=96=99=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E7=9A=84=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=B5=E7=A7=B0=E7=9A=84=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=203.=E4=BF=AE=E6=94=B9=E6=98=B5=E7=A7=B0=E7=9A=84=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb    | 26 ++++++++++++++++++++++++--
 app/views/account/register.html.erb | 16 +++++++++++-----
 app/views/my/account.html.erb       |  4 ++++
 config/locales/en.yml               |  3 ++-
 config/locales/zh.yml               |  6 ++++--
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index a9b88c32b..dc1e47ed7 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -1,11 +1,33 @@
 <%= call_hook :view_account_login_top %>
+
+<script type="text/javascript" language="javascript">
+    function clearInfo(id, content) {
+        var text = $('#' + id);
+        if (text.val() == content) {
+            $('#' + id).val('');
+        }
+    }
+
+    function showInfo(id, content) {
+        var text = $('#' + id);
+        if (text.val() == '') {
+            $('#' + id).val(content);
+        }
+    }
+</script>
+
 <div id="login-form">
 <%= form_tag(signin_path) do %>
 <%= back_url_hidden_field_tag %>
 <table>
 <tr>
-    <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
-    <td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
+    <td align="right"><label for="username"><%=l(:lable_user_name)%>:</label></td>
+    <td align="left">
+      <%= text_field_tag 'username', params[:username], :tabindex => '1' , :value => "#{l(:label_login_prompt)}",
+                         :onfocus => "clearInfo('username','#{l(:label_login_prompt)}')",
+                         :onblur => "showInfo('username','#{l(:label_login_prompt)}')",
+                         :style => "resize: none;font-size: 12px;color: #818283;"%>
+    </td>
 </tr>
 <tr>
     <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index f24f7d052..cc7a26ad8 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -279,7 +279,7 @@
 
 <% if @user.auth_source_id.nil? %>
   <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
-  	<em class="info"><%= l(:label_max_number) %></em></p> 
+  	<em class="info"><%= l(:label_max_number) %></em></p>
   <p><%= f.password_field :password, :size => 25, :required => true %>
   <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
 
@@ -302,10 +302,16 @@
 <!-- added by bai  增加了身份、性别和地区-->
 
 <span id = 'gender' style = 'display:none'>
-<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td>
-	          <td class="info" style="width: 10px">
-	          	<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
-	          	                          <option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></td></tr></table></p></span>
+<p>
+  <table><tr>
+  <td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td>
+  <td class="info" style="width: 10px">
+	<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
+	<option value = '1'>#{l(:label_gender_female)}</option>".html_safe %>
+  </td>
+  </tr></table>
+ </p>
+</span>
 
 
 <p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_location) %><span class="required"> *</span></strong></td>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 0418697c3..c9390bcc3 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -57,6 +57,10 @@
     </legend>
     <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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd4368be8..575d3bce6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1332,7 +1332,7 @@ en:
   label_tags_user_mail: User E-mail：
   label_tags_user_name: User Name：
   label_tags_numbers: Tag numbers：
-  label_max_number: Must be at most 25 characters long.
+  label_max_number: Open label nickname is displayed on the web site of your,Must be at most 25 characters long.
   label_all_revisions: All revisions：
   label_repository_name: Repository name
   label_upassword_info: The password can be shared in the group
@@ -1617,6 +1617,7 @@ en:
   label_class_hour: period
   label_activity_time: publish date
 
+  label_login_prompt: Email/NickName
 
   # ajax异步验证
   modal_valid_passing: can be used.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 96b37e768..739edff85 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -284,7 +284,7 @@ zh:
   field_is_public: 公开
   field_parent: 上级项目
   field_is_in_roadmap: 在路线图中显示
-  field_login: 登录名
+  field_login: 昵称
   field_mail_notification: 邮件通知
   field_admin: 管理员
   field_last_login_on: 最后登录
@@ -598,6 +598,8 @@ zh:
   label_my_page_block: 我的工作台模块
   label_administration: 管理
   label_login: 登录
+  label_login_prompt: 邮箱/账号
+  lable_user_name: 登录名
   label_logout: 退出
   label_help: 帮助
   label_reported_issues: 已报告的问题
@@ -1495,7 +1497,7 @@ zh:
   label_tags_user_mail: 用户邮箱：
   label_tags_user_name: 用户名：
   label_tags_numbers: Tag统计：
-  label_max_number: 至多25个字符。
+  label_max_number: 昵称是在网站中显示的您的公开标识，至多25个字符。
   label_mail_attention: qq邮箱可能收不到此邮件，其他邮箱如果没有收到可能在垃圾邮件中，其中gmail与教育网邮箱的激活邮件有时比较慢，请耐心等待。
   label_all_revisions: 所有版本：
   label_upassword_info: 该密码在项目组内可共享