From b8e61e641a48ec6576001bd1e6fd9a8933d9f9eb Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:09:24 +0100 Subject: [PATCH 01/27] Fixed tooltip bug (only worked with hyperlinks before --- website/styles/main.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/styles/main.css b/website/styles/main.css index e43e5d3..69629f5 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -125,11 +125,12 @@ td { } /* Custom title box, appears instantaneously */ -a:hover { +a:hover, img:hover, span:hover, div:hover { position: relative; } -a[data-title]:hover:after { +a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, +div[data-title]:hover:after{ content: attr(data-title); padding: 4px 4px; color: #FFFFFF; @@ -145,4 +146,7 @@ a[data-title]:hover:after { -webkit-box-shadow: 0px 0px 4px #222; box-shadow: 0px 0px 4px #222; background-color: #333; + font-size: 15px; + line-height: normal; + font-family: Arial, sans-serif; } From b4c7bfb1ef72c1c81d72c7885511f2572846e013 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:11:42 +0100 Subject: [PATCH 02/27] We now use inline-flex for the post grid instead of float left. --- website/profile.php | 31 +++++++------ website/styles/profile.css | 11 +++-- website/views/profile.php | 92 +++++++++++++++++++++++--------------- 3 files changed, 78 insertions(+), 56 deletions(-) diff --git a/website/profile.php b/website/profile.php index 0ecdda1..2dc9891 100644 --- a/website/profile.php +++ b/website/profile.php @@ -1,18 +1,21 @@ - - - + + - + /* Add your view files here. */ + include("views/profile.php"); + + /* This adds the footer. */ + include("views/footer.php"); + ?> + diff --git a/website/styles/profile.css b/website/styles/profile.css index da4cc64..da6913b 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -26,23 +26,22 @@ } .posts { - background-color: red; - margin-top: 20px; + z-index: -1; } .post-box { - float: left; + display: inline-flex; width: 250px; margin: 20px 20px 0 0; padding: 25px; background-color: #FFFFFF; } -.post-box img { +.post img { width: 250px; } -.post-box .post-date { +.post .post-date { float: right; color: #aaaaaa; font-size: 0.8em; @@ -51,7 +50,7 @@ .friend-request { float: right; padding: 10px; - border-radius: 3px; + border-radius: 5px; background-color: #845663; color: #FFFFFF; transition-duration: 250ms; diff --git a/website/views/profile.php b/website/views/profile.php index 408f93a..d1f87bd 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -23,75 +23,95 @@

Groepen

- [groepsnaam]'s logo - [groepsnaam]'s logo - [groepsnaam]'s logo - [groepsnaam]'s logo - [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo ...en nog 6 anderen!

-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

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.

-

Enkele minuten geleden geplaatst

+
+

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.

+

Enkele minuten geleden geplaatst

+
-

Afbeelding

- Foto van [gebruikersnaam] -

Gisteren geplaatst

+
+

Afbeelding

+ Foto van [gebruikersnaam] +

Gisteren geplaatst

+
-

Post

- -

Maandag geplaatst

+
+

Post

+ +

Maandag geplaatst

+
-

Post

-

4 Januari geplaatst

+
+

Post

+

4 Januari geplaatst

+
From 5be19ce91d4086c1ebeb56fee6ca4d52e3fb9530 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:42:32 +0100 Subject: [PATCH 03/27] Added group view --- website/group.php | 21 ++++++ website/img/leave-group.png | Bin 0 -> 526 bytes website/styles/profile.css | 19 ++++-- website/views/group.php | 127 ++++++++++++++++++++++++++++++++++++ website/views/profile.php | 2 +- 5 files changed, 162 insertions(+), 7 deletions(-) create mode 100644 website/group.php create mode 100644 website/img/leave-group.png create mode 100644 website/views/group.php diff --git a/website/group.php b/website/group.php new file mode 100644 index 0000000..ad307e2 --- /dev/null +++ b/website/group.php @@ -0,0 +1,21 @@ + + + + + + + diff --git a/website/img/leave-group.png b/website/img/leave-group.png new file mode 100644 index 0000000000000000000000000000000000000000..d8b9cc3ac65b37d84e10d7d0a989414d88ec06bc GIT binary patch literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk5Uj7}P}D}aLRC7!;n><<~a`PD6$%o;xch38xrys0}i*If_Zi-K1}g~{9F=rFTkg2zX65cuIbBWTvyBtkZZb%vaBF0w zcU3T%Z#*<>%IUVpK!2*1xJHzuB$lLFB^RXvDF!10LvvjNLtR6|5JOWdV@oSjGi?Jy zD+7b+*MCev(U6;;l9^VCTf?(12OXdWNstY}`DrEPiAAXl<>lpinR(g8$%zH2dih1^ Uv)|cB0TnTLy85}Sb4q9e0G1fEN&o-= literal 0 HcmV?d00001 diff --git a/website/styles/profile.css b/website/styles/profile.css index da6913b..b64bec0 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -1,4 +1,4 @@ -.profile-box, .item-box, .post-box { +.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); } @@ -8,7 +8,7 @@ background-color: #FFFFFF; } -.profile-box .profile-picture { +.profile-box .profile-picture, .profile-box .group-picture { width: 150px; height: 150px; margin: 0 20px 20px 0; @@ -18,13 +18,20 @@ padding-top: 50px; } -.item-box { - width: calc(50% - 60px); +.item-box, .item-box-full-width { margin: 20px 0 0 0; padding: 25px; background-color: #FFFFFF; } +.item-box { + width: calc(50% - 60px); +} + +.item-box-full-width { + width: calc(100% - 50px); +} + .posts { z-index: -1; } @@ -47,7 +54,7 @@ font-size: 0.8em; } -.friend-request { +.profile-button { float: right; padding: 10px; border-radius: 5px; @@ -56,6 +63,6 @@ transition-duration: 250ms; } -.friend-request:hover { +.profile-button:hover { background-color: #B78996; } \ No newline at end of file diff --git a/website/views/group.php b/website/views/group.php new file mode 100644 index 0000000..6a99b56 --- /dev/null +++ b/website/views/group.php @@ -0,0 +1,127 @@ +
+
+ +
+

Groep verlaten

+
+

[groepnaam]

+

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 + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + + ...en nog 25 anderen! +

+
+ +
+
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

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.

+

Enkele minuten geleden geplaatst

+
+
+ +
+
+

Afbeelding

+ Foto van [gebruikersnaam] +

Gisteren geplaatst

+
+
+ +
+
+

Post

+ +

Maandag geplaatst

+
+
+ +
+
+

Post

+

4 Januari geplaatst

+
+
+
+ +
\ No newline at end of file diff --git a/website/views/profile.php b/website/views/profile.php index d1f87bd..1207bd9 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,7 +1,7 @@
-
+

Als vriend toevoegen

[gebruikersnaam]

From 41e172f353c092780412f888f51590655de8a181 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:56:31 +0100 Subject: [PATCH 04/27] 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] +

Enkele minuten geleden geplaatst

+
+
+

Tekst

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

woooow

+ Foto van [gebruikersnaam] +

Enkele minuten geleden geplaatst

+
+
+ +
+
+

0.0

+ Foto van [gebruikersnaam] +

Enkele minuten geleden geplaatst

+
+
+

Tekst

From 655c2ccbebaf3ec56ce0fe4b4bcdcb1b43f21bc3 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 16:02:02 +0100 Subject: [PATCH 05/27] 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 fae353fee3832f6a90d612f3e20dba0b6317674e Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 11 Jan 2017 16:06:49 +0100 Subject: [PATCH 06/27] Fixed the data-title hover bug --- website/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/styles/main.css b/website/styles/main.css index fb50ae3..0560a25 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -120,7 +120,7 @@ td { } /* Custom title box, appears instantaneously */ -a:hover, img:hover, span:hover, div:hover { +a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover { position: relative; } From 1858a0964e2cb80c5aa763ec91e56dd3326e019c Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 10:44:30 +0100 Subject: [PATCH 07/27] 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 1912e11f76cc4b83020daae356429ee8e1c472b1 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 10:44:58 +0100 Subject: [PATCH 08/27] Added href to the links. Zoek -> search.php Instellingen -> settings.php Uitloggen -> login.php --- website/views/header.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/views/header.php b/website/views/header.php index 45cb2b9..86686a5 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -3,15 +3,15 @@ MyHyvesbook+
- | - | + | + |
From 319a406d6f474d192405a4be84c363a5139419c4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 11:00:44 +0100 Subject: [PATCH 09/27] 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 3558d80a57b523c25e4cade2484618ca6491ae4a Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:12:47 +0100 Subject: [PATCH 10/27] 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 11/27] 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 12/27] 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 + + +
+
+
+
+ +
+

Search

+
+ +
+
+

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 3505090eb9fb93b64cfd91b9c9a82e317490347d Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 11:20:27 +0100 Subject: [PATCH 13/27] Initial search page and added class platform --- website/search.php | 7 +++++++ website/styles/main.css | 7 +++++++ website/views/search-view.php | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 website/search.php create mode 100644 website/views/search-view.php diff --git a/website/search.php b/website/search.php new file mode 100644 index 0000000..e72081b --- /dev/null +++ b/website/search.php @@ -0,0 +1,7 @@ + Date: Thu, 12 Jan 2017 11:20:44 +0100 Subject: [PATCH 14/27] 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 9f3f0d1f961fa1a0d088f45efd6e624312b8de70 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 11:22:30 +0100 Subject: [PATCH 15/27] Real initial search commit --- website/search.php | 28 +++++++++++++++++++++------- website/views/search-view.php | 12 +++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/website/search.php b/website/search.php index e72081b..6a045c3 100644 --- a/website/search.php +++ b/website/search.php @@ -1,7 +1,21 @@ - + + + + + + diff --git a/website/views/search-view.php b/website/views/search-view.php index dec5b7c..4116e31 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -1,7 +1,5 @@ - +
+ Hey +
+
\ No newline at end of file From 687b08f440d691ff1aa41cd5dd2f99395107d509 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Thu, 12 Jan 2017 11:29:17 +0100 Subject: [PATCH 16/27] 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 17/27] 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

4 Januari geplaatst

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

4 Januari geplaatst

From cfa119fef0585306525f897e5e54fb7ea0ecb623 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:54:56 +0100 Subject: [PATCH 18/27] 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 19/27] 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 b82ac7ec592a95e69d7ba965aa4925472ce79bd1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 12:12:54 +0100 Subject: [PATCH 20/27] 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 12:14:09 +0100 Subject: [PATCH 21/27] Changed input default style This makes a clean overall style for the buttons, selects and input fields. Now it looks more the same in all the browsers. --- website/styles/header.css | 10 ++++------ website/styles/main.css | 21 ++++++++++++++++----- website/styles/search.css | 0 3 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 website/styles/search.css diff --git a/website/styles/header.css b/website/styles/header.css index dfbd8a0..d0c9d43 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -26,16 +26,14 @@ header { } #header-search input[type="text"] { - padding: 5px 10px; - height: 19px; - + padding: 0 5px; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -#header-search input[type="submit"] { - margin: 0 0 0 -4px; - padding: 5px; +#header-search input[type="submit"] { + background: none; + color: white; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } diff --git a/website/styles/main.css b/website/styles/main.css index 52df4f0..f426fc0 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -43,6 +43,7 @@ body { .platform { padding: 20px; + margin-bottom: 10px; 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); @@ -65,11 +66,6 @@ body { border: 0; } - -input[type="text"] { - padding: 5px; -} - /* Move element down (clear), below floating elements */ .clear { clear: both; @@ -106,6 +102,10 @@ h5 { font-size: 1.4em; } +ul { + list-style-type: none; +} + p { font-size: 1.2em; } @@ -115,6 +115,17 @@ a, a:link, a:visited, a:hover, a:active { text-decoration: none; } +button, input, select { + width: auto; + height: 32px; + background: white; + cursor: pointer; + font-family: Arial; + font-size: 16px; + color: #3333333; + border: none; +} + /* Tables */ table { border-spacing: 0; diff --git a/website/styles/search.css b/website/styles/search.css new file mode 100644 index 0000000..e69de29 From 39b849d7eed8da5ace5db60652f7b8c3e07f3a73 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:19:07 +0100 Subject: [PATCH 22/27] Added default padding to the input fields --- website/styles/search.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/styles/search.css b/website/styles/search.css index e69de29..912723e 100644 --- a/website/styles/search.css +++ b/website/styles/search.css @@ -0,0 +1,3 @@ +.search-form input { + border-bottom: #845663 solid 1px; +} \ No newline at end of file From 2434ffc67524d9ac897d18b5925fcce24a4f4565 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:20:47 +0100 Subject: [PATCH 23/27] Added filter on the search page. --- website/styles/main.css | 8 +++-- website/views/head.php | 1 + website/views/header.php | 2 +- website/views/search-view.php | 56 ++++++++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/website/styles/main.css b/website/styles/main.css index f426fc0..1346635 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -118,12 +118,16 @@ a, a:link, a:visited, a:hover, a:active { button, input, select { width: auto; height: 32px; + padding: 0 5px; + background: white; + color: #3333333; + cursor: pointer; + border: none; + font-family: Arial; font-size: 16px; - color: #3333333; - border: none; } /* Tables */ diff --git a/website/views/head.php b/website/views/head.php index 3266463..435fe81 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -13,6 +13,7 @@ @import url("styles/header.css"); @import url("styles/menu.css"); @import url("styles/footer.css"); + @import url("styles/search.css"); @import url("styles/chat.css"); diff --git a/website/views/header.php b/website/views/header.php index 86686a5..7c7b431 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -4,7 +4,7 @@
diff --git a/website/views/search-view.php b/website/views/search-view.php index 4116e31..27c794c 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -1,5 +1,59 @@
- Hey +
+ + + + +
+
+
+
\ No newline at end of file From eeedbe5c05473bf97982d69f27b1fdeaa22f18ca Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 14:19:08 +0100 Subject: [PATCH 24/27] 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 0e44fb34c09edfae98b5ef0b340d6fc062d22123 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 14:32:39 +0100 Subject: [PATCH 25/27] removed padding in input search --- website/styles/header.css | 1 - 1 file changed, 1 deletion(-) diff --git a/website/styles/header.css b/website/styles/header.css index d0c9d43..ffeaab6 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -26,7 +26,6 @@ header { } #header-search input[type="text"] { - padding: 0 5px; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } From 2bc11a87e4ab78aa632ea18698507645acfffa15 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 14:49:11 +0100 Subject: [PATCH 26/27] 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 From b95aa49c32f9101e36ebb51fef08986fe79599ac Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 14:59:29 +0100 Subject: [PATCH 27/27] Styled chat page Change the chat tap so it has the same style as the rest of the page --- website/styles/chat.css | 27 ++++++++++++++++++++------- website/views/chat-view.php | 16 +++++++++------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/website/styles/chat.css b/website/styles/chat.css index d76e964..7df2169 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -19,9 +19,7 @@ } .chat-recent, .chat-history { - border-radius: 20px; width: 100%; - background-color: white; } /* List of chats. */ @@ -47,7 +45,7 @@ .chat-history { overflow-y: auto; height: 100%; - padding-bottom: 10px; + padding: 0 0 10px 0; } .chat-message { @@ -80,20 +78,35 @@ /* Chat reply field */ .chat-field { - padding: 15px; + width: 100%; + padding: 15px 0; + display: table; } -.chat-field input { - border-radius: 8px; +.chat-field form { + width: 100%; + overflow: hidden; +} + +.chat-field span { + display: block; + overflow: hidden; } .chat-field input[type="text"] { - width: calc(100% - 80px); + width: 100%; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } .chat-field input[type="submit"] { width: auto; + float: right; background-color: #845663; color: white; padding: 5px 10px; + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } \ No newline at end of file diff --git a/website/views/chat-view.php b/website/views/chat-view.php index d0a3f53..99a64fc 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -1,7 +1,7 @@
-