commit
66ec140eed
|
@ -59,13 +59,18 @@
|
|||
if($mail_correct == false){
|
||||
return
|
||||
}else{
|
||||
// 改变邮箱地址
|
||||
$.get('<%= account_change_email_path(:user_id => @user.id) %>',
|
||||
{ valid: "mail",
|
||||
value: document.getElementById("user_mail").value },
|
||||
function (data){
|
||||
$("#user_email_show").html(data.email);
|
||||
hideModal();
|
||||
return;
|
||||
$("#user_email_show").html(data.email);
|
||||
// 更改邮箱地址后,直接给用户发送邮件
|
||||
$.ajax({
|
||||
url: "<%= resendmail_path(:user => @user) %>"
|
||||
});
|
||||
hideModal();
|
||||
return;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
<li>请注意查看邮箱中的“订阅邮件”、“垃圾邮件”,可能Trustie的邮件被误杀了</li>
|
||||
<li>请点击重新发送激活邮件按钮</li>
|
||||
<li>如果重发注册验证邮箱邮件仍然没有收到,请<a href="javascript:void(0);" class="link-blue" id="change_email">更换邮箱地址</a>,重新发送激活邮件</li>
|
||||
<li>如果您始终无法收到激活邮件,请直接给我们留言:</li>
|
||||
<div class="mt10">
|
||||
<li>如果您始终无法收到激活邮件,请直接给我们<a href="javascript:void(0);" class="link-blue" id="leave_message">留言</a></li>
|
||||
<div class="mt10 undis" id="message_box">
|
||||
<textarea style="resize: none;width: 570px;" class="email_prompt_mes" placeholder="<%= l(:label_email_feedback_tips) %>"></textarea>
|
||||
<div class="c1"></div>
|
||||
<button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
|
||||
|
@ -36,6 +36,9 @@
|
|||
url: "<%= change_user_email_user_path(@user) %>"
|
||||
});
|
||||
});
|
||||
$("#leave_message").click(function(){
|
||||
$("#message_box").toggle();
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
|
|
|
@ -6079,7 +6079,7 @@ _plugin('core', function(K) {
|
|||
// if (imglist.length > 0){
|
||||
// df(self);
|
||||
// }
|
||||
self.insertHtml(html, true);
|
||||
self.insertHtml(html, true); // 火狐浏览器复制图片会出现2个
|
||||
df(self);
|
||||
}
|
||||
K(doc.body).bind('paste', function(e){
|
||||
|
|
Loading…
Reference in New Issue