Merge remote-tracking branch 'upstream/master' into redesign
Conflicts: static/About/Room-secondary.txt static/About/Room.txt templates/head.tpl templates/index.tpl
Showing
.gitlab-ci.yml
0 → 100644
htdocs/js/pngfix.js
deleted
100644 → 0
| ... | ... | @@ -10,6 +10,7 @@ var validation = { |
| var submitted = false; | ||
| function validate() { | ||
| var valid = true; | ||
| var field; | ||
| for (field in req) { | ||
| if (!validation[req[field]]) { | ||
| valid = false; | ||
| ... | ... | @@ -37,16 +38,16 @@ function processPostcode() { |
| $('div#addseldiv').removeAttr("style"); | ||
| for (var i = 0; i < (j.addresses.length); i++) { | ||
| options += '<option>'; | ||
| if (j.addresses[i].flat != null) { | ||
| if (j.addresses[i].flat !== null) { | ||
| options += j.addresses[i].flat + "\n"; | ||
| } | ||
| if (j.addresses[i].house != null) { | ||
| if (j.addresses[i].house !== null) { | ||
| options += j.addresses[i].house + "\n"; | ||
| } | ||
| if (j.addresses[i].road != null) { | ||
| if (j.addresses[i].road !== null) { | ||
| options += j.addresses[i].road + "\n"; | ||
| } | ||
| if (j.addresses[i].city != null) { | ||
| if (j.addresses[i].city !== null) { | ||
| options += j.addresses[i].city + "\n"; | ||
| } | ||
| options += '</option>'; | ||
| ... | ... | @@ -56,13 +57,13 @@ function processPostcode() { |
| } | ||
| if (j.addresses.length == 1) { | ||
| $('div#addseldiv').attr("style", "display:none"); | ||
| $("textarea#address") | ||
| $("textarea#address"); | ||
| $('div#addressmessage').attr("style", "color:green; float:right; clear:right;"); | ||
| $('div#addressmessage').html("OK"); | ||
| validation["address"] = true; | ||
| validation.address = true; | ||
| validate(); | ||
| } | ||
| }) | ||
| }); | ||
| } | ||
| function lookupSID(setname) { | ||
| ... | ... | @@ -71,21 +72,21 @@ function lookupSID(setname) { |
| key = arr.shift(); | ||
| val = arr.join(":"); | ||
| if (key == "OK") { | ||
| if (setname = true) | ||
| if (setname === true) | ||
| $("input#realname").val(val); | ||
| $('div#studentidmessage').attr("style", "color:green; float:right; clear:right;"); | ||
| $('div#studentidmessage').html(key); | ||
| validation['studentid'] = true; | ||
| validation.studentid = true; | ||
| processName("realname", "realname"); | ||
| } | ||
| else { | ||
| $('div#studentidmessage').attr("style", "color:red; float:right; clear:right;"); | ||
| $('div#studentidmessage').html(val); | ||
| validation['email'] = false; | ||
| validation.email = false; | ||
| validate(); | ||
| } | ||
| }, 'text') | ||
| }, 'text'); | ||
| } | ||
| function processSID() { | ||
| lookupSID(true); | ||
| ... | ... | @@ -95,15 +96,15 @@ function processUsername() { |
| $.get("/signup/ajax", {key: "username", value: $('input#username').val()}, function (j) { | ||
| if (j != "OK") { | ||
| $('div#usernamemessage').attr("style", "color:red; float:right; clear:right;"); | ||
| validation['username'] = false; | ||
| validation.username = false; | ||
| } | ||
| else { | ||
| $('div#usernamemessage').attr("style", "color:green; float:right; clear:right;"); | ||
| validation['username'] = true; | ||
| validation.username = true; | ||
| } | ||
| $('div#usernamemessage').html(j); | ||
| validate(); | ||
| }, 'text') | ||
| }, 'text'); | ||
| } | ||
| function processName(type, input) { | ||
| ... | ... | @@ -118,7 +119,7 @@ function processName(type, input) { |
| } | ||
| $('div#' + input + 'message').html(j); | ||
| validate(); | ||
| }, 'text') | ||
| }, 'text'); | ||
| } | ||
| function processContact() { | ||
| processName('realname', 'contact'); | ||
| ... | ... | @@ -128,45 +129,45 @@ function processAddress() { |
| $.get("/signup/ajax", {key: "address", value: $('textarea#address').val()}, function (j) { | ||
| if (j != "OK") { | ||
| $('div#addressmessage').attr("style", "color:red; float:right; clear:right;"); | ||
| validation['address'] = false; | ||
| validation.address = false; | ||
| } | ||
| else { | ||
| $('div#addressmessage').attr("style", "color:green; float:right; clear:right;"); | ||
| validation['address'] = true; | ||
| validation.address = true; | ||
| } | ||
| $('div#addressmessage').html(j); | ||
| validate(); | ||
| }, 'text') | ||
| }, 'text'); | ||
| } | ||
| function processEmail() { | ||
| $.get("/signup/ajax", {key: "email", value: $('input#email').val()}, function (j) { | ||
| if (j != "OK") { | ||
| $('div#emailmessage').attr("style", "color:red; float:right; clear:right;"); | ||
| validation['email'] = false; | ||
| validation.email = false; | ||
| } | ||
| else { | ||
| $('div#emailmessage').attr("style", "color:green; float:right; clear:right;"); | ||
| validation['email'] = true; | ||
| validation.email = true; | ||
| } | ||
| $('div#emailmessage').html(j); | ||
| validate(); | ||
| }, 'text') | ||
| }, 'text'); | ||
| } | ||
| function processPhone() { | ||
| $.get("/signup/ajax", {key: "phone", value: $('input#phone').val()}, function (j) { | ||
| if (j != "OK") { | ||
| $('div#phonemessage').attr("style", "color:red; float:right; clear:right;"); | ||
| validation['phone'] = false; | ||
| validation.phone = false; | ||
| } | ||
| else { | ||
| $('div#phonemessage').attr("style", "color:green; float:right; clear:right;"); | ||
| validation['phone'] = true; | ||
| validation.phone = true; | ||
| } | ||
| $('div#phonemessage').html(j); | ||
| validate(); | ||
| }, 'text') | ||
| }, 'text'); | ||
| } | ||
| $(function () { | ||
| ... | ... | @@ -196,25 +197,25 @@ $(function () { |
| $('div#postcodediv').removeAttr("style"); | ||
| $('input#submit').attr("disabled", "disabled"); | ||
| // if the fields are not empty validate them | ||
| if ($('input#username').val() != "") processUsername(); | ||
| if ($('input#email').val() != "") processEmail(); | ||
| if ($('input#phone').val() != "") processPhone(); | ||
| if (usertype != 2) { | ||
| if ($('input#postcode').val() != "") processPostcode(); | ||
| if ($('textarea#address').val() != "") processAddress(); | ||
| if ($('input#realname').val() != "") processName("realname", "realname"); | ||
| if ($('input#username').val() !== "") processUsername(); | ||
| if ($('input#email').val() !== "") processEmail(); | ||
| if ($('input#phone').val() !== "") processPhone(); | ||
| if (usertype !== 2) { | ||
| if ($('input#postcode').val() !== "") processPostcode(); | ||
| if ($('textarea#address').val() !== "") processAddress(); | ||
| if ($('input#realname').val() !== "") processName("realname", "realname"); | ||
| } | ||
| else { | ||
| if ($('input#contact').val() != "") processContact(); | ||
| if ($('input#realname').val() != "") processName("socname", "realname"); | ||
| if ($('input#contact').val() !== "") processContact(); | ||
| if ($('input#realname').val() !== "") processName("socname", "realname"); | ||
| } | ||
| if ((usertype == 1) && ($('input#studentid').val() != "")) { | ||
| if ($('input#realname').val() == "") lookupSID(true); | ||
| if ((usertype == 1) && ($('input#studentid').val() !== "")) { | ||
| if ($('input#realname').val() === "") lookupSID(true); | ||
| else lookupSID(false); | ||
| } | ||
| validate(); | ||
| }) | ||
| }); | ||
| // dont do address stuff for societies | ||
| if (usertype != 2) { | ||
| // process postcode when the box changes | ||
| ... | ... | @@ -234,21 +235,21 @@ $(function () { |
| $("textarea#address").text(strUser); | ||
| $('div#addressmessage').attr("style", "color:green; float:right; clear:right;"); | ||
| $('div#addressmessage').html("OK"); | ||
| </ |