From 072807fe3721b434c0ecc213b62a1f8f9b2ceff6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 14:07:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=99=BB=E5=BD=95=E4=B8=8B=E5=88=92?=
 =?UTF-8?q?=E7=BA=BF=E5=8E=BB=E6=8E=892=E3=80=81=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B3=A8=E5=86=8C3=E3=80=81=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=9A=84=E6=94=B9=E6=88=90=E5=8B=BE=E9=80=89=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index c3b6a0946..f492c5502 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -150,7 +150,7 @@
                 </a>
                 <div class="cl"></div>
               </li>
-              <li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();">登录</a></button></li>
+              <li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();" style="text-decoration: none;">登录</a></button></li>
             </ul>
         <% end %>
       </div>
@@ -167,7 +167,7 @@
       <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
     </div>
     <div class="new_login_box fr mr45 mt50">
-      <h2 class="new_login_h2">登录<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
+      <h2 class="new_login_h2">注册<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
       <div class="new_login_form">
         <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
             <%= error_messages_for 'user' %>
@@ -189,11 +189,11 @@
                 <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
               <li>
-                <label><input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
+                <label><input type="checkbox" checked id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
               </li>
               <li>
-                <div class="new_login_submit_disable" id="loginUpButton">
-                  <a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" class="new_login_submit_disable" style="text-decoration: none;">注册</a>
+                <div class="new_login_submit" id="loginUpButton">
+                  <a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" style="text-decoration: none;">注册</a>
                 </div>
             </ul>
         <% end %>