Tidy up the markup on the bundled error pages. Closes #6379. [Tim Lucas]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5306 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

Tidy up the markup on the bundled error pages. Closes #6379. [Tim Lucas]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5306 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fa5080ae · Michael Koziarski · cdb5132c · fa5080ae · fa5080ae · fa5080ae
隐藏空白更改
内联并排

Showing with 28 addition and 60 deletion

railties/CHANGELOG railties/CHANGELOG +2 -0

railties/html/404.html railties/html/404.html +13 -30

railties/html/500.html railties/html/500.html +13 -30

未找到文件。
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
 *SVN*

+* Clean up html on included error pages. [Tim Lucas]
+
 * 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]

--- a/railties/html/404.html
+++ b/railties/html/404.html
@@ -7,41 +7,24 @@
  <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; }
+		body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+		div.dialog {
+			width: 25em;
+			padding: 0 4em;
+			margin: 4em auto 0 auto;
+			border: 1px solid #ccc;
+			border-right-color: #999;
+			border-bottom-color: #999;
+		}
+		h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
 	</style>
 </head>

 <body>
-
-<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 class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
  </div>
-</div>
-
 </body>
 </html>
\ No newline at end of file
--- a/railties/html/500.html
+++ b/railties/html/500.html
@@ -7,41 +7,24 @@
  <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; }
+		body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+		div.dialog {
+			width: 25em;
+			padding: 0 4em;
+			margin: 4em auto 0 auto;
+			border: 1px solid #ccc;
+			border-right-color: #999;
+			border-bottom-color: #999;
+		}
+		h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
 	</style>
 </head>

 <body>
-
-<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 class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
  </div>
-</div>
-
 </body>
 </html>
\ No newline at end of file