Merge pull request #6428 from svbergerem/unify-error-pages
Unify error pages
This commit is contained in:
Jonne Haß
commit
4087036e63
14 changed files with 52 additions and 140 deletions
|
|
@ -74,6 +74,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
|
|||
* Bigger mobile publisher [#6261](https://github.com/diaspora/diaspora/pull/6261)
|
||||
* Backend information panel & health checks for known pods [#6290](https://github.com/diaspora/diaspora/pull/6290)
|
||||
* Allow users to view a posts locations on an OpenStreetMap [#6256](https://github.com/diaspora/diaspora/pull/6256)
|
||||
* Redesign and unify error pages [#6428](https://github.com/diaspora/diaspora/pull/6428)
|
||||
|
||||
# 0.5.4.0
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -3,46 +3,32 @@
|
|||
|
||||
html { min-height: 100%; }
|
||||
|
||||
#big-number {
|
||||
font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif;
|
||||
font-size: 250px;
|
||||
line-height: 1em;
|
||||
text-align: center;
|
||||
padding-top: 100px;
|
||||
text-shadow: 0 2px 0 #fff, 0 -1px 0 #999;
|
||||
color: #ddd;
|
||||
}
|
||||
.transparent {
|
||||
opacity: 0.8;
|
||||
}
|
||||
#content {
|
||||
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
font-size: 1.25em;
|
||||
line-height: 1.5em;
|
||||
color: $text-dark-grey;
|
||||
position: absolute;
|
||||
left: 0; right: 0;
|
||||
}
|
||||
|
||||
#error_404 {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
bottom:0px;
|
||||
margin: 0px;
|
||||
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
color: #666;
|
||||
background: image-url("peeping-tom.png") no-repeat bottom;
|
||||
.error-404 {
|
||||
background: image-url('peeping-tom.png') no-repeat bottom;
|
||||
background-attachment: fixed;
|
||||
}
|
||||
|
||||
#big-number {
|
||||
font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif;
|
||||
.error-404,
|
||||
.error-422,
|
||||
.error-500,
|
||||
.error-not-public {
|
||||
background-color: $background-grey;
|
||||
bottom:0px;
|
||||
color: $text-dark-grey;
|
||||
font-family: Helvetica, Arial, sans-serif;
|
||||
height: 100%;
|
||||
margin: 0px;
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
width: 100%;
|
||||
|
||||
.big-number {
|
||||
color: $text-grey;
|
||||
font-family: Helvetica, Arial, sans-serif;
|
||||
font-size: 250px;
|
||||
line-height: 1em;
|
||||
padding-top: 50px;
|
||||
text-shadow: 0 2px 0 #fff, 0 -1px 0 #999;
|
||||
color: #ddd;
|
||||
}
|
||||
|
||||
a {
|
||||
|
|
@ -55,55 +41,7 @@ html { min-height: 100%; }
|
|||
}
|
||||
|
||||
.transparent {
|
||||
filter: alpha(opacity=80);
|
||||
opacity: 0.8;
|
||||
}
|
||||
}
|
||||
|
||||
#error_422 {
|
||||
background-color: #fff;
|
||||
color: #666;
|
||||
text-align: center;
|
||||
font-family: arial, sans-serif;
|
||||
|
||||
div.dialog {
|
||||
width: 25em;
|
||||
padding: 0 4em;
|
||||
margin: 4em auto 0 auto;
|
||||
border: 1px solid #ccc;
|
||||
border-right-color: #999;
|
||||
border-bottom-color: #999;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 100%;
|
||||
color: #f00;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
}
|
||||
|
||||
#error_500 {
|
||||
text-align: center;
|
||||
background-color: rgb(252,252,252);
|
||||
color: #444;
|
||||
font-family: 'helvetica neue', 'helvetica', 'arial', sans-serif;
|
||||
margin: 0;
|
||||
padding: 1em;
|
||||
|
||||
header {
|
||||
height: 100px;
|
||||
background-color: #333;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
#diaspora_logo {
|
||||
position: relative;
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 100%;
|
||||
color: #444;
|
||||
line-height: 1.5em;
|
||||
filter: alpha(opacity = 60);
|
||||
opacity: .6;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,18 +39,6 @@ a.tag { word-break: break-all; }
|
|||
color: inherit;
|
||||
}
|
||||
|
||||
/* bootstrap label fixes for Roboto */
|
||||
.label {
|
||||
padding : 2px 5px;
|
||||
padding-bottom : 3px;
|
||||
|
||||
span {
|
||||
display : inline-block;
|
||||
position : relative;
|
||||
top : 1px;
|
||||
}
|
||||
}
|
||||
|
||||
#back-to-top {
|
||||
display: block;
|
||||
color: white;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,3 @@
|
|||
/* Roboto */
|
||||
@font-face {
|
||||
font-family : Roboto;
|
||||
src : image-url('fonts/Roboto-Regular.ttf');
|
||||
weight : normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family : Roboto-Bold;
|
||||
src : image-url('fonts/Roboto-Bold.ttf');
|
||||
weight : normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family : Roboto-Light;
|
||||
src : image-url('fonts/Roboto-Light.ttf');
|
||||
weight : normal;
|
||||
}
|
||||
|
||||
/* diaspora custom icons font */
|
||||
@font-face {
|
||||
font-family: "diaspora-custom";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,9 @@ class PostsController < ApplicationController
|
|||
respond_to :html, :mobile, :json, :xml
|
||||
|
||||
rescue_from Diaspora::NonPublic do
|
||||
@code = "not-public"
|
||||
respond_to do |format|
|
||||
format.all { render template: "errors/not_public", status: 404, layout: "application" }
|
||||
format.all { render template: "errors/not_public", status: 404, layout: "error_page" }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
- content_for(:page_title) do
|
||||
The page you were looking for doesn't exist (404)
|
||||
|
||||
#big-number.transparent
|
||||
.transparent.big-number
|
||||
404
|
||||
%p
|
||||
%h3
|
||||
These are not the kittens you're looking for. Move along.
|
||||
%p
|
||||
%a{href: "javascript:history.back()"}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
- content_for(:page_title) do
|
||||
The change you wanted was rejected (422)
|
||||
|
||||
.dialog
|
||||
%h1
|
||||
The change you wanted was rejected.
|
||||
%p
|
||||
Maybe you tried to change something you didn't have access to.
|
||||
.transparent.big-number
|
||||
422
|
||||
%h3
|
||||
The change you wanted was rejected.
|
||||
%p
|
||||
Maybe you tried to change something you didn't have access to.
|
||||
|
||||
%p
|
||||
%a{href: "javascript:history.back()"}
|
||||
Go Back?
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
- content_for(:page_title) do
|
||||
We're sorry, but something went wrong (500)
|
||||
|
||||
%header
|
||||
= image_tag "branding/logos/white2x.png", id: "diaspora_logo"
|
||||
|
||||
%h1
|
||||
500: Internal server error.
|
||||
.transparent.big-number
|
||||
500
|
||||
%h3
|
||||
Internal server error.
|
||||
Our bad! Sorry about that. :(
|
||||
|
||||
%p
|
||||
%a{href: "javascript:history.back()"}
|
||||
Go Back?
|
||||
|
|
|
|||
|
|
@ -2,13 +2,9 @@
|
|||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
- content_for :head do
|
||||
= stylesheet_link_tag :error_pages, :media => 'all'
|
||||
|
||||
#big-number.transparent
|
||||
.transparent.big-number
|
||||
404
|
||||
|
||||
#content
|
||||
= t('error_messages.post_not_public_or_not_exist')
|
||||
%br
|
||||
= t('error_messages.login_try_again', :login_link => new_user_session_path).html_safe
|
||||
%h3
|
||||
= t("error_messages.post_not_public_or_not_exist")
|
||||
%p
|
||||
= t("error_messages.login_try_again", login_link: new_user_session_path).html_safe
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
|
||||
= yield(:head)
|
||||
|
||||
%body{id: "error_#{@code}"}
|
||||
%body{class: "error-#{@code}", id: "error_#{@code}"}
|
||||
= yield
|
||||
|
|
|
|||
Loading…
Reference in a new issue