Merge branch 'master' into kevin-prototype
This commit is contained in:
@@ -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='../index.php'><img src='../img/top-logo.png' alt='MyHyvesbook+'/></a></div>
|
||||
<div class='item-box platform'>$content</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -26,13 +26,12 @@ echo("
|
||||
<input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>">
|
||||
<textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..."></textarea> <br>
|
||||
<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">
|
||||
<button onclick="postComment('nietslecht')" name="button" value="nietslecht" class="nietslecht">
|
||||
<?php
|
||||
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 {
|
||||
echo 'Vind ik <span class="nietslecht">"Niet slecht."</span>';
|
||||
echo '<img src="img/nietslecht_small.png" /> <span class="nietslecht-text">"Niet slecht."</span>';
|
||||
}
|
||||
?>
|
||||
</button>
|
||||
@@ -51,7 +50,7 @@ echo("
|
||||
<div class='comment'>
|
||||
<div class='commentinfo'>
|
||||
$commentauthor
|
||||
<span class='commentdate', title='$commentdate'>
|
||||
<span class='commentdate' title='$commentdate'>
|
||||
$commentnicetime
|
||||
</span>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user