Browse Source

New error page graphic. Other error page improvements (#5099)

- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>)
- 500 content appended with "on our end" to make clear it's
  not user's fault
master
Eugen Rochko 3 years ago
committed by GitHub
parent
commit
3b60832214
7 changed files with 13 additions and 11 deletions
  1. +2
    -3
      app/javascript/styles/basics.scss
  2. +2
    -2
      app/views/errors/500.html.haml
  3. +2
    -2
      app/views/layouts/error.html.haml
  4. +3
    -1
      config/locales/en.yml
  5. +4
    -3
      lib/tasks/assets.rake
  6. BIN
      public/oops.gif
  7. BIN
      public/oops.png

+ 2
- 3
app/javascript/styles/basics.scss View File

@@ -70,9 +70,8 @@ body {

.dialog img {
display: block;
margin: 20px auto;
margin-top: 50px;
max-width: 600px;
margin: 0 auto;
max-width: 470px;
width: 100%;
height: auto;
}


+ 2
- 2
app/views/errors/500.html.haml View File

@@ -1,5 +1,5 @@
- content_for :page_title do
= t('errors.500')
= t('errors.500.title')

- content_for :content do
= t('errors.500')
= t('errors.500.content')

+ 2
- 2
app/views/layouts/error.html.haml View File

@@ -3,12 +3,12 @@
%head
%meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
%meta{ charset: 'utf-8' }/
%title= yield :page_title
%title= safe_join([yield(:page_title), title], ' - ')
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
= stylesheet_pack_tag 'common', media: 'all'
= stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
%body.error
.dialog
%img{ alt: 'Mastodon', src: '/oops.png' }/
%img{ alt: title, src: '/oops.gif' }/
%div
%h1= yield :content

+ 3
- 1
config/locales/en.yml View File

@@ -310,7 +310,9 @@ en:
content: Security verification failed. Are you blocking cookies?
title: Security verification failed
'429': Throttled
'500': We're sorry, but something went wrong.
'500':
content: We're sorry, but something went wrong on our end.
title: This page is not correct
noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">native apps</a> for Mastodon for your platform.
exports:
blocks: You block


+ 4
- 3
lib/tasks/assets.rake View File

@@ -3,15 +3,16 @@
namespace :assets do
desc 'Generate 500.html'
task :generate_500 do
html = ApplicationController.render('errors/500', layout: 'error')
File.write(Rails.root.join('public', '500.html'), html)
I18n.with_locale(ENV['DEFAULT_LOCALE'] || I18n.default_locale) do
html = ApplicationController.render('errors/500', layout: 'error')
File.write(Rails.root.join('public', '500.html'), html)
end
end
end

if Rake::Task.task_defined?('assets:precompile')
Rake::Task['assets:precompile'].enhance do
Webpacker::Manifest.load

Rake::Task['assets:generate_500'].invoke
end
end

BIN
public/oops.gif View File

Before After
Width: 578  |  Height: 578  |  Size: 93 KiB

BIN
public/oops.png View File

Before After
Width: 800  |  Height: 600  |  Size: 118 KiB

Loading…
Cancel
Save