Commit 0702a845 by Piotr Mitros

Unknown changes/pre-git transition

--HG--
branch : pmitros-name-change
rename : activation_email.txt => emails/activation_email.txt
rename : activation_email_subject.txt => emails/activation_email_subject.txt
parent b2765395
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
<section class="activation"> <section class="activation">
<h1>Account already active!</h1> <h1>Account already active!</h1>
<!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> --> <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
<p> This account has already been activated. We will notify you as <p> This account has already been activated. You can log in at
soon as the course starts.</p> the <a href="/">6.002x course page</a>.</p>
<p>For now you can go to the <a href="http://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
</div> </div>
</section> </section>
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<div> <div>
<h1>Activation Complete!</h1> <h1>Activation Complete!</h1>
<!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> --> <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
<p>Thanks for activating your email. We will notify you as soon as the course starts.</p> <p>Thanks for activating your account. You can log in at the <a href="/">6.002x course page</a>.</p>
<p>For now you can go to the <a href="http://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
</div> </div>
</section> </section>
We received a request to change the e-mail associated with MITx We received a request to change the e-mail associated with MITx
account ${username} from ${oldemail} to ${newemail}. If this is account ${username} from ${old_email} to ${new_email}. If this is
correct, please confirm your new e-mail address by visiting: correct, please confirm your new e-mail address by visiting:
http://${ site }/confirmemail/${ key } http://${ site }/confirmemail/${ key }
......
Request to change MITx account e-mail
(Not currently used)
We are sorry. Our course staff did not approve your request to change
your name from ${old_name} to ${new_name}. If you need further
assistance, please e-mail the course staff at ta@mitx.mit.edu.
...@@ -79,8 +79,18 @@ $(function() { ...@@ -79,8 +79,18 @@ $(function() {
}); });
$("#unenroll_button").click(function(){ $("#submit_email_change").click(function(){
$("#unenroll_course_link").click(); alert("Test 1");
var new_email = $('#new_email_field').val();
var new_password = $('#new_email_password').val();
postJSON('/email_change/',{"new_email":new_email},
function(data){});
alert("Test 2");
log_event("profile", {"type":"email_change_request",
"old_email":"${email}",
"new_email":new_email});
alert("Test 3");
}); });
}); });
...@@ -220,16 +230,16 @@ $(function() { ...@@ -220,16 +230,16 @@ $(function() {
<ul> <ul>
<li> <li>
<label> Please enter your new email address: </label> <label> Please enter your new email address: </label>
<input id="new_name" type="email" value="" /> <input id="new_email_field" type="email" value="" />
</li> </li>
<li> <li>
<label> Please confirm your password: </label> <label> Please confirm your password: </label>
<input id="new_name" value="" type="password" /> <input id="new_email_password" value="" type="password" />
</li> </li>
<li> <li>
<p> We will send a confirmation to both ${email} and your new e-mail as part of the process.</p> <p> We will send a confirmation to both ${email} and your new e-mail as part of the process.</p>
<input type="submit" id="submit" /> <input type="submit" id="submit_email_change" />
</li> </li>
</ul> </ul>
</fieldset> </fieldset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment