Merge branch 'master' into kevin-prototype

This commit is contained in:
K. Nobel
2017-02-02 13:15:29 +01:00
36 changed files with 408 additions and 125 deletions

View File

@@ -1,12 +1,17 @@
<div class="content">
<div class="profile-box platform">
<img class="left main-picture group-picture" src="<?= $group['picture'] ?>">
<div class="group-button-container"></div>
<h1 class="profile-username"><?= $group['name'] ?></h1>
<p><?= $group['description'] ?></p>
<div class="user-box">
<img class="group-picture main-picture" src="<?= $group["picture"] ?>"><br />
<div class="platform">
<div class="status-buttons-container">
<button disabled class="gray"><?= $group["status"] ?></button>
</div>
<div class="group-button-container"></div>
<div class="profile-info">
<h2><?= $group["name"]?></h2>
<?= $group["description"] ?>
</div>
</div>
</div>
<div class="item-box-full-width platform">
<h2>Leden (<?= $group['members'] ?>)</h2>
<p>

View File

@@ -1,4 +1,8 @@
<meta charset="utf-8">
<meta charset="UTF-8">
<meta name="description" content="MyHyvesbook+ is het sociaal media voor alle coole mensen.">
<meta name="keywords" content="MyHyvesbookPlus,Myhyvesbook+,sociaal,media">
<meta name="author" content="MyHyvesbookplus corporation">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>MyHyvesbook+</title>
<!-- Add your javascript files here. -->
<script src="js/jquery.js"></script>

View File

@@ -14,7 +14,7 @@
echo "<style>@import url('styles/adminbutton.css'); </style>";
}
?>
<a href="logout.php" data-title="Admin"><i class="fa fa-sign-out"></i></a>
<a href="logout.php" data-title="Uitloggen"><i class="fa fa-sign-out"></i></a>
</section>
<section id="friend-request-section">
<h4>

View File

@@ -2,11 +2,17 @@
$postID = $_GET['postID'];
$post = selectPostById($postID)->fetch(PDO::FETCH_ASSOC);
$fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . ")";
session_start();
?>
<div class='post-header header'>
<h4><?=$post['title']?></h4>
<form method="post" onclick=""><span class="delete-post">verwijder post</span><br /></form>
<?php if (checkPermissionOnPost($postID, $_SESSION["userID"])) {?>
<button class="deleteButton"
onclick="deletePost('<?=$postID?>')"
type="submit">
<i class="fa fa-trash"></i>
<span>Verwijder post</span>
</button><br />
<?php } ?>
<span class='postinfo'>
gepost door <?=$fullname?>,
<span class='posttime' title='<?=$post['creationdate']?>'>
@@ -24,7 +30,7 @@ session_start();
<form id="newcommentform" onsubmit="return false;">
<input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>">
<textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..." maxlength="1000"></textarea><span></span> <br>
<button onclick="postComment('reaction')" name="button" value="reaction">Reageer!</button>
<button onclick="postComment('reaction')" name="button" value="reaction" class="green"><i class="fa fa-comment"></i> Reageer!</button>
<button onclick="postComment('nietslecht')" name="button" value="nietslecht" class="nietslecht">
<?php
if (checkNietSlecht($postID, $_SESSION["userID"])) {

View File

@@ -31,7 +31,12 @@
<h3>Informatie</h3>
<p>
<ul>
<?php if ($user["showBday"]) { ?>
<li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
<?php } ?>
<?php if ($user["showEmail"]) { ?>
<li>Email: <?= $user["email"] ?></li>
<?php } ?>
<li>Locatie: <?= $user["location"] ?></li>
<li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
</ul>

View File

@@ -48,7 +48,12 @@ $group_n = ($group_currentpage - 1) * $group_perpage;
<label for="filter">
Filter:
</label>
<select name="filter" id="search-filter">
<select name="filter"
id="search-filter"
onchange="$('#user-pagenumber, #group-pagenumber').prop('value', 1);
searchUsers();
searchGroups();
pageNumber();">
<option value="personal"
<?php if ($filter == "personal") echo "selected";?>>
Persoonlijk</option>

View File

@@ -17,6 +17,7 @@ $settings = getSettings();
<input type="text"
name="fname"
id="fname"
maxlength="63"
placeholder="Voornaam"
title="Voornaam"
value="<?=$settings["fname"]?>"
@@ -27,6 +28,7 @@ $settings = getSettings();
<input type="text"
name="lname"
id="lname"
maxlength="63"
placeholder="Achternaam"
value="<?=$settings["lname"]?>"
>
@@ -36,6 +38,7 @@ $settings = getSettings();
<input type="text"
name="location"
id="location"
maxlength="50"
placeholder="Locatie"
value="<?=$settings["location"]?>"
>
@@ -96,6 +99,14 @@ $settings = getSettings();
<?=($settings["showEmail"] ? "checked" : "")?>
>
</li>
<li>
<label for="showProfile">Publiek profiel</label>
<input type="checkbox"
name="showProfile"
id="showProfile"
<?=($settings["showProfile"] ? "checked" : "")?>
>
</li>
<li>
<label for="bio">Bio</label>
<textarea name="bio"
@@ -186,6 +197,7 @@ $settings = getSettings();
<label for="email-old">Huidig Email </label>
<input type="email"
id="email-old"
maxlength="255"
value="<?=$settings["email"]?>"
disabled
>
@@ -194,6 +206,7 @@ $settings = getSettings();
<label for="email">Nieuw Email</label>
<input type="email"
name="email"
maxlength="255"
id="email"
placeholder="Nieuw Email"
>
@@ -203,14 +216,16 @@ $settings = getSettings();
<input type="email"
name="email-confirm"
id="email-confirm"
maxlength="255"
placeholder="Bevestig Email"
>
</li>
<li>
<button type="submit"
name="form"
value="email"
>Verander Email</button>
value="email">
Verander Email
</button>
</li>
</ul>
</form>