From 319a406d6f474d192405a4be84c363a5139419c4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 11:00:44 +0100 Subject: [PATCH 001/359] 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 -- 2.49.1 From b82ac7ec592a95e69d7ba965aa4925472ce79bd1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 12:12:54 +0100 Subject: [PATCH 002/359] 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:18:49 +0100 Subject: [PATCH 003/359] fixed identation --- website/login.php | 283 +++++++++++++++++++++++----------------------- 1 file changed, 141 insertions(+), 142 deletions(-) diff --git a/website/login.php b/website/login.php index 8d6a319..73e6216 100644 --- a/website/login.php +++ b/website/login.php @@ -1,159 +1,158 @@ - - - - - - MyHyvesbook+ - - -
- MyHyvesbook+ -
+ + + + + + MyHyvesbook+ + + +
+ MyHyvesbook+ +
- -

Welkom bij MyHyvesbook+

- + +

Welkom bij MyHyvesbook+

+ - + - -
- - - - - - + + + + + -- 2.49.1 From eeedbe5c05473bf97982d69f27b1fdeaa22f18ca Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 14:19:08 +0100 Subject: [PATCH 004/359] 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" >
+ +
+ +
+ -- 2.49.1 From 1b97b1fad311bea46363308e06b7cf790e651306 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 14:32:56 +0100 Subject: [PATCH 005/359] slightly modified css --- website/styles/adminpanel.css | 6 ++++++ website/views/adminpanel.php | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index f22de20..e7d84f4 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -6,6 +6,12 @@ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } +.admin-panel input[type="submit"], button { + background-color: #845663; + color: white; + padding: 5px; +} + .admin-actions { display: inline-block; margin: 10px; diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 2723e40..3aa9e63 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -87,7 +87,6 @@ -
-- 2.49.1 From 36192c6bf4677ec75047dc9272bed6b3ac60617b Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 14:44:59 +0100 Subject: [PATCH 006/359] fixed spelling and grammar --- website/login.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/website/login.php b/website/login.php index 73e6216..9211818 100644 --- a/website/login.php +++ b/website/login.php @@ -16,15 +16,15 @@

Welkom bij MyHyvesbook+