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

Merge branch 'master' into hendrik-post

Browse Source
This commit is contained in:
Hendrik
2017-01-26 13:46:24 +01:00
parent 91aca6baa7 e24960c319
commit 51cc736aca
42 changed files with 1103 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
website/public/profile.php
View File

@@ -2,6 +2,7 @@
<html>
<head>
<?php include("../views/head.php"); ?>
<script src="js/masonry.js"></script>
<script src="js/post.js"></script>
<style>
@@ -27,6 +28,15 @@ $profile_friends = selectAllFriends($userID);
$profile_groups = selectAllUserGroups($userID);
$posts = selectAllUserPosts($userID);
if ($userID == $_SESSION["userID"]) {
$friendship_status = -1;
$masonry_mode = 1;
} else {
$friendship_status = $user["friend_status"];
$masonry_mode = 0;
}
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
@@ -39,5 +49,28 @@ include("../views/profile.php");
/* This adds the footer. */
include("../views/footer.php");
?>
<script src="js/friendButtons.js"></script>
<script src="js/masonry.js"></script>
<script>
var posts;
$(document).ready(function() {
userID = <?= $userID ?>;
placeFriendButtons();
masonry(<?= $masonry_mode ?>);
// alert("blap");
// $.post("API/getPosts.php", { usr : userID }, "json")
// .done(function(data) {
// posts = JSON.parse(data);
// alert(posts[0]["content"]);
// }).fail(function() {
// alert("failure...");
// });
});
</script>
</body>
</html>