From adf9dd3d35ad5befee09b55d6d69fa11c53a8915 Mon Sep 17 00:00:00 2001 From: Nate Hardison Date: Sat, 1 Jun 2013 12:21:34 -0700 Subject: [PATCH] Make email change templates use main layout Update the email change templates to fit with the rest of the main site and use the standard notification template. Now they're far prettier than before. --- lms/templates/email_change_failed.html | 14 +++++++++++-- lms/templates/email_change_successful.html | 13 ++++++++++-- lms/templates/email_exists.html | 14 +++++++++++-- lms/templates/emails_change_successful.html | 13 ++++++++++-- lms/templates/invalid_email_key.html | 22 ++++++++++++++------- 5 files changed, 61 insertions(+), 15 deletions(-) diff --git a/lms/templates/email_change_failed.html b/lms/templates/email_change_failed.html index e228df4a9c..0f077ec769 100644 --- a/lms/templates/email_change_failed.html +++ b/lms/templates/email_change_failed.html @@ -1,3 +1,13 @@ -

E-mail change failed.

+<%inherit file="main.html" /> -

We were unable to send a confirmation email to ${email}

+
+ +
+

E-mail change failed

+
+ +

We were unable to send a confirmation email to ${email}

+ +

Go back to the home page.

+
+
diff --git a/lms/templates/email_change_successful.html b/lms/templates/email_change_successful.html index 0b05a28bf5..01c45d7050 100644 --- a/lms/templates/email_change_successful.html +++ b/lms/templates/email_change_successful.html @@ -1,3 +1,12 @@ -

E-mail change successful!

+<%! from django.core.urlresolvers import reverse %> +<%inherit file="main.html" /> -

You should see your new email in your dashboard.

\ No newline at end of file +
+ +
+

E-mail change successful!

+
+ +

You should see your new email in your dashboard.

+
+
diff --git a/lms/templates/email_exists.html b/lms/templates/email_exists.html index 885fbd5520..e1d12bba96 100644 --- a/lms/templates/email_exists.html +++ b/lms/templates/email_exists.html @@ -1,3 +1,13 @@ -

Could not change e-mail

+<%inherit file="main.html" /> -An account with the new e-mail address already exists. Sorry. +
+ +
+

E-mail change failed

+
+ +

An account with the new e-mail address already exists.

+ +

Go back to the home page.

+
+
diff --git a/lms/templates/emails_change_successful.html b/lms/templates/emails_change_successful.html index ed3b732d6e..34a5c6f0f2 100644 --- a/lms/templates/emails_change_successful.html +++ b/lms/templates/emails_change_successful.html @@ -1,3 +1,12 @@ -

E-mail change successful!

+<%! from django.core.urlresolvers import reverse %> +<%inherit file="main.html" /> -

You should see your new name in your profile. +

+ +
+

E-mail change successful!

+
+ +

You should see your new email in your dashboard.

+
+
diff --git a/lms/templates/invalid_email_key.html b/lms/templates/invalid_email_key.html index 437dfa151d..212f91fa9d 100644 --- a/lms/templates/invalid_email_key.html +++ b/lms/templates/invalid_email_key.html @@ -1,8 +1,16 @@ -

Invalid key

+<%inherit file="main.html" /> -

This e-mail key is not valid. Please check: -

+
+ +
+

Invalid email change key

+
+

This e-mail key is not valid. Please check:

+
    +
  • Was this key already used? Check whether the e-mail change has already happened. +
  • Did your e-mail client break the URL into two lines? +
  • The keys are valid for a limited amount of time. Has the key expired? +
+

Go back to the home page.

+
+