Skip to content

Commit 72c75cb

Browse files
author
Chris Gårdenberg
committed
chore: Update for WP 6.0
1 parent 5494adf commit 72c75cb

11 files changed

Lines changed: 224 additions & 172 deletions

File tree

‎PLUGIN-CHECKSUM‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ef7ca0d3d4c0b18b7c6e52fd020c5e58
1+
98c329fe6ce3435b694ef79640c1692f

‎content/scripts/frontend/frontendjs.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ var eduGlobalMethods = {
552552
OnDemand: dataObject.Event.OnDemand,
553553
StartDate: dataObject.Event.OnDemand ? null : dataObject.Event.StartDate,
554554
EndDate: dataObject.Event.OnDemand ? null : dataObject.Event.EndDate,
555-
ParticipantName: (participant.FirstName + " " + participant.LastName).trim(),
555+
ParticipantName: "".concat(participant.FirstName, " ").concat(participant.LastName).trim(),
556556
ParticipantGrade: participant.GradeName,
557557
ParticipantArrived: participant.Arrived
558558
};
@@ -589,7 +589,7 @@ var eduGlobalMethods = {
589589
}
590590
else {
591591
// Export a single booking
592-
var bookingInfo = document.querySelector("tr[data-bookingid=\"" + bookingId + "\"]");
592+
var bookingInfo = document.querySelector("tr[data-bookingid=\"".concat(bookingId, "\"]"));
593593
var bookingData = getRowData(bookingInfo);
594594
if (!!bookingData) {
595595
exportData.push.apply(exportData, getExcelRows(bookingData));
@@ -622,7 +622,7 @@ var eduGlobalMethods = {
622622
var uri = 'data:text/csv;charset=utf-8;base64,';
623623
var downloadLink = document.createElement('a');
624624
downloadLink.download = 'BookingExport.csv';
625-
downloadLink.href = "" + uri + getCsvBase64Data(exportData);
625+
downloadLink.href = "".concat(uri).concat(getCsvBase64Data(exportData));
626626
downloadLink.click();
627627
}
628628
};

‎content/style/compiled/frontend/bookingPage.css‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
}
2323
.eduadmin.booking-page form .title .notUserCheck {
2424
text-align: center;
25-
color: #666666;
25+
color: hsl(0deg, 0%, 40%);
2626
margin: 0 0 56px;
2727
font-size: 0.95rem;
2828
}
2929
.eduadmin.booking-page form .title .notUserCheck a {
3030
margin: 0 0 0 8px;
31-
color: #666666;
31+
color: hsl(0deg, 0%, 40%);
3232
}
3333
.eduadmin.booking-page form h2 {
34-
color: #333333;
34+
color: hsl(0deg, 0%, 20%);
3535
font-weight: 600;
3636
margin: 0 0 24px 0;
3737
}
@@ -57,7 +57,7 @@
5757
.eduadmin.booking-page form div.fakeLabel .inputLabel {
5858
display: none;
5959
margin: 0 0 8px;
60-
color: #333333;
60+
color: hsl(0deg, 0%, 20%);
6161
}
6262
.eduadmin.booking-page form label .inputLabel.noHide,
6363
.eduadmin.booking-page form div.fakeLabel .inputLabel.noHide {
@@ -120,10 +120,10 @@
120120
display: flex;
121121
justify-content: space-between;
122122
align-items: baseline;
123-
color: #333333;
123+
color: hsl(0deg, 0%, 20%);
124124
}
125125
.eduadmin.booking-page form .participantView h3 .removeParticipant {
126-
color: #666666;
126+
color: hsl(0deg, 0%, 40%);
127127
font-size: 1rem;
128128
}
129129
.eduadmin.booking-page form .participantView h3 .removeParticipant:hover {
@@ -164,13 +164,13 @@
164164
display: block;
165165
margin: unset;
166166
padding: 10px 20px;
167-
border: 1px solid #ababab;
167+
border: 1px solid hsl(0deg, 0%, 67%);
168168
border-radius: 5px;
169169
cursor: pointer;
170170
text-align: center;
171171
}
172172
.eduadmin.booking-page form .paymentMethodsView li input[type=radio]:checked + label {
173-
background-color: #f2f2f2;
173+
background-color: hsl(0deg, 0%, 95%);
174174
}
175175
.eduadmin.booking-page form .recaptchaView {
176176
margin: 0 0 48px 0;
@@ -192,10 +192,10 @@
192192
display: none;
193193
width: 100%;
194194
padding: 8px 16px;
195-
color: #e62b1a;
195+
color: hsl(5deg, 80%, 50%);
196196
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.08);
197197
order: -1;
198-
background: #ffe3e0;
198+
background: hsl(6deg, 100%, 94%);
199199
margin: 0 0 16px 0;
200200
border-radius: 3px;
201201
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.18);
@@ -247,13 +247,13 @@
247247
border-bottom-right-radius: 0;
248248
border-bottom-left-radius: 5px;
249249
border-right: 0;
250-
border-bottom: 1px solid #ababab;
250+
border-bottom: 1px solid hsl(0deg, 0%, 67%);
251251
}
252252
.eduadmin.booking-page form .paymentMethodsView li:last-child label {
253253
border-top-left-radius: 0;
254254
border-top-right-radius: 5px;
255255
border-bottom-left-radius: 0;
256256
border-left: 0;
257-
border-top: 1px solid #ababab;
257+
border-top: 1px solid hsl(0deg, 0%, 67%);
258258
}
259259
}

‎content/style/compiled/frontend/detailView.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
padding: 16px 0;
55
}
66
.eduadmin div.title .courseTitle {
7-
color: #4d4d4d;
7+
color: hsl(0deg, 0%, 30%);
88
font-weight: 600;
99
margin: 0;
1010
padding: 0;
@@ -15,11 +15,11 @@
1515
margin: 0 16px 0 0;
1616
}
1717
.eduadmin .textblock {
18-
color: #595959;
18+
color: hsl(0deg, 0%, 35%);
1919
}
2020
.eduadmin .eventInformation {
2121
margin: 0 0 48px 0;
22-
color: #595959;
22+
color: hsl(0deg, 0%, 35%);
2323
}
2424
.eduadmin .event-table.eventDays .eventSeparator {
2525
margin-top: 1rem;
@@ -28,10 +28,10 @@
2828
}
2929
.eduadmin .eventItem {
3030
padding: 16px 0;
31-
border-bottom: 1px solid #f2f2f2;
31+
border-bottom: 1px solid hsl(0deg, 0%, 95%);
3232
}
3333
.eduadmin .eventItem:first-child {
34-
border-top: 1px solid #f2f2f2;
34+
border-top: 1px solid hsl(0deg, 0%, 95%);
3535
}
3636
.eduadmin .eventItem:last-child {
3737
border: none;

‎content/style/compiled/frontend/global.css‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
max-width: 100%;
1616
}
1717
.eduadmin h3 {
18-
color: #595959;
18+
color: hsl(0deg, 0%, 35%);
1919
font-weight: 600;
2020
}
2121
.eduadmin h1.courseTitle,
@@ -38,31 +38,31 @@
3838
display: inline-block;
3939
box-sizing: border-box;
4040
border-radius: 3px;
41-
border: 1px solid #6bb266;
42-
background: #55aa55;
43-
color: white;
41+
border: 1px solid hsl(116deg, 33%, 55%);
42+
background: hsl(120deg, 33%, 50%);
43+
color: hsl(0deg, 0%, 100%);
4444
}
4545
.eduadmin .cta-btn:hover {
46-
color: white;
47-
background: #6bb266;
46+
color: hsl(0deg, 0%, 100%);
47+
background: hsl(116deg, 33%, 55%);
4848
}
4949
.eduadmin .neutral-btn {
5050
padding: 8px 16px;
5151
display: inline-block;
5252
box-sizing: border-box;
5353
border-radius: 3px;
54-
color: #707070;
54+
color: hsl(0deg, 0%, 44%);
5555
font-weight: 400;
56-
border: 1px solid #ababab;
56+
border: 1px solid hsl(0deg, 0%, 67%);
5757
background: transparent;
5858
box-shadow: unset;
5959
}
6060
.eduadmin .neutral-btn:hover {
61-
background: rgba(242, 242, 242, 0.88);
61+
background: hsla(0deg, 0%, 95%, 0.88);
6262
box-shadow: unset;
6363
}
6464
.eduadmin .neutral-btn.active {
65-
background: rgba(242, 242, 242, 0.88);
65+
background: hsla(0deg, 0%, 95%, 0.88);
6666
box-shadow: unset;
6767
}
6868
.eduadmin .search-form {
@@ -130,9 +130,9 @@
130130
.eduadmin .edu-modal.warning {
131131
width: 100%;
132132
padding: 8px 16px;
133-
color: #e62b1a;
133+
color: hsl(5deg, 80%, 50%);
134134
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.08);
135-
background: #ffe3e0;
135+
background: hsl(6deg, 100%, 94%);
136136
margin: 0 0 16px 0;
137137
border-radius: 3px;
138138
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.18);
@@ -234,7 +234,7 @@
234234
.eduadmin div.fakeLabel .inputLabel {
235235
display: none;
236236
margin: 0 0 8px;
237-
color: #333333;
237+
color: hsl(0deg, 0%, 20%);
238238
}
239239
.eduadmin label .inputLabel.noHide,
240240
.eduadmin div.fakeLabel .inputLabel.noHide {
@@ -302,7 +302,7 @@
302302
}
303303
.eduadmin.loginForm form .title .checkEmailForm h3 {
304304
font-weight: normal;
305-
color: #666666;
305+
color: hsl(0deg, 0%, 40%);
306306
font-style: italic;
307307
font-size: 16px;
308308
margin: 0 0 16px 0;

‎content/style/compiled/frontend/listView.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
.eduadmin .objectItem {
1212
padding: 24px 8px;
13-
border-bottom: 1px solid #f2f2f2;
13+
border-bottom: 1px solid hsl(0deg, 0%, 95%);
1414
}
1515
.eduadmin .objectItem:last-child .objectInfoHolder {
1616
border-bottom: none;
@@ -28,10 +28,10 @@
2828
margin: 0 0 16px 0;
2929
}
3030
.eduadmin .objectItem .objectName a {
31-
color: #4d4d4d;
31+
color: hsl(0deg, 0%, 30%);
3232
}
3333
.eduadmin .objectItem .objectDescription {
34-
color: #595959;
34+
color: hsl(0deg, 0%, 35%);
3535
margin: 0 0 16px 0;
3636
}
3737
.eduadmin .objectItem .objectDescription .eduadmin-dateText,
@@ -52,11 +52,11 @@
5252
margin: 0 16px 0 0;
5353
}
5454
.eduadmin .objectItem .objectBook a.readMoreButton:not(.cta-btn) {
55-
color: #666666;
55+
color: hsl(0deg, 0%, 40%);
5656
font-style: italic;
5757
}
5858
.eduadmin .objectItem .objectBook a.readMoreButton:not(.cta-btn):hover {
59-
color: #262626;
59+
color: hsl(0deg, 0%, 15%);
6060
}
6161
.eduadmin .objectBlock.brick {
6262
width: 100%;
@@ -66,7 +66,7 @@
6666
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.18);
6767
padding: 16px;
6868
border-radius: 3px;
69-
background: #fefefe;
69+
background: hsl(0deg, 0%, 99.5%);
7070
display: inline-flex;
7171
flex-direction: column;
7272
justify-content: space-between;
@@ -84,10 +84,10 @@
8484
margin: 0 0 16px 0;
8585
}
8686
.eduadmin .objectBlock.brick .objectName a {
87-
color: #4d4d4d;
87+
color: hsl(0deg, 0%, 30%);
8888
}
8989
.eduadmin .objectBlock.brick .objectDescription {
90-
color: #595959;
90+
color: hsl(0deg, 0%, 35%);
9191
}
9292
.eduadmin .objectBlock.brick .objectDescription .spotsLeft {
9393
display: none;

‎content/style/compiled/frontend/profilePage.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.eduadmin .tab_container.tabhead {
2-
border-bottom: 1px solid #d1d1d1;
2+
border-bottom: 1px solid hsl(0deg, 0%, 82%);
33
}
44
.eduadmin .tab_container .tab_item {
55
padding: 5px 10px 4px 10px;
@@ -9,13 +9,13 @@
99
border: 1px solid rgba(0, 0, 0, 0);
1010
}
1111
.eduadmin .tab_container .tab_item:hover {
12-
border: 1px solid #b8b8b8;
12+
border: 1px solid hsl(0deg, 0%, 72%);
1313
border-bottom: 0;
1414
border-top-left-radius: 10px;
1515
border-top-right-radius: 10px;
1616
}
1717
.eduadmin .tab_container .tab_item.active {
18-
border: 1px solid #d1d1d1;
18+
border: 1px solid hsl(0deg, 0%, 82%);
1919
border-bottom: 0;
2020
border-top-left-radius: 10px;
2121
border-top-right-radius: 10px;

‎eduadmin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
1414
* GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
1515
* Requires at least: 5.8
16-
* Tested up to: 5.9
16+
* Tested up to: 6.0.0
1717
* Requires PHP: 7.0
1818
* Author: Chris Gårdenberg, MultiNet Interactive AB
1919
* Author URI: https://www.multinet.com

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
},
1313
"dependencies": {
1414
"docusaurus-init": "^1.14.0",
15-
"gulp": "^4.0.2",
16-
"gulp-replace": "^1.0.0",
17-
"gulp-sass": "^5.0.0",
15+
"gulp": "~4.0.2",
16+
"gulp-replace": "^1.1.3",
17+
"gulp-sass": "^5.1.0",
1818
"gulp-uglify": "^3.0.2"
1919
},
2020
"devDependencies": {
21-
"@types/jquery": "^3.3.30",
22-
"concurrently": "6.3.0",
23-
"sass": "^1.42.1",
24-
"standard-version": "^9.3.1",
25-
"typescript": "^3.5.3"
21+
"@types/jquery": "^3.5.14",
22+
"concurrently": "7.1.0",
23+
"sass": "^1.51.0",
24+
"standard-version": "^9.3.2",
25+
"typescript": "^4.6.4"
2626
},
2727
"config": {
2828
"commitizen": {
2929
"path": "./node_modules/cz-conventional-changelog"
3030
},
3131
"eduadmin": {
32-
"testedUpTo": "5.9",
32+
"testedUpTo": "6.0.0",
3333
"requiresAtLeast": "5.8",
3434
"minimumPhpVersion": "7.0"
3535
}

‎readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Contributors: mnchga
33
Tags: booking, participants, courses, events, eduadmin, lega online
44
Requires at least: 5.8
5-
Tested up to: 5.9
5+
Tested up to: 6.0.0
66
Stable tag: 3.2.0
77
Requires PHP: 7.0
88
License: GPL3

0 commit comments

Comments
 (0)