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

Merge branch 'master' into kevin-prototype

Browse Source
This commit is contained in:
K. Nobel
2017-01-30 15:37:57 +01:00
parent 183a98a339 dd017d8885
commit 54b56da445
7 changed files with 42 additions and 14 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 Options +FollowSymLinks
RewriteEngine On RewriteEngine On
ErrorDocument 404 /error404.jpg ErrorDocument 404 /error/404.php
RewriteCond %{SCRIPT_FILENAME} !-d RewriteCond %{SCRIPT_FILENAME} !-d
RewriteCond %{SCRIPT_FILENAME} !-f 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>Verkeerde link...</h4><br />
<img height='25%' width='25%' 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 { .password-change {
height: 100%; height: 100%;
background-color: #FBC02D;
margin: auto; margin: auto;
} }
@@ -12,6 +15,14 @@
margin: 30px auto auto; margin: 30px auto auto;
display: block; display: block;
} }
.password-change img { .top-logo img {
width: 50%; width: 50%;
} }
.error-page {
text-align: center;
}
.error-page img {
vertical-align: middle;
}

13
website/public/styles/post-popup.css
View File

@@ -71,7 +71,16 @@
width: 95%; width: 95%;
} }
.nietslecht { .nietslecht-text {
font-family: Impact, Anton, sans-serif; font-family: Impact, Anton, sans-serif;
text-shadow: -1.5px 0 1px black, 0 1.5px 1px black, 1px 0 1.5px black, 0 -1.5px 1px black; text-shadow: -1px 0 1px black, 0 1px 1px black, 1px 0 1px black, 0 -1px 1px black;
}
.nietslecht {
}
.nietslecht img {
vertical-align: middle;
height: 24px;
width: 24px;
} }

8
website/views/messagepage.php
View File

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

9
website/views/post-view.php
View File

@@ -26,13 +26,12 @@ echo("
<input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>"> <input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>">
<textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..."></textarea> <br> <textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..."></textarea> <br>
<button onclick="postComment('reaction')" name="button" value="reaction">Reageer!</button> <button onclick="postComment('reaction')" name="button" value="reaction">Reageer!</button>
<!-- TODO: if/else op "niet slecht." button voor like/unlike--> <button onclick="postComment('nietslecht')" name="button" value="nietslecht" class="nietslecht">
<button onclick="postComment('nietslecht')" name="button" value="nietslecht">
<?php <?php
if (checkNietSlecht($postID, $_SESSION["userID"])) { if (checkNietSlecht($postID, $_SESSION["userID"])) {
echo 'Trek <span class="nietslecht">"Niet slecht."</span> terug'; echo 'Trek <span class="nietslecht-text">"Niet slecht."</span> terug';
} else { } else {
echo 'Vind ik <span class="nietslecht">"Niet slecht."</span>'; echo '<img src="img/nietslecht_small.png" /> <span class="nietslecht-text">"Niet slecht."</span>';
} }
?> ?>
</button> </button>
@@ -51,7 +50,7 @@ echo("
<div class='comment'> <div class='comment'>
<div class='commentinfo'> <div class='commentinfo'>
$commentauthor $commentauthor
<span class='commentdate', title='$commentdate'> <span class='commentdate' title='$commentdate'>
$commentnicetime $commentnicetime
</span> </span>
</div> </div>