aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages

Browse Source
pull/508/head
Eugen Rochko 9 years ago
parent f036c6440b ed41f9f0b1
commit b4a4eb73ae
5 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File

10
app/controllers/application_controller.rb
Unescape Escape View File

@ -11,6 +11,7 @@ class ApplicationController < ActionController::Base
rescue_from ActionController::RoutingError, with: :not_found
rescue_from ActiveRecord::RecordNotFound, with: :not_found
rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity
before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
before_action :set_locale
@ -50,12 +51,21 @@ class ApplicationController < ActionController::Base
def not_found
respond_to do |format|
format.any { head 404 }
format.html { render "errors/404" }
end
end
def gone
respond_to do |format|
format.any { head 410 }
format.html { render "errors/410" }
end
end
def unprocessable_entity
respond_to do |format|
format.any { head 422 }
format.html { render "errors/422" }
end
end

0
public/404.html → app/views/errors/404.html
Unescape Escape View File

43
app/views/errors/410.html
Unescape Escape View File

@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>The page you were looking for doesn't exist anymore</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Roboto:400" rel="stylesheet">
<style>
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
background: #282c37;
color: #9baec8;
text-align: center;
margin: 0;
padding: 20px;
}
.dialog img {
display: block;
margin: 20px auto;
margin-top: 50px;
max-width: 600px;
width: 100%;
height: auto;
}
.dialog h1 {
font: 20px/28px -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
font-weight: 400;
}
</style>
</head>
<body>
<div class="dialog">
<img src="/oops.png" alt="Mastodon" />
<div>
<h1>The page you were looking for doesn't exist anymore</h1>
</div>
</div>
</body>
</html>

43
app/views/errors/422.html
Unescape Escape View File

@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Security verification failed - are you blocking cookies?</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Roboto:400" rel="stylesheet">
<style>
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
background: #282c37;
color: #9baec8;
text-align: center;
margin: 0;
padding: 20px;
}
.dialog img {
display: block;
margin: 20px auto;
margin-top: 50px;
max-width: 600px;
width: 100%;
height: auto;
}
.dialog h1 {
font: 20px/28px -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
font-weight: 400;
}
</style>
</head>
<body>
<div class="dialog">
<img src="/oops.png" alt="Mastodon" />
<div>
<h1>We're sorry, but we were unable to verify your request. Have you tried enabling cookies?</h1>
</div>
</div>
</body>
</html>

0
public/500.html → app/views/errors/500.html
Unescape Escape View File

Write Preview
Loading…
Cancel
Save