From 41e172f353c092780412f888f51590655de8a181 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:56:31 +0100 Subject: [PATCH 01/12] Added professional images of cats. --- website/views/profile.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/website/views/profile.php b/website/views/profile.php index 1207bd9..ad4c7f4 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -41,6 +41,14 @@ +
+
+

Glitterzz :3

+ Foto van [gebruikersnaam] + +
+
+

Tekst

@@ -49,6 +57,22 @@
+
+
+

woooow

+ Foto van [gebruikersnaam] + +
+
+ +
+
+

0.0

+ Foto van [gebruikersnaam] + +
+
+

Tekst

From 655c2ccbebaf3ec56ce0fe4b4bcdcb1b43f21bc3 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 16:02:02 +0100 Subject: [PATCH 02/12] Small Ajustments --- website/styles/chat.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/styles/chat.css b/website/styles/chat.css index 6874372..d76e964 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -92,8 +92,8 @@ } .chat-field input[type="submit"] { - width: 60px; + width: auto; background-color: #845663; color: white; - padding: 5px; + padding: 5px 10px; } \ No newline at end of file From 1858a0964e2cb80c5aa763ec91e56dd3326e019c Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 10:44:30 +0100 Subject: [PATCH 03/12] Added some .idea files to the gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d68555a..b1a2ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ # User-specific stuff: .idea/workspace.xml .idea/tasks.xml +.idea/deployment.xml +.idea/webServers.xml # Sensitive or high-churn files: .idea/dataSources/ From 3558d80a57b523c25e4cade2484618ca6491ae4a Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:12:47 +0100 Subject: [PATCH 04/12] Added .idea/* to .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d68555a..49955a1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,7 @@ # User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml +.idea/* # Sensitive or high-churn files: .idea/dataSources/ From a353cfb1560fe91fb2316f0073936e1e5fc82fec Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:14:45 +0100 Subject: [PATCH 05/12] Retry gitignore: changed .idea/* to /.idea/* --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 49955a1..acadb23 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ # User-specific stuff: -.idea/* +/.idea/* # Sensitive or high-churn files: .idea/dataSources/ From 72d3a5ad8a735687deab004a08633cff65537780 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:16:57 +0100 Subject: [PATCH 06/12] added adminpanel main layout/concept --- website/admin.php | 21 +++++++++ website/styles/adminpanel.css | 64 ++++++++++++++++++++++++++++ website/views/adminpanel.php | 80 +++++++++++++++++++++++++++++++++++ website/views/head.php | 2 +- 4 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 website/admin.php create mode 100644 website/styles/adminpanel.css create mode 100644 website/views/adminpanel.php diff --git a/website/admin.php b/website/admin.php new file mode 100644 index 0000000..8d8f8b5 --- /dev/null +++ b/website/admin.php @@ -0,0 +1,21 @@ + + + + + + + diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css new file mode 100644 index 0000000..0bd8f1c --- /dev/null +++ b/website/styles/adminpanel.css @@ -0,0 +1,64 @@ +.admin-panel { + margin: auto; + background-color: white; + border-radius: 10px; + padding: 15px; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} + +.admin-options { +} + +.admin-searchbar { + display: inline-block; + margin: 10px; + vertical-align: top; +} + +.admin-searchinput { + border: 2px solid #B78996; + border-radius: 2px; + margin-bottom: 10px; +} + +.admin-filter { + display: inline-block; + margin: 10px; + vertical-align: top; + margin-right: 100px; +} + +.admin-actions { + display: inline-block; + margin: 10px; + vertical-align: top; +} + +.admin-users { + margin: 10px; +} + +.usertable { + width: 100%; +} + +.usertable .table-checkbox {width: 20px} +.usertable .table-username {width: 150px} +.usertable .table-action {width: 200px} + +.usertable th, td { + border-bottom: 1px solid #ddd; + padding: 3px; +} + +.usertable tr { + text-align: left; +} + +.usertable tr:hover { + background-color: #f5f5f5; +} + +/*div { + border: 1px solid black; +}*/ diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php new file mode 100644 index 0000000..1d7b509 --- /dev/null +++ b/website/views/adminpanel.php @@ -0,0 +1,80 @@ + + + + + + Admin Panel + + +
+
+
+
+ + +
+

Show users:

+ Active
+ Muted
+ Banned +
+ +
+

Actions:

+ Mute
+ Ban
+ Unban

+ +
+
+
+

Users:

+ + + + + + + + + + + + + + + + + + + + +
UserBan reasonAction
John Smithunregulated time travel +
+ + +
+
poey jokeaiml33t h4xx +
+ + +
+
+
+ +
+
+ + diff --git a/website/views/head.php b/website/views/head.php index 3266463..4444d97 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/adminpanel.css"); @import url("styles/chat.css"); From 559fe9bb9866adea443bf96c2c2b233572467bb1 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:20:44 +0100 Subject: [PATCH 07/12] Made grid layout responsive --- website/styles/profile.css | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/website/styles/profile.css b/website/styles/profile.css index b64bec0..123c2fa 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -34,18 +34,41 @@ .posts { z-index: -1; + margin-right: 0; + width: calc(100% + 15px); } .post-box { display: inline-flex; - width: 250px; - margin: 20px 20px 0 0; + margin: 20px 15px 0 0; padding: 25px; background-color: #FFFFFF; } +/* fullscreen */ +.post-box { + width: calc(25% - 68px); +} + +@media only screen and (max-width: 1500px) { + .post-box { + width: calc(50% - 67px); + } +} + +/* mobile */ +@media only screen and (max-width: 1000px) { + .post-box { + width: calc(100% - 65px); + } +} + +.post { + width: 100%; +} + .post img { - width: 250px; + width: 100%; } .post .post-date { From 687b08f440d691ff1aa41cd5dd2f99395107d509 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:29:17 +0100 Subject: [PATCH 08/12] Made friends and groups box responsive --- website/styles/profile.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/website/styles/profile.css b/website/styles/profile.css index 123c2fa..377c307 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -28,6 +28,12 @@ width: calc(50% - 60px); } +@media only screen and (max-width: 900px) { + .item-box { + width: calc(100% - 50px); + } +} + .item-box-full-width { width: calc(100% - 50px); } From fffc418f4c90e514e756e7bd7e69258e6e35b4eb Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:38:56 +0100 Subject: [PATCH 09/12] Changed style of windows, we now use the platform class. --- website/styles/profile.css | 4 ---- website/views/group.php | 24 ++++++++++++------------ website/views/profile.php | 32 ++++++++++++++++---------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/website/styles/profile.css b/website/styles/profile.css index 377c307..1ac9a2b 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -1,7 +1,3 @@ -.profile-box, .item-box, .item-box-full-width, .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; diff --git a/website/views/group.php b/website/views/group.php index 6a99b56..391ed26 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -1,5 +1,5 @@
-
+

Groep verlaten

@@ -8,7 +8,7 @@

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.

-
+

Leden

[gebruikersnaam]'s profielfoto @@ -42,7 +42,7 @@

-
+

Tekst

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.

@@ -50,7 +50,7 @@
-
+

Tekst

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.

@@ -58,7 +58,7 @@
-
+

Tekst

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.

@@ -66,7 +66,7 @@
-
+

Tekst

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.

@@ -74,7 +74,7 @@
-
+

Tekst

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.

@@ -82,7 +82,7 @@
-
+

Tekst

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.

@@ -90,7 +90,7 @@
-
+

Tekst

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.

@@ -98,7 +98,7 @@
-
+

Afbeelding

Foto van [gebruikersnaam] @@ -106,7 +106,7 @@
-
+

Post

-
+

Post

diff --git a/website/views/profile.php b/website/views/profile.php index ad4c7f4..9675a04 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,5 +1,5 @@
-
+

Als vriend toevoegen

@@ -8,7 +8,7 @@

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.

-
+

Vrienden

[gebruikersnaam]'s profielfoto @@ -20,7 +20,7 @@

-
+

Groepen

[groepsnaam]'s logo @@ -33,7 +33,7 @@

-
+

Tekst

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.

@@ -41,7 +41,7 @@
-
+

Glitterzz :3

Foto van [gebruikersnaam] @@ -49,7 +49,7 @@
-
+

Tekst

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.

@@ -57,7 +57,7 @@
-
+

woooow

Foto van [gebruikersnaam] @@ -65,7 +65,7 @@
-
+

0.0

Foto van [gebruikersnaam] @@ -73,7 +73,7 @@
-
+

Tekst

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.

@@ -81,7 +81,7 @@
-
+

Tekst

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.

@@ -89,7 +89,7 @@
-
+

Tekst

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.

@@ -97,7 +97,7 @@
-
+

Tekst

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.

@@ -105,7 +105,7 @@
-
+

Tekst

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.

@@ -113,7 +113,7 @@
-
+

Afbeelding

Foto van [gebruikersnaam] @@ -121,7 +121,7 @@
-
+

Post

-
+

Post

From cfa119fef0585306525f897e5e54fb7ea0ecb623 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:54:56 +0100 Subject: [PATCH 10/12] added check all box --- website/styles/adminpanel.css | 10 ++++------ website/views/adminpanel.php | 26 ++++++++++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index 0bd8f1c..15ecfdc 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -6,7 +6,10 @@ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } -.admin-options { +.admin-actions { + display: inline-block; + margin: 10px; + vertical-align: top; } .admin-searchbar { @@ -28,11 +31,6 @@ margin-right: 100px; } -.admin-actions { - display: inline-block; - margin: 10px; - vertical-align: top; -} .admin-users { margin: 10px; diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 1d7b509..1a9d90b 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -4,6 +4,17 @@ Admin Panel +
@@ -30,15 +41,18 @@ Unban

-
+
+

Users:

- - - - - + + + + + From 96c114cc103df2ee6ac5cca9853b0f1d0edc906b Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:59:48 +0100 Subject: [PATCH 11/12] added ban status --- website/styles/adminpanel.css | 1 + website/views/adminpanel.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index 15ecfdc..f22de20 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -42,6 +42,7 @@ .usertable .table-checkbox {width: 20px} .usertable .table-username {width: 150px} +.usertable .table-status {width: 100px} .usertable .table-action {width: 200px} .usertable th, td { diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 1a9d90b..2723e40 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -51,12 +51,14 @@ - + + + +
UserBan reasonAction
+ + UserBan reasonAction
UserBan reasonStatusComment Action
John SmithBanned unregulated time travel
@@ -72,6 +74,7 @@
poey jokeaimBanned l33t h4xx From 5c9674450799e676b947818d0d87983b259da503 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 13:03:46 +0100 Subject: [PATCH 12/12] Datepicker added --- website/bronvermelding.txt | 1 + website/js/dobPicker.js | 123 +++++++++++++++++++++++++++++++ website/js/dobPicker.min.js | 1 + website/{index.php => login.php} | 82 ++++++++++++--------- website/styles/index.css | 32 ++++++-- 5 files changed, 197 insertions(+), 42 deletions(-) create mode 100644 website/bronvermelding.txt create mode 100644 website/js/dobPicker.js create mode 100644 website/js/dobPicker.min.js rename website/{index.php => login.php} (68%) diff --git a/website/bronvermelding.txt b/website/bronvermelding.txt new file mode 100644 index 0000000..54927c8 --- /dev/null +++ b/website/bronvermelding.txt @@ -0,0 +1 @@ +http://www.jqueryscript.net/time-clock/Minimalist-jQuery-Plugin-For-Birthday-Selector-DOB-Picker.html diff --git a/website/js/dobPicker.js b/website/js/dobPicker.js new file mode 100644 index 0000000..9440153 --- /dev/null +++ b/website/js/dobPicker.js @@ -0,0 +1,123 @@ +/** + * jQuery DOB Picker + * Website: https://github.com/tyea/dobpicker + * Version: 1.0 + * Author: Tom Yeadon + * License: BSD 3-Clause + */ + +jQuery.extend({ + + dobPicker: function(params) { + + // set the defaults + if (typeof(params.dayDefault)==='undefined') params.dayDefault = 'Day'; + if (typeof(params.monthDefault)==='undefined') params.monthDefault = 'Month'; + if (typeof(params.yearDefault)==='undefined') params.yearDefault = 'Year'; + if (typeof(params.minimumAge)==='undefined') params.minimumAge = 12; + if (typeof(params.maximumAge)==='undefined') params.maximumAge = 80; + + // set the default messages + $(params.daySelector).append(''); + $(params.monthSelector).append(''); + $(params.yearSelector).append(''); + + // populate the day select + for (i = 1; i <= 31; i++) { + if (i <= 9) { + var val = '0' + i; + } else { + var val = i; + } + $(params.daySelector).append(''); + } + + // populate the month select + var months = [ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" + ]; + + for (i = 1; i <= 12; i++) { + if (i <= 9) { + var val = '0' + i; + } else { + var val = i; + } + $(params.monthSelector).append(''); + } + + // populate the year select + var date = new Date(); + var year = date.getFullYear(); + var start = year - params.minimumAge; + var count = start - params.maximumAge; + + for (i = start; i >= count; i--) { + $(params.yearSelector).append(''); + } + + // do the logic for the day select + $(params.daySelector).change(function() { + + $(params.monthSelector)[0].selectedIndex = 0; + $(params.yearSelector)[0].selectedIndex = 0; + $(params.yearSelector + ' option').removeAttr('disabled'); + + if ($(params.daySelector).val() >= 1 && $(params.daySelector).val() <= 29) { + + $(params.monthSelector + ' option').removeAttr('disabled'); + + } else if ($(params.daySelector).val() == 30) { + + $(params.monthSelector + ' option').removeAttr('disabled'); + $(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled'); + + } else if($(params.daySelector).val() == 31) { + + $(params.monthSelector + ' option').removeAttr('disabled'); + $(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled'); + $(params.monthSelector + ' option[value="04"]').attr('disabled', 'disabled'); + $(params.monthSelector + ' option[value="06"]').attr('disabled', 'disabled'); + $(params.monthSelector + ' option[value="09"]').attr('disabled', 'disabled'); + $(params.monthSelector + ' option[value="11"]').attr('disabled', 'disabled'); + + } + + }); + + // do the logic for the month select + $(params.monthSelector).change(function() { + + $(params.yearSelector)[0].selectedIndex = 0; + $(params.yearSelector + ' option').removeAttr('disabled'); + + if ($(params.daySelector).val() == 29 && $(params.monthSelector).val() == '02') { + + $(params.yearSelector + ' option').each(function(index) { + if (index !== 0) { + var year = $(this).attr('value'); + var leap = !((year % 4) || (!(year % 100) && (year % 400))); + if (leap === false) { + $(this).attr('disabled', 'disabled'); + } + } + }); + + } + + }); + + } + +}); diff --git a/website/js/dobPicker.min.js b/website/js/dobPicker.min.js new file mode 100644 index 0000000..b82c3a2 --- /dev/null +++ b/website/js/dobPicker.min.js @@ -0,0 +1 @@ +jQuery.extend({dobPicker:function(a){for("undefined"==typeof a.dayDefault&&(a.dayDefault="Day"),"undefined"==typeof a.monthDefault&&(a.monthDefault="Month"),"undefined"==typeof a.yearDefault&&(a.yearDefault="Year"),"undefined"==typeof a.minimumAge&&(a.minimumAge=12),"undefined"==typeof a.maximumAge&&(a.maximumAge=80),$(a.daySelector).append('"),$(a.monthSelector).append('"),$(a.yearSelector).append('"),i=1;i<=31;i++){if(i<=9)var b="0"+i;else var b=i;$(a.daySelector).append('")}var c=["January","February","March","April","May","June","July","August","September","October","November","December"];for(i=1;i<=12;i++){if(i<=9)var b="0"+i;else var b=i;$(a.monthSelector).append('")}var d=new Date,e=d.getFullYear(),f=e-a.minimumAge,g=f-a.maximumAge;for(i=f;i>=g;i--)$(a.yearSelector).append('");$(a.daySelector).change(function(){$(a.monthSelector)[0].selectedIndex=0,$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),$(a.daySelector).val()>=1&&$(a.daySelector).val()<=29?$(a.monthSelector+" option").removeAttr("disabled"):30==$(a.daySelector).val()?($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled")):31==$(a.daySelector).val()&&($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="04"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="06"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="09"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="11"]').attr("disabled","disabled"))}),$(a.monthSelector).change(function(){$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),29==$(a.daySelector).val()&&"02"==$(a.monthSelector).val()&&$(a.yearSelector+" option").each(function(a){if(0!==a){var b=$(this).attr("value"),c=!(b%4||!(b%100)&&b%400);c===!1&&$(this).attr("disabled","disabled")}})})}}); diff --git a/website/index.php b/website/login.php similarity index 68% rename from website/index.php rename to website/login.php index b808caf..8d6a319 100644 --- a/website/index.php +++ b/website/login.php @@ -2,6 +2,8 @@ + + MyHyvesbook+ @@ -11,30 +13,30 @@ -

Welkom

-
+

Welkom bij MyHyvesbook+

+ -
+ -
+ -
+ -
+