diff --git a/website/email.php b/website/email.php index f1aaa94f6..7f4c5ec60 100644 --- a/website/email.php +++ b/website/email.php @@ -16,38 +16,40 @@ + +
-
+ -
+ - -
- - - -
-
- + diff --git a/website/includes/email_custom_form.php b/website/includes/email_custom_form.php new file mode 100644 index 000000000..9e4a6f156 --- /dev/null +++ b/website/includes/email_custom_form.php @@ -0,0 +1,37 @@ + + + + diff --git a/website/includes/email_github_form.php b/website/includes/email_github_form.php new file mode 100644 index 000000000..b1c7828f3 --- /dev/null +++ b/website/includes/email_github_form.php @@ -0,0 +1,24 @@ + + diff --git a/website/script/email.js b/website/script/email.js index 81ce62b06..bbe552a2d 100644 --- a/website/script/email.js +++ b/website/script/email.js @@ -1,61 +1,26 @@ $(function() { - var customEmailForm = { - $firstField: $("#firstField"), - $secondField: $("#secondField"), - $messageBox: $("#messageBox"), - $submitButton: $("#customSubmitButton"), - init: function(submitCallback) { - this.submitCallback = submitCallback; - this.$submitButton.click(this, this.onClick.bind(this)); - this.$firstField.keypress(this, this.keypress.bind(this)); - this.$secondField.keypress(this, this.keypress.bind(this)); - }, - render: function() { - this.$emailLoc.html(this.email); - }, - onClick: function() { - if(this.$firstField.val() != this.$secondField.val()) { - this.displayMessage("Email Mismatch", "The two emails that you entered do not match.", false); - } else if(this.$firstField.val() == "" || this.$secondField.val() == "") { - this.displayMessage("Empty Fields", "Please fill your email twice in the boxes below.", false); - } else { - this.displayMessage("Success", "We've sent a verification email to "+this.$firstField.val()+".", true); - this.submitCallback(this.$firstField.val()); - } - }, - keypress: function(e) { - if(e.which == 13) this.onClick(); - }, - displayMessage: function(title, message, isSuccess) { - this.$messageBox.append($("")) - } - } - function render() { if(parseInt(user.isEmailGood) == 0) { - if(user.email != null && user.email != undefined) { - $("#waitMessage").css("display", "block"); + if(user.email != null && user.email != undefined) { // Waiting for verification + $("#wait").css("display", "block"); - $("#forms").css("display", "none"); - $("#firstMessage").css("display", "none"); - $("#returningMessage").css("display", "none"); - } else { - $("#forms").css("display", "block"); - $("#firstMessage").css("display", "block"); + $("#change").css("display", "none"); + $("#verify").css("display", "none"); + } else { // Need to pick an email + $("#verify").css("display", "block"); - $("#waitMessage").css("display", "none"); - $("#returningMessage").css("display", "none"); + $("#change").css("display", "none"); + $("#wait").css("display", "none"); } - } else { - $("#forms").css("display", "block"); - $("#returningMessage").css("display", "block"); + } else { // Email change + $("#change").css("display", "block"); - $("#waitMessage").css("display", "none"); - $("#firstMessage").css("display", "none"); + $("#wait").css("display", "none"); + $("#verify").css("display", "none"); } } - var session = getSession(); + var session = getSession(); session = {"userID": 4431}; if(session == null) window.location.href = "index.php"; var user = getUser(session['userID']); if(user == null) window.location.href = "index.php"; @@ -68,4 +33,8 @@ $(function() { user.email = email; render(user); }); + githubSubmitButton.init(user.githubEmail, function() { + validateEmail(); + window.location.href = "index.php"; + }); });