MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'marijn-404' into 'master'

Browse Source 
404 page

See merge request !148
This commit was merged in pull request #152.
This commit is contained in:
Marijn Jansen
2017-01-30 14:31:03 +01:00
parent b30ef0d0cf 20b951cad2
commit 25957c6c78
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/.htaccess
View File

@@ -1,7 +1,7 @@
Options +FollowSymLinks
RewriteEngine On
ErrorDocument 404 /error404.jpg
ErrorDocument 404 /error/404.php
RewriteCond %{SCRIPT_FILENAME} !-d
RewriteCond %{SCRIPT_FILENAME} !-f

9
website/public/error/404.php Normal file
View File

@@ -0,0 +1,9 @@
<?php
require_once "../../views/messagepage.php";
messagePage("
<div class='error-page'>
<h1>404</h1>
<h4>Wrong link...</h4><br />
<img height='486' width='204' src='../img/zelda.png'>
</div>");

BIN
website/public/img/zelda.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 147 KiB

15
website/public/styles/resetpassword.css → website/public/styles/message-page.css
View File

@@ -1,6 +1,9 @@
body {
background-color: #FBC02D;
}
.password-change {
height: 100%;
background-color: #FBC02D;
margin: auto;
}
@@ -12,6 +15,14 @@
margin: 30px auto auto;
display: block;
}
.password-change img {
.top-logo img {
width: 50%;
}
.error-page {
text-align: center;
}
.error-page img {
vertical-align: middle;
}

8
website/views/messagepage.php
View File

@@ -5,14 +5,14 @@ function messagePage(string $content) {
<html>
<head>
<style>
@import url(styles/main.css);
@import url(styles/settings.css);
@import url(styles/resetpassword.css);
@import url(../styles/main.css);
@import url(../styles/settings.css);
@import url(../styles/message-page.css);
</style>
</head>
<body>
<div class='password-change'>
<div class='top-logo'><a href='login.php'><img src='img/top-logo.png' alt='MyHyvesbook+'/></a></div>
<div class='top-logo'><a href='../login.php'><img src='../img/top-logo.png' alt='MyHyvesbook+'/></a></div>
<div class='item-box platform'>$content</div>
</div>
</body>