aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav <Sobolev>2013-03-02 00:09:34 +0600
committerStanislav <Sobolev>2013-03-02 00:24:54 +0600
commit40f1642b6743aa5003dfb7586ce857292cd18d0c (patch)
tree6034ae2b7b213b7075a65938dc0fbc3f15e7d23e
parentb49a2a779ba6deba108d1f842ab5b7bc7460aa14 (diff)
downloadrails-40f1642b6743aa5003dfb7586ce857292cd18d0c.tar.gz
rails-40f1642b6743aa5003dfb7586ce857292cd18d0c.tar.bz2
rails-40f1642b6743aa5003dfb7586ce857292cd18d0c.zip
New beauty pages(404, 422, 500)
moving changelog note to unreleased section New beauty pages(404, 422, 500)
Diffstat
-rw-r--r--guides/CHANGELOG.md2
-rw-r--r--guides/code/getting_started/public/404.html53
-rw-r--r--guides/code/getting_started/public/422.html53
-rw-r--r--guides/code/getting_started/public/500.html53
-rw-r--r--railties/CHANGELOG.md1
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/404.html53
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/422.html53
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/500.html53
8 files changed, 254 insertions, 67 deletions
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index ee6e64b731..b0e52847e1 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1,5 +1,5 @@
## Rails 4.0.0 (unreleased) ##
-
+* Change Service pages(404, etc). *Stanislav Sobolev*
## Rails 4.0.0.beta1 (unreleased) ##
diff --git a/guides/code/getting_started/public/404.html b/guides/code/getting_started/public/404.html
index 3d875c342e..ae7b8649ae 100644
--- a/guides/code/getting_started/public/404.html
+++ b/guides/code/getting_started/public/404.html
@@ -2,17 +2,48 @@
<html>
<head>
<title>The page you were looking for doesn't exist (404)</title>
- <style>
- 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>
+ body
+ {
+ background-color: #efefef;
+ color: #2E2F30;
+ text-align: center;
+ font-family: arial,sans-serif;
+ }
+ div.dialog
+ {
+ width: 25em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-left-color: #999;
+ border-bottom-color: #BBB;
+ border-top: #B00100 solid 4px;
+ border-top-left-radius: 9px;
+ border-top-right-radius: 9px;
+ background-color: white;
+ padding: 7px 4em 0 4em;
+ }
+ h1{
+ font-size: 100%;
+ color: #730E15;
+ line-height: 1.5em;
+ }
+ body>p
+ {
+ width: 33em;
+ margin: 0 auto 1em;
+ padding: 1em 0;
+ background-color: #f7f7f7;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-color: #DADADA;
+ color: #666;
+ box-shadow: 0 3px 8px rgba(50,50,50,0.17);
+ }
</style>
</head>
diff --git a/guides/code/getting_started/public/422.html b/guides/code/getting_started/public/422.html
index 3f1bfb3417..b75cc2fd6c 100644
--- a/guides/code/getting_started/public/422.html
+++ b/guides/code/getting_started/public/422.html
@@ -2,17 +2,48 @@
<html>
<head>
<title>The change you wanted was rejected (422)</title>
- <style>
- 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>
+ body
+ {
+ background-color: #efefef;
+ color: #2E2F30;
+ text-align: center;
+ font-family: arial,sans-serif;
+ }
+ div.dialog
+ {
+ width: 25em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-left-color: #999;
+ border-bottom-color: #BBB;
+ border-top: #B00100 solid 4px;
+ border-top-left-radius: 9px;
+ border-top-right-radius: 9px;
+ background-color: white;
+ padding: 7px 4em 0 4em;
+ }
+ h1{
+ font-size: 100%;
+ color: #730E15;
+ line-height: 1.5em;
+ }
+ body>p
+ {
+ width: 33em;
+ margin: 0 auto 1em;
+ padding: 1em 0;
+ background-color: #f7f7f7;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-color: #DADADA;
+ color: #666;
+ box-shadow: 0 3px 8px rgba(50,50,50,0.17);
+ }
</style>
</head>
diff --git a/guides/code/getting_started/public/500.html b/guides/code/getting_started/public/500.html
index 012977d3d2..9641851e74 100644
--- a/guides/code/getting_started/public/500.html
+++ b/guides/code/getting_started/public/500.html
@@ -2,17 +2,48 @@
<html>
<head>
<title>We're sorry, but something went wrong (500)</title>
- <style>
- 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>
+ body
+ {
+ background-color: #efefef;
+ color: #2E2F30;
+ text-align: center;
+ font-family: arial,sans-serif;
+ }
+ div.dialog
+ {
+ width: 25em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-left-color: #999;
+ border-bottom-color: #BBB;
+ border-top: #B00100 solid 4px;
+ border-top-left-radius: 9px;
+ border-top-right-radius: 9px;
+ background-color: white;
+ padding: 7px 4em 0 4em;
+ }
+ h1{
+ font-size: 100%;
+ color: #730E15;
+ line-height: 1.5em;
+ }
+ body>p
+ {
+ width: 33em;
+ margin: 0 auto 1em;
+ padding: 1em 0;
+ background-color: #f7f7f7;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-color: #DADADA;
+ color: #666;
+ box-shadow: 0 3px 8px rgba(50,50,50,0.17);
+ }
</style>
</head>
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f3c07470af..4f7cb8254f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -2,6 +2,7 @@
## Rails 4.0.0.beta1 (February 25, 2013) ##
+* Change Service pages(404, etc). *Stanislav Sobolev*
* Improve `rake stats` for JavaScript and CoffeeScript: ignore block comments
and calculates number of functions.
diff --git a/railties/lib/rails/generators/rails/app/templates/public/404.html b/railties/lib/rails/generators/rails/app/templates/public/404.html
index 3d875c342e..0ee82d3722 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/404.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/404.html
@@ -2,17 +2,48 @@
<html>
<head>
<title>The page you were looking for doesn't exist (404)</title>
- <style>
- 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>
+ body
+ {
+ background-color: #efefef;
+ color: #2E2F30;
+ text-align: center;
+ font-family: arial,sans-serif;
+ }
+ div.dialog
+ {
+ width: 25em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-left-color: #999;
+ border-bottom-color: #BBB;
+ border-top: #B00100 solid 4px;
+ border-top-left-radius: 9px;
+ border-top-right-radius: 9px;
+ background-color: white;
+ padding: 7px 4em 0 4em;
+ }
+ h1{
+ font-size: 100%;
+ color: #730E15;
+ line-height: 1.5em;
+ }
+ body>p
+ {
+ width: 33em;
+ margin: 0 auto 1em;
+ padding: 1em 0;
+ background-color: #f7f7f7;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-color: #DADADA;
+ color: #666;
+ box-shadow:0 3px 8px rgba(50,50,50,0.17);
+ }
</style>
</head>
diff --git a/railties/lib/rails/generators/rails/app/templates/public/422.html b/railties/lib/rails/generators/rails/app/templates/public/422.html
index 3f1bfb3417..ed58409a27 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/422.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/422.html
@@ -2,17 +2,48 @@
<html>
<head>
<title>The change you wanted was rejected (422)</title>
- <style>
- 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>
+ body
+ {
+ background-color: #efefef;
+ color: #2E2F30;
+ text-align: center;
+ font-family: arial,sans-serif;
+ }
+ div.dialog
+ {
+ width: 25em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-left-color: #999;
+ border-bottom-color: #BBB;
+ border-top: #B00100 solid 4px;
+ border-top-left-radius: 9px;
+ border-top-right-radius: 9px;
+ background-color: white;
+ padding: 7px 4em 0 4em;
+ }
+ h1{
+ font-size: 100%;
+ color: #730E15;
+ line-height: 1.5em;
+ }
+ body>p
+ {
+ width: 33em;
+ margin: 0 auto 1em;
+ padding: 1em 0;
+ background-color: #f7f7f7;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-color: #DADADA;
+ color: #666;
+ box-shadow:0 3px 8px rgba(50,50,50,0.17);
+ }
</style>
</head>
diff --git a/railties/lib/rails/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html
index 012977d3d2..9417de0cc0 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/500.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/500.html
@@ -2,17 +2,48 @@
<html>
<head>
<title>We're sorry, but something went wrong (500)</title>
- <style>
- 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>
+ body
+ {
+ background-color: #efefef;
+ color: #2E2F30;
+ text-align: center;
+ font-family: arial,sans-serif;
+ }
+ div.dialog
+ {
+ width: 25em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-left-color: #999;
+ border-bottom-color: #BBB;
+ border-top: #B00100 solid 4px;
+ border-top-left-radius: 9px;
+ border-top-right-radius: 9px;
+ background-color: white;
+ padding: 7px 4em 0 4em;
+ }
+ h1{
+ font-size: 100%;
+ color: #730E15;
+ line-height: 1.5em;
+ }
+ body>p
+ {
+ width: 33em;
+ margin: 0 auto 1em;
+ padding: 1em 0;
+ background-color: #f7f7f7;
+ border: 1px solid #CCC;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-color: #DADADA;
+ color: #666;
+ box-shadow:0 3px 8px rgba(50,50,50,0.17);
+ }
</style>
</head>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 17:01:10 +0000