added fix for error pages and for password reset page

e09310e9 · Kyle Fiedler · 3966a068 · e09310e9 · e09310e9 · e09310e9
Commit e09310e9 authored Mar 14, 2012 by Kyle Fiedler
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 4 deletions

404.html
+1 -1

registration/password_reset_confirm.html
+20 -0

sass/layout/_layout.scss
+10 -0

server-down.html
+1 -1

server-error.html
+1 -1

server-overloaded.html
+1 -1

No files found.
--- a/404.html
+++ b/404.html

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

-<section class="activation">
+<section class="outside-app">
  <h1>Page not found</h1>
  <p>The page that you were looking for was not found. Go back to the <a href="/">homepage</a> or let us know about any pages that may have been moved at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>.</p>
 </section>
--- a/registration/password_reset_confirm.html
+++ b/registration/password_reset_confirm.html
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Reset password - MITx 6.002x</title>
+
+  <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
+
+  <!--[if lt IE 9]>
+  <script src="/static/js/html5shiv.js"></script>
+  <![endif]-->
+
+</head>
+
+<body>
+
 {% block content %}
+<section class="outside-app">

 {% if validlink %}

@@ -22,4 +38,8 @@

 {% endif %}

+</section>
 {% endblock %}
+
+</body>
+</html>
--- 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;
+      }
+    }
  }
 }
--- a/server-down.html
+++ b/server-down.html
 <%inherit file="main.html" />

-<section class="activation">
+<section class="outside-app">
  <h1>Currently the <em>MITx</em> servers are down</h1>
  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
 </section>
--- a/server-error.html
+++ b/server-error.html
 <%inherit file="main.html" />

-<section class="activation">
+<section class="outside-app">
  <h1>There has been an error on the <em>MITx</em> servers</h1>
  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
 </section>
--- a/server-overloaded.html
+++ b/server-overloaded.html
 <%inherit file="main.html" />

-<section class="activation">
+<section class="outside-app">
  <h1>Currently the <em>MITx</em> servers are overloaded</h1>
  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
 </section>