From 319a406d6f474d192405a4be84c363a5139419c4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 11:00:44 +0100 Subject: [PATCH 1/4] Added settings page. --- website/settings.php | 19 +++++++++++++++++++ website/styles/settings.css | 0 website/views/head.php | 2 +- website/views/header.php | 4 ++-- website/views/settings-view.php | 3 +++ 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 website/settings.php create mode 100644 website/styles/settings.css create mode 100644 website/views/settings-view.php diff --git a/website/settings.php b/website/settings.php new file mode 100644 index 0000000..8d154b1 --- /dev/null +++ b/website/settings.php @@ -0,0 +1,19 @@ + + + + + + + diff --git a/website/styles/settings.css b/website/styles/settings.css new file mode 100644 index 0000000..e69de29 diff --git a/website/views/head.php b/website/views/head.php index 3266463..2fcf9f0 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -13,7 +13,7 @@ @import url("styles/header.css"); @import url("styles/menu.css"); @import url("styles/footer.css"); - @import url("styles/chat.css"); + @import url("styles/settings.css"); diff --git a/website/views/header.php b/website/views/header.php index 45cb2b9..18e65ec 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -10,8 +10,8 @@
- | - | + | + |
diff --git a/website/views/settings-view.php b/website/views/settings-view.php new file mode 100644 index 0000000..f7e421d --- /dev/null +++ b/website/views/settings-view.php @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file From b82ac7ec592a95e69d7ba965aa4925472ce79bd1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 12:12:54 +0100 Subject: [PATCH 2/4] More settings --- website/styles/settings.css | 8 ++++++++ website/views/settings-view.php | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/website/styles/settings.css b/website/styles/settings.css index df8b1ca..5f6dca1 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -9,6 +9,14 @@ width: 200px; } +.settings label { + width: 200px; +} + +.settings input[type="password"], .settings input[type="text"] { + border: 1px solid black; +} + .settings-password { } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index f77625a..09ca102 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -1,14 +1,18 @@
-
+ +
+
+ Date: Thu, 12 Jan 2017 14:19:08 +0100 Subject: [PATCH 3/4] More fields --- website/index.php | 4 ++-- website/styles/settings.css | 8 ++++++-- website/views/settings-view.php | 11 +++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/website/index.php b/website/index.php index b808caf..53a37aa 100644 --- a/website/index.php +++ b/website/index.php @@ -10,7 +10,7 @@ MyHyvesbook+
- +

Welkom

@@ -40,7 +40,7 @@ class="close" title="Close Modal">× - +

Registreer je account

diff --git a/website/styles/settings.css b/website/styles/settings.css index 5f6dca1..01f4a4c 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -10,10 +10,14 @@ } .settings label { - width: 200px; + width: 125px; + display: inline-block; + text-align: right; } -.settings input[type="password"], .settings input[type="text"] { +.settings input[type="password"], +.settings input[type="text"], +.settings input[type="date"] { border: 1px solid black; } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 09ca102..31e9810 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -17,6 +17,17 @@ name="place" placeholder="Woonplaats" >
+ +
+ +
+ From 2bc11a87e4ab78aa632ea18698507645acfffa15 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 14:49:11 +0100 Subject: [PATCH 4/4] Added Email settings --- website/styles/settings.css | 7 ++++-- website/views/settings-view.php | 41 +++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/website/styles/settings.css b/website/styles/settings.css index 01f4a4c..933f8b0 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -2,7 +2,8 @@ } -.settings input { +.settings input, +.settings textarea{ padding: 10px; margin: 5px; border-radius: 10px; @@ -17,7 +18,9 @@ .settings input[type="password"], .settings input[type="text"], -.settings input[type="date"] { +.settings input[type="date"], +.settings input[type="email"], +.settings textarea{ border: 1px solid black; } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 31e9810..12415b4 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -1,32 +1,47 @@
- +
Profiel Instllingen
+
- +
- +
- +
- +
+ + +
+ @@ -52,5 +67,21 @@ value="Verander wachtwoord" >
+ +
+
Verander Email
+
+
+
+ +
\ No newline at end of file