From 670786891516ce1b57f6fe5e97cc41ad2ac04978 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 15:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 15 +++++++------
 config/locales/account/zh.yml    |  2 +-
 public/stylesheets/new_user.css  | 36 ++++++++++++--------------------
 3 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 3ec5d3221..8d11a0697 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -134,14 +134,13 @@
         <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
             <%= back_url_hidden_field_tag %>
             <ul>
-              <li class="new_login_li new_login_users">
+              <li class="new_loggin_users">
                 <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
               </li>
-              <li class="new_login_li  new_login_lock">
+              <li class="new_login_lock">
                 <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
-
               </li>
-              <span class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></span>
+              <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
               <li>
                 <% if Setting.autologin? %>
                     <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
@@ -173,19 +172,19 @@
         <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
             <%= error_messages_for 'user' %>
             <ul>
-              <li>
+              <li class="new_register_li">
                 <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
                 <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
               </li>
-              <li>
+              <li class="new_register_li">
                 <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
                 <p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
               </li>
-              <li>
+              <li class="new_register_li">
                 <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
                 <p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
               </li>
-              <li>
+              <li class="new_register_li">
                 <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
                 <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml
index c6a23b964..532806356 100644
--- a/config/locales/account/zh.yml
+++ b/config/locales/account/zh.yml
@@ -37,7 +37,7 @@ zh:
   label_password_lost: "忘记密码？"
   button_login: 登录
   #     account_controller中判断用户名或密码输入有误的提示信息
-  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写，谢谢！"
+  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写。"
   #     account_controller中判断未激活的提示信息
   notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。"
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 49d86c446..836596244 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1668,16 +1668,10 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
     padding-left:10px;
 }
 input.new_register_input{
+    margin-left:5px;
     width:250px;
     height:45px;
-    background:#fff;
-    -webkit-border-radius:5px;
-    -moz-border-radius:5px;
-    -o-border-radius:5px;
-    border-radius:5px;
     border:none;
-    padding-left:15px;
-    margin-bottom:2px;
 }
 input.new_loggin_input{
     -webkit-box-shadow: 0 0 0px 1000px white inset;
@@ -1685,46 +1679,42 @@ input.new_loggin_input{
     width:205px;
     height:45px;
     border:none;
+    margin-left:50px;
 }
-.new_loggin_li{ width:250px;
+.new_loggin_users{
+    width:265px;
     height:45px;
-    background:#fff;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
     -o-border-radius:5px;
     border-radius:5px;
     border:none;
-    padding-left:15px;
-    margin-bottom:2px;
-    margin-bottom:20px;
-}
-.new_login_users{
     background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
-    width:215px;
+
+}
+.new_login_lock{
+    background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
+    width:265px;
     height:45px;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
     -o-border-radius:5px;
     border-radius:5px;
     border:none;
-    padding-left:50px;
-    margin-bottom:2px;
 }
-.new_login_lock{
-    background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
-    width:215px;
+.new_register_li{
+    background:#fff;
+    width:265px;
     height:45px;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
     -o-border-radius:5px;
     border-radius:5px;
     border:none;
-    padding-left:50px;
-    margin-bottom:2px;
 }
 
 .new_login_form ul li{
-    margin-bottom:15px;
+    margin-bottom:20px;
 }
 .new_login_error{
     color:#c00202;