diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2014-02-01 10:12:23 -0800 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2014-02-01 10:12:23 -0800 |
| commit | 352f957c9c312b46b2b7602dc75893b3daf23182 (patch) | |
| tree | 178dc25770f3cbd183b220795c54171418a84fbd | |
| parent | 5e6f01ed2fd2ee68b7bb66afc35ccdc644247944 (diff) | |
Adding error pages.
| -rw-r--r-- | src/templates/templates/error.ftl | 2 | ||||
| -rw-r--r-- | web/WEB-INF/web.xml | 10 | ||||
| -rw-r--r-- | web/error.html | 63 | ||||
| -rw-r--r-- | web/notfound.html | 63 |
4 files changed, 137 insertions, 1 deletions
diff --git a/src/templates/templates/error.ftl b/src/templates/templates/error.ftl index 2494907..4f46839 100644 --- a/src/templates/templates/error.ftl +++ b/src/templates/templates/error.ftl @@ -8,7 +8,7 @@ <@content> <h1>An Error has Occurred</h1> - <p>An error has occurred. If you continue to see this message, please contact us.</p> + <p>An error has occurred. If you continue to see this message, please <a href="http://jesterpm.net/betafeedback.php">contact us</a>.</p> <p>Error: ${errorMessage}</p> </@content> </@commonpage> diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 4b85bde..a06031c 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -41,4 +41,14 @@ <servlet-name>RestletServlet</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> + + <error-page> + <error-code>404</error-code> + <location>/notfound.html</location> + </error-page> + + <error-page> + <error-code>500</error-code> + <location>/error.html</location> + </error-page> </web-app> diff --git a/web/error.html b/web/error.html new file mode 100644 index 0000000..b01128b --- /dev/null +++ b/web/error.html @@ -0,0 +1,63 @@ +<!doctype html> +<html> +<head> + <title>An Error Has Occurred - Grow Process</title> + + <link href="http://fonts.googleapis.com/css?family=Arvo:400,700" rel="stylesheet"> + <link rel="stylesheet" href="/style.css" /> + <script src="/scripts/jquery.min.js"></script> + <script src="/scripts/jquery-ui.js"></script> + <script src="/scripts/growth.js"></script> +</head> +<body> +<div id="notfooter"> + <header> + <h1> + <a href="/index.html"><img src="/images/logo.png"> Grow Process</a> + <a id="foursquarefloat" href="http://myfoursquarechurch.com"><img src="/images/foursquaresm.png" alt="Foursqaure Church" /></a> + </h1> + + <nav class="primary"> + <ul> + <a href="/index.html">Home</a> + <a href="/learnmore.html">Learn More</a> + <a href="/contact.html">Contact</a> + <a href="/login.html">Login / Sign Up</a> + </ul> + </nav> + </header> + + <div id="middlebar"> + <div id="noticebox"> + <p> + </p> + </div> + </div> + + <div id="content"> + <article class="${class}"> + <h1>An Unexpected Error has Occurred</h1> + + <p>An error has occurred. If you continue to see this message, please <a href="http://jesterpm.net/betafeedback.php">contact us</a>.</p> + </article> + </div> + + <div id="push"></div> +</div> + +<footer> + <div class="left"> + <a href="/index.html">Home</a> + <a href="/learnmore.html">Learn More</a> + <a href="/contact.html">Contact</a> + </div> + + <div class="right"> + ©2013 <a href="http://myfoursquarechurch.com">Foursquare Church</a> + </div> + +</footer> + +</body> +</html> + diff --git a/web/notfound.html b/web/notfound.html new file mode 100644 index 0000000..29e6493 --- /dev/null +++ b/web/notfound.html @@ -0,0 +1,63 @@ +<!doctype html> +<html> +<head> + <title>File Not Found - Grow Process</title> + + <link href="http://fonts.googleapis.com/css?family=Arvo:400,700" rel="stylesheet"> + <link rel="stylesheet" href="/style.css" /> + <script src="/scripts/jquery.min.js"></script> + <script src="/scripts/jquery-ui.js"></script> + <script src="/scripts/growth.js"></script> +</head> +<body> +<div id="notfooter"> + <header> + <h1> + <a href="/index.html"><img src="/images/logo.png"> Grow Process</a> + <a id="foursquarefloat" href="http://myfoursquarechurch.com"><img src="/images/foursquaresm.png" alt="Foursqaure Church" /></a> + </h1> + + <nav class="primary"> + <ul> + <a href="/index.html">Home</a> + <a href="/learnmore.html">Learn More</a> + <a href="/contact.html">Contact</a> + <a href="/login.html">Login / Sign Up</a> + </ul> + </nav> + </header> + + <div id="middlebar"> + <div id="noticebox"> + <p> + </p> + </div> + </div> + + <div id="content"> + <article class="${class}"> + <h1>File Not Found</h1> + + <p>The requested URL was not found. If you believe this to be in error, please <a href="http://jesterpm.net/betafeedback.php">contact us</a>.</p> + </article> + </div> + + <div id="push"></div> +</div> + +<footer> + <div class="left"> + <a href="/index.html">Home</a> + <a href="/learnmore.html">Learn More</a> + <a href="/contact.html">Contact</a> + </div> + + <div class="right"> + ©2013 <a href="http://myfoursquarechurch.com">Foursquare Church</a> + </div> + +</footer> + +</body> +</html> + |