diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 9031b5167..c3b6a0946 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -52,7 +52,7 @@
$('#login_req').html(''+data.message+'');
$login_correct = true;
} else {
- $('#login_req').html( ''+data.message+'');
+ $('#login_req').html( ''+data.message+'');
$login_correct = false;
}
$('#login_req').css('display','block');
@@ -63,7 +63,7 @@
$mail.blur(function (event) {
if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
- $('#mail_req').html( '邮件格式不对').show();
+ $('#mail_req').html( '邮件格式不对').show();
$mail_correct = false;
return ;
}
@@ -76,7 +76,7 @@
$('#mail_req').html( ''+data.message+'' );
$mail_correct = true;
} else {
- $('#mail_req').html( ''+data.message+'' );
+ $('#mail_req').html( ''+data.message+'' );
$mail_correct = false;
}
$('#mail_req').css('display','block');
@@ -92,7 +92,7 @@
$passwd_correct = true;
}
else {
- $('#passwd_req').html( ''+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'');
+ $('#passwd_req').html( ''+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'');
$passwd_correct = false;
}
$('#passwd_req').css('display','block');
@@ -108,7 +108,7 @@
$passwd_comfirm_correct = true;
}
else {
- $('#confirm_req').html(''+'<%= l(:setting_password_error) %>'+'');
+ $('#confirm_req').html(''+'<%= l(:setting_password_error) %>'+'');
$passwd_comfirm_correct = false;
}
@@ -118,8 +118,6 @@
});
});
-
-
@@ -138,12 +136,9 @@
<% end %>
@@ -197,7 +192,9 @@
-
+
<% end %>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 18fbcfcd5..c20335b1d 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,6 +15,7 @@
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
+
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index f5f0d78f0..d2eb7a168 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -637,11 +637,11 @@ function user_name_keypress(e){
function changeRegisterBtn(checkbox){
if(checkbox.checked == true){
- $("#loginUpButton").removeClass('loginUpDisableButton');
- $("#loginUpButton").addClass('loginUpButton');
+ $("#loginUpButton").removeClass('new_login_submit_disable');
+ $("#loginUpButton").addClass('new_login_submit');
}else{
- $("#loginUpButton").removeClass('loginUpButton')
- $("#loginUpButton").addClass('loginUpDisableButton');
+ $("#loginUpButton").removeClass('new_login_submit')
+ $("#loginUpButton").addClass('new_login_submit_disable');
}
}
@@ -664,7 +664,7 @@ function login(){
}
function register(){
- if($("#loginUpButton").hasClass('loginUpDisableButton')){
+ if($("#loginUpButton").hasClass('new_login_submit_disable')){
return;
}
if($login_correct && $mail_correct && $passwd_correct && $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 2827b9a09..062367a4c 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -747,8 +747,8 @@ a:hover .gz_btn{color:#ff5722;}
.homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
/*注册登陆页面*/
-#loginInBox {display:block; margin-top:143px;}
-#signUpBox {display:none; margin-top:79px;}
+#loginInBox {display:block;}
+#signUpBox {display:none;}
#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
#loginSignButton:hover {background-color:#05488e;}
@@ -1708,11 +1708,28 @@ input.new_login_lock{
margin-bottom:15px;
}
.new_login_error{
+ color:#c00202;
+}
+.new_login_submit_disable{
+ width:265px;
+ height:40px;
+ line-height: 40px;
+ background:#ccc;
color:#fff;
+ font-size:14px;
+ -webkit-border-radius:5px;
+ -moz-border-radius:5px;
+ -o-border-radius:5px;
+ border-radius:5px;
+ border:none;
+ text-align:center;
+ cursor:pointer;
+ vertical-align: middle;
}
.new_login_submit{
width:265px;
height:40px;
+ line-height: 40px;
background:#f27d0d;
color:#fff;
font-size:14px;
@@ -1723,7 +1740,7 @@ input.new_login_lock{
border:none;
text-align:center;
cursor:pointer;
-
+ vertical-align: middle;
}
.new_login_check{
width:15px;