Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat
This commit is contained in:
Marijn Jansen
BIN
website/img/add-friend.png
Normal file
BIN
website/img/add-friend.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 676 B |
18
website/profile.php
Normal file
18
website/profile.php
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<?php
|
||||||
|
include("views/head.php");
|
||||||
|
?>
|
||||||
|
<body>
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This view adds the main layout over the screen.
|
||||||
|
* Header, menu, footer.
|
||||||
|
*/
|
||||||
|
include("views/main.php");
|
||||||
|
|
||||||
|
/* Add your view files here. */
|
||||||
|
include("views/profile.php");
|
||||||
|
?>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -35,6 +35,7 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
|
padding: 20px;
|
||||||
margin-top: 80px;
|
margin-top: 80px;
|
||||||
margin-left: 256px;
|
margin-left: 256px;
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
@@ -117,3 +118,26 @@ td {
|
|||||||
text-align: left;
|
text-align: left;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Custom title box, appears instantaneously */
|
||||||
|
a:hover {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
a[data-title]:hover:after {
|
||||||
|
content: attr(data-title);
|
||||||
|
padding: 4px 4px;
|
||||||
|
color: #FFFFFF;
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 100%;
|
||||||
|
z-index: 20;
|
||||||
|
white-space: nowrap;
|
||||||
|
-moz-border-radius: 5px;
|
||||||
|
-webkit-border-radius: 5px;
|
||||||
|
border-radius: 5px;
|
||||||
|
-moz-box-shadow: 0px 0px 4px #222;
|
||||||
|
-webkit-box-shadow: 0px 0px 4px #222;
|
||||||
|
box-shadow: 0px 0px 4px #222;
|
||||||
|
background-color: #333;
|
||||||
|
}
|
||||||
|
|||||||
62
website/styles/profile.css
Normal file
62
website/styles/profile.css
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
.profile-box, .item-box, .post-box {
|
||||||
|
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-box {
|
||||||
|
min-height: 150px;
|
||||||
|
padding: 25px;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-box .profile-picture {
|
||||||
|
width: 150px;
|
||||||
|
height: 150px;
|
||||||
|
margin: 0 20px 20px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-box .profile-username {
|
||||||
|
padding-top: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item-box {
|
||||||
|
width: calc(50% - 60px);
|
||||||
|
margin: 20px 0 0 0;
|
||||||
|
padding: 25px;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.posts {
|
||||||
|
background-color: red;
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-box {
|
||||||
|
float: left;
|
||||||
|
width: 250px;
|
||||||
|
margin: 20px 20px 0 0;
|
||||||
|
padding: 25px;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-box img {
|
||||||
|
width: 250px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-box .post-date {
|
||||||
|
float: right;
|
||||||
|
color: #aaaaaa;
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.friend-request {
|
||||||
|
float: right;
|
||||||
|
padding: 10px;
|
||||||
|
border-radius: 3px;
|
||||||
|
background-color: #845663;
|
||||||
|
color: #FFFFFF;
|
||||||
|
transition-duration: 250ms;
|
||||||
|
}
|
||||||
|
|
||||||
|
.friend-request:hover {
|
||||||
|
background-color: #B78996;
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
<style>
|
<style>
|
||||||
/* Add your css files here. */
|
/* Add your css files here. */
|
||||||
@import url("styles/main.css");
|
@import url("styles/main.css");
|
||||||
|
@import url("styles/profile.css");
|
||||||
@import url("styles/font-awesome.css");
|
@import url("styles/font-awesome.css");
|
||||||
@import url("styles/header.css");
|
@import url("styles/header.css");
|
||||||
@import url("styles/menu.css");
|
@import url("styles/menu.css");
|
||||||
|
|||||||
98
website/views/profile.php
Normal file
98
website/views/profile.php
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
<div class="content">
|
||||||
|
<div class="profile-box">
|
||||||
|
<img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
|
||||||
|
<div class="friend-request">
|
||||||
|
<p><img src="../website/img/add-friend.png"> Als vriend toevoegen</p>
|
||||||
|
</div>
|
||||||
|
<h1 class="profile-username">[gebruikersnaam]</h1>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="item-box left">
|
||||||
|
<h2>Vrienden</h2>
|
||||||
|
<p>
|
||||||
|
<a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
|
||||||
|
<a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
|
||||||
|
<a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
|
||||||
|
<a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
|
||||||
|
<a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
|
||||||
|
<a href="#vrienden">...en nog 25 anderen!</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="item-box right">
|
||||||
|
<h2>Groepen</h2>
|
||||||
|
<p>
|
||||||
|
<a href="#" data-title="[groepsnaam]"><img class="profile-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
|
||||||
|
<a href="#" data-title="[groepsnaam]"><img class="profile-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
|
||||||
|
<a href="#" data-title="[groepsnaam]"><img class="profile-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
|
||||||
|
<a href="#" data-title="[groepsnaam]"><img class="profile-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
|
||||||
|
<a href="#" data-title="[groepsnaam]"><img class="profile-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
|
||||||
|
<a href="#groepen">...en nog 6 anderen!</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="posts">
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Tekst</h2>
|
||||||
|
<p>Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||||
|
<p class="post-date">Enkele minuten geleden geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Afbeelding</h2>
|
||||||
|
<img src="http://i.imgur.com/tr9amK8.png" alt="Foto van [gebruikersnaam]">
|
||||||
|
<p class="post-date">Gisteren geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Post</h2>
|
||||||
|
<video width="250" controls>
|
||||||
|
<source src="http://i.imgur.com/ujAO1Dl.mp4" type="video/mp4">
|
||||||
|
</video>
|
||||||
|
<p class="post-date">Maandag geplaatst</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-box">
|
||||||
|
<h2>Post</h2>
|
||||||
|
<p class="post-date">4 Januari geplaatst</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
Reference in New Issue
Block a user