David A. Windham
david
/
laravel
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #501 from daylerees/error-pages

Error pages
Taylor Otwell 12 years ago
parent
7199ac8e9c e0251b7d57
commit
eafb4bdfb8
2 changed files with 210 additions and 166 deletions
Unified View Show Diff Stats
  1. 105 83
      application/views/error/404.php
  2. 105 83
      application/views/error/500.php

+ 105 - 83
application/views/error/404.php
View File 

@@ -1,92 +1,113 @@
 
 <!doctype html>
 
 <!doctype html>
 
-<html>
 
-	<head>
 
-		<meta charset="utf-8">
 
-
 
-		<title>Error 404 - Not Found</title>
 
-
 
-		<style>
 
-			@import url(http://fonts.googleapis.com/css?family=Ubuntu);
 
-
 
-			body {
 
-				background: #eee;
 
-				color: #6d6d6d;
 
-				font: normal normal normal 14px/1.253 Ubuntu, sans-serif;
 
-				margin: 0 0 25px 0;
 
-				min-width: 800px;
 
-				padding: 0;
 
-			}
 
-
 
-			#main {
 
-				background-clip: padding-box;
 
-				background-color: #fff;
 
-				border:1px solid #ccc;
 
-				border-radius: 5px;
 
-				box-shadow: 0 0 10px #cdcdcd;
 
-				margin: 25px auto 0;
 
-				padding: 30px;
 
-				width: 700px;
 
-				position: relative;
 
-			}
 
-
 
-			#main h1 {
 
-				font-family: 'Ubuntu';
 
-				font-size: 38px;
 
-				letter-spacing: 2px;
 
-				margin: 0 0 10px 0;
 
-				padding: 0;
 
-			}
 
-
 
-			#main h2 {
 
-				color: #999;
 
-				font-size: 18px;
 
-				letter-spacing: 3px;
 
-				margin: 0 0 25px 0;
 
-				padding: 0 0 0 0;
 
-			}
 
-
 
-			#main h3 {
 
-				color: #999;
 
-				margin-top: 24px;
 
-				padding: 0 0 0 0;
 
-			}
 
-
 
-			#main h3 {
 
-				font-size: 18px;
 
-			}
 
-
 
-			#main p {
 
-				line-height: 25px;
 
-				margin: 10px 0;
 
-			}
 
-
 
-			#main pre {
 
-				background-color: #333;
 
-				border-left: 1px solid #d8d8d8;
 
-				border-top: 1px solid #d8d8d8;
 
-				border-radius: 5px;
 
-				color: #eee;
 
-				padding: 10px;
 
-			}
 
-
 
-			#main ul {
 
-				margin: 10px 0;
 
-				padding: 0 30px;
 
-			}
 
-
 
-			#main li {
 
-				margin: 5px 0;
 
-			}
 
-		</style>
 
-	</head>
 
-	<body>
 
-		<div id="main">
 
+<html lang="en">
 
+<head>
 
+	<meta charset="utf-8">
 
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+	<title>Error 404 - Not Found</title>
 
+	<meta name="viewport" content="width=device-width">
 
+	<style type="text/css">
 
+		@import url(http://fonts.googleapis.com/css?family=Droid+Sans);
 
+
 
+		article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
 
+		audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }
 
+		audio:not([controls]) { display: none; }
 
+		[hidden] { display: none; }
 
+		html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
 
+		html, button, input, select, textarea { font-family: sans-serif; color: #222; }
 
+		body { margin: 0; font-size: 1em; line-height: 1.4; }
 
+		::-moz-selection { background: #E37B52; color: #fff; text-shadow: none; }
 
+		::selection { background: #E37B52; color: #fff; text-shadow: none; }
 
+		a { color: #00e; }
 
+		a:visited { color: #551a8b; }
 
+		a:hover { color: #06e; }
 
+		a:focus { outline: thin dotted; }
 
+		a:hover, a:active { outline: 0; }
 
+		abbr[title] { border-bottom: 1px dotted; }
 
+		b, strong { font-weight: bold; }
 
+		blockquote { margin: 1em 40px; }
 
+		dfn { font-style: italic; }
 
+		hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
 
+		ins { background: #ff9; color: #000; text-decoration: none; }
 
+		mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
 
+		pre, code, kbd, samp { font-family: monospace, serif; _font-family: 'courier new', monospace; font-size: 1em; }
 
+		pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
 
+		q { quotes: none; }
 
+		q:before, q:after { content: ""; content: none; }
 
+		small { font-size: 85%; }
 
+		sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
 
+		sup { top: -0.5em; }
 
+		sub { bottom: -0.25em; }
 
+		ul, ol { margin: 1em 0; padding: 0 0 0 40px; }
 
+		dd { margin: 0 0 0 40px; }
 
+		nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }
 
+		img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
 
+		svg:not(:root) { overflow: hidden; }
 
+		figure { margin: 0; }
 
+		form { margin: 0; }
 
+		fieldset { border: 0; margin: 0; padding: 0; }
 
+		label { cursor: pointer; }
 
+		legend { border: 0; *margin-left: -7px; padding: 0; white-space: normal; }
 
+		button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; }
 
+		button, input { line-height: normal; }
 
+		button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; *overflow: visible; }
 
+		button[disabled], input[disabled] { cursor: default; }
 
+		input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; *width: 13px; *height: 13px; }
 
+		input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
 
+		input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; }
 
+		button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
 
+		textarea { overflow: auto; vertical-align: top; resize: vertical; }
 
+		input:valid, textarea:valid {  }
 
+		input:invalid, textarea:invalid { background-color: #f0dddd; }
 
+		table { border-collapse: collapse; border-spacing: 0; }
 
+		td { vertical-align: top; }
 
+
 
+		body
 
+		{
 
+			font-family:'Droid Sans', sans-serif;
 
+			font-size:10pt;
 
+			color:#555;
 
+			line-height: 25px;
 
+		}
 
+
 
+		.wrapper
 
+		{
 
+			width:760px;
 
+			margin:0 auto 5em auto;
 
+		}
 
+
 
+		.main
 
+		{
 
+			overflow:hidden;
 
+		}
 
+
 
+		.error-spacer
 
+		{
 
+			height:4em;
 
+		}
 
+
 
+		a, a:visited
 
+		{
 
+			color:#2972A3;
 
+		}
 
+
 
+		a:hover
 
+		{
 
+			color:#72ADD4;
 
+		}
 
+	</style>
 
+</head>
 
+<body onload="prettyPrint()">
 
+	<div class="wrapper">
 
+		<div class="error-spacer"></div>
 
+		<div role="main" class="main">
 
 			<?php $messages = array('We need a map.', 'I think we\'re lost.', 'We took a wrong turn.'); ?>
 
 			<?php $messages = array('We need a map.', 'I think we\'re lost.', 'We took a wrong turn.'); ?>
 
 
 
 			<h1><?php echo $messages[mt_rand(0, 2)]; ?></h1>
 
 			<h1><?php echo $messages[mt_rand(0, 2)]; ?></h1>
 
 
 
 			<h2>Server Error: 404 (Not Found)</h2>
 
 			<h2>Server Error: 404 (Not Found)</h2>
 
 
 
+			<hr>
 
+
 
 			<h3>What does this mean?</h3>
 
 			<h3>What does this mean?</h3>
 
 
 
 			<p>
 
 			<p>
 
@@ -99,5 +120,6 @@
 
 				Perhaps you would like to go to our <?php echo HTML::link('/', 'home page'); ?>?
 
 				Perhaps you would like to go to our <?php echo HTML::link('/', 'home page'); ?>?
 
 			</p>
 
 			</p>
 
 		</div>
 
 		</div>
 
-	</body>
 
+	</div>
 
+</body>
 
 </html>
 
 </html>

+ 105 - 83
application/views/error/500.php
View File 

@@ -1,92 +1,113 @@
 
 <!doctype html>
 
 <!doctype html>
 
-<html>
 
-	<head>
 
-		<meta charset="utf-8">
 
-
 
-		<title>Error 500 - Internal Server Error</title>
 
-
 
-		<style>
 
-			@import url(http://fonts.googleapis.com/css?family=Ubuntu);
 
-
 
-			body {
 
-				background: #eee;
 
-				color: #6d6d6d;
 
-				font: normal normal normal 14px/1.253 Ubuntu, sans-serif;
 
-				margin: 0 0 25px 0;
 
-				min-width: 800px;
 
-				padding: 0;
 
-			}
 
-
 
-			#main {
 
-				background-clip: padding-box;
 
-				background-color: #fff;
 
-				border:1px solid #ccc;
 
-				border-radius: 5px;
 
-				box-shadow: 0 0 10px #cdcdcd;
 
-				margin: 25px auto 0;
 
-				padding: 30px;
 
-				width: 700px;
 
-				position: relative;
 
-			}
 
-
 
-			#main h1 {
 
-				font-family: 'Ubuntu';
 
-				font-size: 38px;
 
-				letter-spacing: 2px;
 
-				margin: 0 0 10px 0;
 
-				padding: 0;
 
-			}
 
-
 
-			#main h2 {
 
-				color: #999;
 
-				font-size: 18px;
 
-				letter-spacing: 3px;
 
-				margin: 0 0 25px 0;
 
-				padding: 0 0 0 0;
 
-			}
 
-
 
-			#main h3 {
 
-				color: #999;
 
-				margin-top: 24px;
 
-				padding: 0 0 0 0;
 
-			}
 
-
 
-			#main h3 {
 
-				font-size: 18px;
 
-			}
 
-
 
-			#main p {
 
-				line-height: 25px;
 
-				margin: 10px 0;
 
-			}
 
-
 
-			#main pre {
 
-				background-color: #333;
 
-				border-left: 1px solid #d8d8d8;
 
-				border-top: 1px solid #d8d8d8;
 
-				border-radius: 5px;
 
-				color: #eee;
 
-				padding: 10px;
 
-			}
 
-
 
-			#main ul {
 
-				margin: 10px 0;
 
-				padding: 0 30px;
 
-			}
 
-
 
-			#main li {
 
-				margin: 5px 0;
 
-			}
 
-		</style>
 
-	</head>
 
-	<body>
 
-		<div id="main">
 
+<html lang="en">
 
+<head>
 
+	<meta charset="utf-8">
 
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+	<title>Error 500 - Internal Server Error</title>
 
+	<meta name="viewport" content="width=device-width">
 
+	<style type="text/css">
 
+		@import url(http://fonts.googleapis.com/css?family=Droid+Sans);
 
+
 
+		article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
 
+		audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }
 
+		audio:not([controls]) { display: none; }
 
+		[hidden] { display: none; }
 
+		html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
 
+		html, button, input, select, textarea { font-family: sans-serif; color: #222; }
 
+		body { margin: 0; font-size: 1em; line-height: 1.4; }
 
+		::-moz-selection { background: #E37B52; color: #fff; text-shadow: none; }
 
+		::selection { background: #E37B52; color: #fff; text-shadow: none; }
 
+		a { color: #00e; }
 
+		a:visited { color: #551a8b; }
 
+		a:hover { color: #06e; }
 
+		a:focus { outline: thin dotted; }
 
+		a:hover, a:active { outline: 0; }
 
+		abbr[title] { border-bottom: 1px dotted; }
 
+		b, strong { font-weight: bold; }
 
+		blockquote { margin: 1em 40px; }
 
+		dfn { font-style: italic; }
 
+		hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
 
+		ins { background: #ff9; color: #000; text-decoration: none; }
 
+		mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
 
+		pre, code, kbd, samp { font-family: monospace, serif; _font-family: 'courier new', monospace; font-size: 1em; }
 
+		pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
 
+		q { quotes: none; }
 
+		q:before, q:after { content: ""; content: none; }
 
+		small { font-size: 85%; }
 
+		sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
 
+		sup { top: -0.5em; }
 
+		sub { bottom: -0.25em; }
 
+		ul, ol { margin: 1em 0; padding: 0 0 0 40px; }
 
+		dd { margin: 0 0 0 40px; }
 
+		nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }
 
+		img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
 
+		svg:not(:root) { overflow: hidden; }
 
+		figure { margin: 0; }
 
+		form { margin: 0; }
 
+		fieldset { border: 0; margin: 0; padding: 0; }
 
+		label { cursor: pointer; }
 
+		legend { border: 0; *margin-left: -7px; padding: 0; white-space: normal; }
 
+		button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; }
 
+		button, input { line-height: normal; }
 
+		button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; *overflow: visible; }
 
+		button[disabled], input[disabled] { cursor: default; }
 
+		input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; *width: 13px; *height: 13px; }
 
+		input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
 
+		input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; }
 
+		button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
 
+		textarea { overflow: auto; vertical-align: top; resize: vertical; }
 
+		input:valid, textarea:valid {  }
 
+		input:invalid, textarea:invalid { background-color: #f0dddd; }
 
+		table { border-collapse: collapse; border-spacing: 0; }
 
+		td { vertical-align: top; }
 
+
 
+		body
 
+		{
 
+			font-family:'Droid Sans', sans-serif;
 
+			font-size:10pt;
 
+			color:#555;
 
+			line-height: 25px;
 
+		}
 
+
 
+		.wrapper
 
+		{
 
+			width:760px;
 
+			margin:0 auto 5em auto;
 
+		}
 
+
 
+		.main
 
+		{
 
+			overflow:hidden;
 
+		}
 
+
 
+		.error-spacer
 
+		{
 
+			height:4em;
 
+		}
 
+
 
+		a, a:visited
 
+		{
 
+			color:#2972A3;
 
+		}
 
+
 
+		a:hover
 
+		{
 
+			color:#72ADD4;
 
+		}
 
+	</style>
 
+</head>
 
+<body onload="prettyPrint()">
 
+	<div class="wrapper">
 
+		<div class="error-spacer"></div>
 
+		<div role="main" class="main">
 
 			<?php $messages = array('Ouch.', 'Oh no!', 'Whoops!'); ?>
 
 			<?php $messages = array('Ouch.', 'Oh no!', 'Whoops!'); ?>
 
 
 
 			<h1><?php echo $messages[mt_rand(0, 2)]; ?></h1>
 
 			<h1><?php echo $messages[mt_rand(0, 2)]; ?></h1>
 
 
 
 			<h2>Server Error: 500 (Internal Server Error)</h2>
 
 			<h2>Server Error: 500 (Internal Server Error)</h2>
 
 
 
+			<hr>
 
+
 
 			<h3>What does this mean?</h3>
 
 			<h3>What does this mean?</h3>
 
 
 
 			<p>
 
 			<p>
 
@@ -99,5 +120,6 @@
 
 				Perhaps you would like to go to our <?php echo HTML::link('/', 'home page'); ?>?
 
 				Perhaps you would like to go to our <?php echo HTML::link('/', 'home page'); ?>?
 
 			</p>
 
 			</p>
 
 		</div>
 
 		</div>
 
-	</body>
 
+	</div>
 
+</body>
 
 </html>
 
 </html>