mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fixed default 404.html and 500.htmls to remove extreme ugliness and added error language fit for humans [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5279 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
bbcd508d64
commit
5e08c668d2
3 changed files with 90 additions and 10 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [DHH]
|
||||
|
||||
* Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
|
||||
|
||||
* PostgreSQL: db:test:purge closes open database connections first. #6236 [alex]
|
||||
|
|
|
@ -1,8 +1,47 @@
|
|||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
|
||||
"http://www.w3.org/TR/html4/loose.dtd">
|
||||
<html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<title>The page you were looking for doesn't exist (404)</title>
|
||||
<style type="text/css">
|
||||
div.dialog {
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
text-align: left;
|
||||
border: 1px solid #ccc;
|
||||
border-right: 1px solid #999;
|
||||
border-bottom: 1px solid #999;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
div.outer {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
width: 500px;
|
||||
height: 300px;
|
||||
margin-left: -260px;
|
||||
margin-top: -150px;
|
||||
}
|
||||
|
||||
body { background-color: #fff; }
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>File not found</h1>
|
||||
<p>Change this error message for pages not found in public/404.html</p>
|
||||
|
||||
<div class="outer">
|
||||
<!-- This file lives in public/404.html -->
|
||||
|
||||
<div class="dialog" style="text-align: center;">
|
||||
<div style="text-align: center; width: 200px; margin: 0 auto;">
|
||||
<p style="color: red; font-size: 16px; line-height: 20px;">The page you were looking for doesn't exist.</p>
|
||||
<p style="color: #666;">You may have mistyped the address or the page may have moved.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
|
@ -1,8 +1,47 @@
|
|||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
|
||||
"http://www.w3.org/TR/html4/loose.dtd">
|
||||
<html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<title>We're sorry, but something went wrong</title>
|
||||
<style type="text/css">
|
||||
div.dialog {
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
text-align: left;
|
||||
border: 1px solid #ccc;
|
||||
border-right: 1px solid #999;
|
||||
border-bottom: 1px solid #999;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
div.outer {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
width: 500px;
|
||||
height: 300px;
|
||||
margin-left: -260px;
|
||||
margin-top: -150px;
|
||||
}
|
||||
|
||||
body { background-color: #fff; }
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>Application error</h1>
|
||||
<p>Change this error message for uncaught exceptions in public/500.html</p>
|
||||
|
||||
<div class="outer">
|
||||
<!-- This file lives in public/500.html -->
|
||||
|
||||
<div class="dialog" style="text-align: center;">
|
||||
<div style="text-align: center; width: 200px; margin: 0 auto;">
|
||||
<p style="color: red; font-size: 16px; line-height: 20px;">We're sorry, but something went wrong.</p>
|
||||
<p style="color: #666;">We've been notified about this issue and we'll take a look at it shortly.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
Loading…
Reference in a new issue