Merge branch 'ineffyble-fix/error-pages'

500278eb · Eugen Rochko · f036c644 · e22a5618 · 500278eb · 500278eb
Commit 500278eb authored 8 years ago by Eugen Rochko
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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', layout: 'error' }
    end
  end

  def gone
    respond_to do |format|
      format.any  { head 410 }
+      format.html { render 'errors/410', layout: 'error' }
+    end
+  end
+
+  def unprocessable_entity
+    respond_to do |format|
+      format.any  { head 422 }
+      format.html { render 'errors/422', layout: 'error' }
    end
  end


--- a/app/views/errors/404.html.haml
+++ b/app/views/errors/404.html.haml
+- content_for :page_title do
+  The page you were looking for doesn't exist
+
+- content_for :content do
+  The page you were looking for doesn't exist
--- a/app/views/errors/410.html.haml
+++ b/app/views/errors/410.html.haml
+- content_for :page_title do
+  The page you were looking for doesn't exist anymore
+
+- content_for :content do
+  The page you were looking for doesn't exist anymore
--- a/app/views/errors/422.html.haml
+++ b/app/views/errors/422.html.haml
+- content_for :page_title do
+  Security verification failed
+
+- content_for :content do
+  Security verification failed. Are you blocking cookies?
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
+!!!
+%html{:lang => "en"}
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %meta{:charset => "utf-8"}/
+    %title= yield :page_title
+    %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
+    %link{:href => "https://fonts.googleapis.com/css?family=Roboto:400", :rel => "stylesheet"}/
+    :css
+      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;
+      }
+  %body
+    .dialog
+      %img{:alt => "Mastodon", :src => "/oops.png"}/
+      %div
+        %h1= yield :content
--- a/public/404.html
+++ b/public/404.html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>The page you were looking for doesn't exist</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</h1>
-    </div>
-  </div>
-</body>
-</html>