diff --git a/public/js/admin_domains.js b/public/js/admin_domains.js index abc95aa..9814fa3 100644 --- a/public/js/admin_domains.js +++ b/public/js/admin_domains.js @@ -1,14 +1,15 @@ -function updateOwnerEmail() { - var name = this.domainName; - document.getElementById("owneremail-"+name).innerHTML = this.responseText; -} - -function showOwnerEmail(name) { - document.getElementById("owneremail-"+name).innerHTML = "Loading..."; - - var req = new XMLHttpRequest(); - req.domainName = name; - req.addEventListener("load", updateOwnerEmail); - req.open("GET", "/api/get_owner_email?name="+encodeURIComponent(name)); - req.send(); -} +function showOwnerEmail(in_name) { + let name = in_name; + if (!document.getElementById('owneremail-' + name)) { + return; + } + document.getElementById('owneremail-' + name).innerHTML = 'Loading...'; + fetch('/api/get_owner_email?name=' + encodeURIComponent(name), { + method: 'GET', + mode: 'cors' + }).then(g => g.text()).then(g => { + document.getElementById('owneremail-' + name).innerHTML = g; + }).catch((e) => { + console.log('server error', e); + }); +} \ No newline at end of file diff --git a/public/js/domain_check.js b/public/js/domain_check.js index 129302e..a291d07 100644 --- a/public/js/domain_check.js +++ b/public/js/domain_check.js @@ -1,23 +1,20 @@ -function updateAvailability() { - if (this.responseText === "y") { - document.getElementById("avail").innerHTML = "Available!"; - } else { - document.getElementById("avail").innerHTML = "Not available"; - } -} - function checkAvailability() { - var name = document.getElementById("name").value; - - if (name === "") { - document.getElementById("avail").innerHTML = ""; - return + let name = document.getElementById('name').value; + if (name === '') { + document.getElementById('avail').innerHTML = ''; + return; } - - document.getElementById("avail").innerHTML = "Checking availability..."; - - var req = new XMLHttpRequest(); - req.addEventListener("load", updateAvailability); - req.open("GET", "/api/check_availability?name="+encodeURIComponent(name)); - req.send(); -} + document.getElementById('avail').innerHTML = 'Checking availability...'; + fetch('/api/check_availability?name=' + encodeURIComponent(name), { + method: 'GET', + mode: 'cors' + }).then(g => g.text()).then(g => { + if (g === 'y') { + document.getElementById('avail').innerHTML = 'Available!'; + } else { + document.getElementById('avail').innerHTML = 'Not available'; + } + }).catch((e) => { + document.getElementById('avail').innerHTML = 'Server error'; + }); +} \ No newline at end of file diff --git a/views/account.tt b/views/account.tt index a744ba2..fe40685 100644 --- a/views/account.tt +++ b/views/account.tt @@ -54,7 +54,7 @@ - + @@ -130,6 +130,6 @@
- [  ] + [  ] diff --git a/views/charter.tt b/views/charter.tt index c194809..6c96df3 100644 --- a/views/charter.tt +++ b/views/charter.tt @@ -15,7 +15,7 @@ Description We are also going to implement an opt-in mailing list which would permit notifications of domain registrations to be sent out to all those interested. This will, of course, be optional on both sides (opt-in to notify, opt-in to receive). -Furthermore, we will provide a certificate authority and issue each domain owner with a corresponding certificate. Alternative names and wildcards can also be requested. + Registration - - - - - - diff --git a/views/confirm_forgot.tt b/views/confirm_forgot.tt index 9e986b4..a40f39b 100644 --- a/views/confirm_forgot.tt +++ b/views/confirm_forgot.tt @@ -31,7 +31,7 @@ - + @@ -39,11 +39,11 @@ - +
- [  ] + [  ] diff --git a/views/confirmed.tt b/views/confirmed.tt index c5abb54..d7f8956 100644 --- a/views/confirmed.tt +++ b/views/confirmed.tt @@ -6,4 +6,6 @@
Your email address was confirmed successfully. +
+

[ Log in ]

diff --git a/views/domains/new.tt b/views/domains/new.tt index c2139e0..d5ad625 100644 --- a/views/domains/new.tt +++ b/views/domains/new.tt @@ -31,8 +31,8 @@
.<% vars.config.tld %>

- [  ] - [ go back ] + [  ] + [ Go back ]
diff --git a/views/domains/remove.tt b/views/domains/remove.tt index f0f7fae..de9fac2 100644 --- a/views/domains/remove.tt +++ b/views/domains/remove.tt @@ -20,6 +20,8 @@
[  ]
+
+ [ No, I changed my mind  ]

diff --git a/views/email/forgot.tt b/views/email/forgot.tt index dfaca4e..884bc6a 100644 --- a/views/email/forgot.tt +++ b/views/email/forgot.tt @@ -1,6 +1,8 @@ Hello! -You're receiving this email because someone tried to reset your cybNIC password. If this was you, please click the link below: +You're receiving this email because someone tried to reset your cybNIC password. + +If this was you, please click the link below to reset your password: <% link %> If it wasn't, you can safely ignore this email. diff --git a/views/email/registration.tt b/views/email/registration.tt index a1955c0..a730ba9 100644 --- a/views/email/registration.tt +++ b/views/email/registration.tt @@ -5,4 +5,4 @@ You're receiving this email because someone used your email address to sign up f If this was you and you'd like to confirm your account, please click this link: <% link %> -Otherwise, feel free to ignore this email - we won't send any more. +Otherwise, feel free to ignore this email - we won't send anymore. diff --git a/views/email/update.tt b/views/email/update.tt index a3bd3f5..3144304 100644 --- a/views/email/update.tt +++ b/views/email/update.tt @@ -2,7 +2,7 @@ Hello! You're receiving this email because someone entered your email address into cybNIC. -If this was you and you'd like to use this address, please click this link: +If this was you and you'd like to change your email address to this one, please click this link: <% link %> Otherwise, feel free to ignore this email. diff --git a/views/forgot.tt b/views/forgot.tt index cad7bbc..e9ec465 100644 --- a/views/forgot.tt +++ b/views/forgot.tt @@ -5,10 +5,10 @@ <% IF err || success %>
<% IF e_no_user %> - Error: There is no user account associated with that email address. + An email has been sent if there is an account. Please click the link to reset your password. <% END %> <% IF success %> - An email has been sent to <% params.email | html_entity %>. Please click the link to reset your password. + An email has been sent if there is an account. Please click the link to reset your password. <% END %>


@@ -20,8 +20,8 @@
- +
- [  ] + [  ]
diff --git a/views/index.tt b/views/index.tt index 33cf8f3..1ac61df 100644 --- a/views/index.tt +++ b/views/index.tt @@ -10,6 +10,6 @@

You can read our charter for more information and details on how to report abuse of cybNIC services.

Create or log in to an account in order to register or update .cyb domains.

-

[ log in ]  [ register ]

+

[ Log in ]  [ Register ]

diff --git a/views/login.tt b/views/login.tt index ad207c6..49dc586 100644 --- a/views/login.tt +++ b/views/login.tt @@ -5,14 +5,14 @@ <% IF account_created %>
- Your account has been created and a confirmation email sent to <% params.email | html_entity %>. Please confirm your email address, then log in here. + Your account has been created and a confirmation email sent to <% params.email | html_entity %>. Please confirm your email address to confirm your registration.


<% END %> <% IF params.pwchange %>
- Your password has been changed and all browsers logged out. Please log in again here. + Your password has been changed and all sessions logged out. Please log in again.


<% END %> @@ -20,13 +20,13 @@ <% IF error %>
<% IF e_no_user %> - The email address <% params.email | html_entity %> is not registered. + Your email address is not registered or the password is incorrect. <% END %> <% IF e_pass %> - Your password was incorrect, sorry. + Your email address is not registered or the password is incorrect. <% END %> <% IF e_not_confirmed %> - Please confirm your email address using the link sent to <% params.email | html_entity %>. + Please confirm your email address. <% END %>


@@ -42,7 +42,7 @@ - + @@ -50,14 +50,14 @@ - +
- [  ] - [ go back ] + [  ] + [ Go back ]

- [ recover forgotten password ] + [ Recover password ] diff --git a/views/records/add.tt b/views/records/add.tt index d98c6f1..80e7df8 100644 --- a/views/records/add.tt +++ b/views/records/add.tt @@ -12,7 +12,7 @@