Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings

This commit is contained in:
Marijn Jansen
2017-01-12 11:36:26 +01:00
6 changed files with 91 additions and 2 deletions

21
website/search.php Normal file
View File

@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
/* Add your view files here. */
include("views/search-view.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

View File

@@ -41,6 +41,13 @@ body {
min-height: 100%;
}
.platform {
padding: 20px;
border-radius: 10px;
background-color: #FFFFFF;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
::selection {
background: #845663;
color: white;

View File

@@ -0,0 +1,18 @@
.settings {
}
.settings input {
padding: 10px;
margin: 5px;
border-radius: 10px;
width: 200px;
}
.settings-password {
}
.settings-profile {
}

View File

@@ -3,8 +3,8 @@
<a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
</div>
<div id="header-search">
<form action="php/search.php" method="get">
<input type="text" placeholder="search people, friends and pages" />
<form action="search.php" method="get">
<input name="search" type="text" placeholder="search people, friends and pages" />
<input type="submit" value="Zoek"/>
</form>
</div>

View File

@@ -0,0 +1,5 @@
<div class="content">
<div class="platform">
Hey
</div>
</div>

View File

@@ -1,3 +1,41 @@
<div class="content">
<div class="settings">
<form class="settings-profile">
<input type="text"
name="first-name"
placeholder="Voornaam"
><br />
<input type="text"
name="last-name"
placeholder="Lastname"
><br />
<input type="text"
name="place"
placeholder="Woonplaats"
><br />
<input type="submit"
>
</form>
<form class="settings-password platform" method="post">
<h5>Verander Wachtwoord</h5>
<br />
<input type="password"
name="password-old"
placeholder="Oud wachtwoord"
><br />
<input type="password"
name="password-new"
placeholder="Nieuw wachtwoord"
><br />
<input type="password"
name="password-confirm"
placeholder="Bevestig wachtwoord"
><br />
<input type="submit"
value="Verander wachtwoord"
>
</form>
</div>
</div>