From 655c2ccbebaf3ec56ce0fe4b4bcdcb1b43f21bc3 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 16:02:02 +0100 Subject: [PATCH 001/369] 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 -- 2.49.1 From 319a406d6f474d192405a4be84c363a5139419c4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 11:00:44 +0100 Subject: [PATCH 002/369] 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 72d3a5ad8a735687deab004a08633cff65537780 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:16:57 +0100 Subject: [PATCH 003/369] 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"); -- 2.49.1 From cfa119fef0585306525f897e5e54fb7ea0ecb623 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:54:56 +0100 Subject: [PATCH 004/369] 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:

- - - - - + + + + + -- 2.49.1 From 96c114cc103df2ee6ac5cca9853b0f1d0edc906b Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 11:59:48 +0100 Subject: [PATCH 005/369] 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 -- 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 006/369] 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 007/369] 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 -- 2.49.1 From 39b849d7eed8da5ace5db60652f7b8c3e07f3a73 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:19:07 +0100 Subject: [PATCH 008/369] 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 -- 2.49.1 From 2434ffc67524d9ac897d18b5925fcce24a4f4565 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:20:47 +0100 Subject: [PATCH 009/369] 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 -- 2.49.1 From 5c9674450799e676b947818d0d87983b259da503 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 13:03:46 +0100 Subject: [PATCH 010/369] 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+

+ -
+ -
+ -
+ -
+
-- 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 015/369] 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+