Skip to content

Commit

Permalink
Revert "[5.7] rollback the message in error pages;"
Browse files Browse the repository at this point in the history
This reverts commit 8a306f1.
  • Loading branch information
GrahamCampbell committed Dec 31, 2018
1 parent cd481cb commit 2d21bc2
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 63 deletions.
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/401.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('code', '401')
@section('title', __('Unauthorized'))

@section('image')
<div style="background-image: url({{ asset('/svg/403.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __('Sorry, you are not authorized to access this page.'))
@section('code', '401')
@section('message', __('Unauthorized'))
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/403.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('code', '403')
@section('title', __('Forbidden'))

@section('image')
<div style="background-image: url({{ asset('/svg/403.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __($exception->getMessage() ?: __('Sorry, you are forbidden from accessing this page.')))
@section('code', '403')
@section('message', __('Forbidden'))
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/404.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('title', __('Not Found'))
@section('code', '404')
@section('title', __('Page Not Found'))

@section('image')
<div style="background-image: url({{ asset('/svg/404.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __('Sorry, the page you are looking for could not be found.'))
@section('message', __('Not Found'))
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/419.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('code', '419')
@section('title', __('Page Expired'))

@section('image')
<div style="background-image: url({{ asset('/svg/403.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __('Sorry, your session has expired. Please refresh and try again.'))
@section('code', '419')
@section('message', __('Page Expired'))
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/429.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('code', '429')
@section('title', __('Too Many Requests'))

@section('image')
<div style="background-image: url({{ asset('/svg/403.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __('Sorry, you are making too many requests to our servers.'))
@section('code', '429')
@section('message', __('Too Many Requests'))
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/500.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('title', __('Server Error'))
@section('code', '500')
@section('title', __('Error'))

@section('image')
<div style="background-image: url({{ asset('/svg/500.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __('Whoops, something went wrong on our servers.'))
@section('message', __('Server Error'))
12 changes: 3 additions & 9 deletions src/Illuminate/Foundation/Exceptions/views/503.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@extends('errors::illustrated-layout')
@extends('errors::minimal')

@section('code', '503')
@section('title', __('Service Unavailable'))

@section('image')
<div style="background-image: url({{ asset('/svg/503.svg') }});" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
</div>
@endsection

@section('message', __($exception->getMessage() ?: __('Sorry, we are doing some maintenance. Please check back soon.')))
@section('code', '503')
@section('message', __('Service Unavailable'))
62 changes: 62 additions & 0 deletions src/Illuminate/Foundation/Exceptions/views/minimal.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>@yield('title')</title>

<!-- Fonts -->
<link rel="dns-prefetch" href="//fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet" type="text/css">

<!-- Styles -->
<style>
html, body {
background-color: #fff;
color: #636b6f;
font-family: 'Nunito', sans-serif;
font-weight: 100;
height: 100vh;
margin: 0;
}
.full-height {
height: 100vh;
}
.flex-center {
align-items: center;
display: flex;
justify-content: center;
}
.position-ref {
position: relative;
}
.code {
border-right: 2px solid;
font-size: 26px;
padding: 0 15px 0 15px;
text-align: center;
}
.message {
font-size: 18px;
text-align: center;
}
</style>
</head>
<body>
<div class="flex-center position-ref full-height">
<div class="code">
@yield('code')
</div>

<div class="message" style="padding: 10px;">
@yield('message')
</div>
</div>
</body>
</html>

0 comments on commit 2d21bc2

Please sign in to comment.