From e22a56183a26283941a3260341ef84ce03e8ba44 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 21 Jan 2017 22:30:47 +0100 Subject: Improve error page layouting. 500 page has to stay static because it's used from nginx when Rails fails. --- app/views/errors/404.html | 43 ------------------------------------------ app/views/errors/404.html.haml | 5 +++++ app/views/errors/410.html | 43 ------------------------------------------ app/views/errors/410.html.haml | 5 +++++ app/views/errors/422.html | 43 ------------------------------------------ app/views/errors/422.html.haml | 5 +++++ app/views/errors/500.html | 43 ------------------------------------------ 7 files changed, 15 insertions(+), 172 deletions(-) delete mode 100644 app/views/errors/404.html create mode 100644 app/views/errors/404.html.haml delete mode 100644 app/views/errors/410.html create mode 100644 app/views/errors/410.html.haml delete mode 100644 app/views/errors/422.html create mode 100644 app/views/errors/422.html.haml delete mode 100644 app/views/errors/500.html (limited to 'app/views/errors') diff --git a/app/views/errors/404.html b/app/views/errors/404.html deleted file mode 100644 index fc75c78be..000000000 --- a/app/views/errors/404.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - The page you were looking for doesn't exist - - - - - - -
- Mastodon - -
-

The page you were looking for doesn't exist

-
-
- - diff --git a/app/views/errors/404.html.haml b/app/views/errors/404.html.haml new file mode 100644 index 000000000..ba1d5f72d --- /dev/null +++ b/app/views/errors/404.html.haml @@ -0,0 +1,5 @@ +- 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 diff --git a/app/views/errors/410.html b/app/views/errors/410.html deleted file mode 100644 index e07cbe863..000000000 --- a/app/views/errors/410.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - The page you were looking for doesn't exist anymore - - - - - - -
- Mastodon - -
-

The page you were looking for doesn't exist anymore

-
-
- - diff --git a/app/views/errors/410.html.haml b/app/views/errors/410.html.haml new file mode 100644 index 000000000..07cf3742f --- /dev/null +++ b/app/views/errors/410.html.haml @@ -0,0 +1,5 @@ +- 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 diff --git a/app/views/errors/422.html b/app/views/errors/422.html deleted file mode 100644 index a214781bd..000000000 --- a/app/views/errors/422.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Security verification failed - are you blocking cookies? - - - - - - -
- Mastodon - -
-

We're sorry, but we were unable to verify your request. Have you tried enabling cookies?

-
-
- - diff --git a/app/views/errors/422.html.haml b/app/views/errors/422.html.haml new file mode 100644 index 000000000..e369cded6 --- /dev/null +++ b/app/views/errors/422.html.haml @@ -0,0 +1,5 @@ +- content_for :page_title do + Security verification failed + +- content_for :content do + Security verification failed. Are you blocking cookies? diff --git a/app/views/errors/500.html b/app/views/errors/500.html deleted file mode 100644 index d085d490b..000000000 --- a/app/views/errors/500.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - We're sorry, but something went wrong - - - - - - -
- Mastodon - -
-

We're sorry, but something went wrong.

-
-
- - -- cgit