From e09310e9c9fe2bdc2fa1e8ac9f667ef6582a6867 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 14 Mar 2012 17:32:05 -0400 Subject: [PATCH] added fix for error pages and for password reset page --- 404.html | 2 +- registration/password_reset_confirm.html | 20 ++++++++++++++++++++ sass/layout/_layout.scss | 10 ++++++++++ server-down.html | 2 +- server-error.html | 2 +- server-overloaded.html | 2 +- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/404.html b/404.html index 644f802a13..65b4061b30 100644 --- a/404.html +++ b/404.html @@ -1,7 +1,7 @@ <%inherit file="main.html" /> -
+

Page not found

The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at technical@mitx.mit.edu.

diff --git a/registration/password_reset_confirm.html b/registration/password_reset_confirm.html index fa9538f0e7..9daa598a37 100644 --- a/registration/password_reset_confirm.html +++ b/registration/password_reset_confirm.html @@ -1,4 +1,20 @@ + + + + Reset password - MITx 6.002x + + + + + + + + + {% block content %} +
{% if validlink %} @@ -22,4 +38,8 @@ {% endif %} +
{% endblock %} + + + diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index 74efa3598f..a2e7a355c2 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -29,5 +29,15 @@ html { margin-top: lh(.5); } } + + section.outside-app { + @extend .main-content; + max-width: 600px; + padding: lh(); + + #{$all-text-inputs} { + display: block; + } + } } } diff --git a/server-down.html b/server-down.html index 40786ed3ba..0faed814db 100644 --- a/server-down.html +++ b/server-down.html @@ -1,6 +1,6 @@ <%inherit file="main.html" /> -
+

Currently the MITx servers are down

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@mitx.mit.edu to report any problems or downtime.

diff --git a/server-error.html b/server-error.html index c88afb95dd..d41fdde47b 100644 --- a/server-error.html +++ b/server-error.html @@ -1,6 +1,6 @@ <%inherit file="main.html" /> -
+

There has been an error on the MITx servers

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@mitx.mit.edu to report any problems or downtime.

diff --git a/server-overloaded.html b/server-overloaded.html index 5f770c1abf..f5859d0e70 100644 --- a/server-overloaded.html +++ b/server-overloaded.html @@ -1,6 +1,6 @@ <%inherit file="main.html" /> -
+

Currently the MITx servers are overloaded

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@mitx.mit.edu to report any problems or downtime.