Skip to content

Commit 594c422

Browse files
author
Chris Gårdenberg
committed
feat: Setting to turn off/on OG/metadata and LD+JSON.
fixes #520
1 parent d5ec17f commit 594c422

5 files changed

Lines changed: 74 additions & 50 deletions

File tree

‎PLUGIN-CHECKSUM‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dfe92ac2cbf028316a32bfd76b493a0f
1+
abf969511e900a6eadfd2d30dac37c94

‎content/template/data/ld-json.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
return;
1414
}
1515

16+
$show_extra_metadata = EDU()->is_checked( 'eduadmin-showExtraMetadata', "on" );
17+
18+
if ( ! $show_extra_metadata ) {
19+
return;
20+
}
21+
1622
$group_by_city = EDU()->is_checked( 'eduadmin-groupEventsByCity' );
1723
$group_by_city_class = '';
1824

‎content/template/data/ogp.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
return;
1414
}
1515

16+
$show_extra_metadata = EDU()->is_checked( 'eduadmin-showExtraMetadata', "on" );
17+
18+
if ( ! $show_extra_metadata ) {
19+
return;
20+
}
21+
1622
$group_by_city = EDU()->is_checked( 'eduadmin-groupEventsByCity' );
1723
$group_by_city_class = '';
1824

‎includes/edu-options.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ function eduadmin_settings_init() {
309309
register_setting( 'eduadmin-rewrite', 'eduadmin-monthsToFetch' );
310310
register_setting( 'eduadmin-rewrite', 'eduadmin-showVatTexts' );
311311
register_setting( 'eduadmin-rewrite', 'eduadmin-showPricesAsSelected' );
312+
register_setting( 'eduadmin-rewrite', 'eduadmin-showExtraMetadata' );
312313

313314
if ( is_admin() ) {
314315
wp_enqueue_script( 'jquery' );

‎includes/general-settings.php‎

Lines changed: 60 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,28 @@ function edu_render_general_settings() {
5151
<?php echo esc_html_x( 'Insert one interval range per row (1-3, 4-10, 10+)', 'backend', 'eduadmin-booking' ); ?>
5252
<br />
5353
<textarea name="eduadmin-spotsSettings" class="form-control" rows="5"
54-
cols="30"><?php echo EDU()->get_option( 'eduadmin-spotsSettings', "1-5\n5-10\n10+" ); ?></textarea>
54+
cols="30"><?php echo EDU()->get_option( 'eduadmin-spotsSettings', "1-5\n5-10\n10+" ); ?></textarea>
5555
</div>
5656
<div id="eduadmin-alwaysFewSpots">
5757
<br />
5858
<b><?php echo esc_html_x( 'Number of participants before showing as \"Few spots left\"', 'backend', 'eduadmin-booking' ); ?></b>
5959
<br />
6060
<input type="number" name="eduadmin-alwaysFewSpots"
61-
value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-alwaysFewSpots', "3" ) ); ?>" />
61+
value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-alwaysFewSpots', "3" ) ); ?>" />
6262
</div>
6363
</div>
6464
<br />
6565
<?php echo esc_html_x( 'Number of months to fetch events for', 'backend', 'eduadmin-booking' ); ?>
6666
<br />
6767
<input type="number" name="eduadmin-monthsToFetch"
68-
value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-monthsToFetch', '6' ) ); ?>" /> <?php _ex( 'months', 'backend', 'eduadmin-booking' ); ?>
68+
value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-monthsToFetch', '6' ) ); ?>" /> <?php _ex( 'months', 'backend', 'eduadmin-booking' ); ?>
6969
<br />
7070
<br />
7171
<?php echo esc_html_x( 'VAT text options', 'backend', 'eduadmin-booking' ); ?>
7272
<br />
7373
<label>
7474
<input type="checkbox"
75-
name="eduadmin-showVatTexts"<?php checked( EDU()->get_option( 'eduadmin-showVatTexts', "on" ), "on" ); ?> />
75+
name="eduadmin-showVatTexts"<?php checked( EDU()->get_option( 'eduadmin-showVatTexts', "on" ), "on" ); ?> />
7676
<?php echo esc_html_x( 'Show VAT texts on prices', 'backend', 'eduadmin-booking' ); ?>
7777
</label>
7878
<br />
@@ -97,18 +97,29 @@ function edu_render_general_settings() {
9797
</option>
9898
</select>
9999
<br />
100+
<br />
101+
<strong><?php echo esc_html_x( 'Include meta data for search engines on course pages (Open Graph + LD+JSON)', 'backend', 'eduadmin-booking' ); ?></strong>
102+
<br />
103+
<em><?php echo esc_html_x( 'This option enables some extra data that is invisible for users, but search engines may show some extra information about the results about the courses.', 'backend', 'eduadmin-booking' ); ?></em>
104+
<br />
105+
<label>
106+
<input type="checkbox"
107+
name="eduadmin-showExtraMetadata"<?php checked( EDU()->get_option( 'eduadmin-showExtraMetadata', "on" ), "on" ); ?> />
108+
<?php echo esc_html_x( 'Yes, include extra meta data', 'backend', 'eduadmin-booking' ); ?>
109+
</label>
110+
<br />
100111
<p class="submit">
101112
<input type="submit" name="submit" id="submit" class="button button-primary"
102-
value="<?php echo esc_attr_x( 'Save settings', 'backend', 'eduadmin-booking' ); ?>" />
113+
value="<?php echo esc_attr_x( 'Save settings', 'backend', 'eduadmin-booking' ); ?>" />
103114
</p>
104115
<h3><?php echo esc_html_x( 'Rewrite settings', 'backend', 'eduadmin-booking' ); ?></h3>
105116
<p>
106117
<?php echo esc_html_x( 'Enter the URL you want to use with the application (please check that the URL does not exists)', 'backend', 'eduadmin-booking' ); ?>
107118
</p>
108119
<?php echo home_url(); ?>/<input style="width: 200px;" type="text" class="form-control folder"
109-
name="eduadmin-rewriteBaseUrl" id="eduadmin-rewriteBaseUrl"
110-
value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-rewriteBaseUrl' ) ); ?>"
111-
placeholder="<?php echo _x( 'URL', 'backend', 'eduadmin-booking' ); ?>" />/
120+
name="eduadmin-rewriteBaseUrl" id="eduadmin-rewriteBaseUrl"
121+
value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-rewriteBaseUrl' ) ); ?>"
122+
placeholder="<?php echo _x( 'URL', 'backend', 'eduadmin-booking' ); ?>" />/
112123
<?php
113124
$pages = get_pages();
114125
$eduPages = array();
@@ -128,7 +139,7 @@ function edu_render_general_settings() {
128139
<td><?php echo esc_html_x( 'List view page', 'backend', 'eduadmin-booking' ); ?></td>
129140
<td>
130141
<select class="form-control" style="width: 300px;" name="eduadmin-listViewPage"
131-
id="eduadmin-listViewPage">
142+
id="eduadmin-listViewPage">
132143
<option
133144
value="">-- <?php echo esc_html_x( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
134145
</option>
@@ -140,9 +151,9 @@ function edu_render_general_settings() {
140151
$suggested = true;
141152
}
142153
echo "\t\t\t\t\t\t\t<option " . ( $listPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
143-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
144-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
145-
"</option>\n";
154+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
155+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
156+
"</option>\n";
146157
}
147158
?>
148159
</select>
@@ -155,7 +166,7 @@ function edu_render_general_settings() {
155166
<td><?php echo _x( 'Details view page', 'backend', 'eduadmin-booking' ); ?></td>
156167
<td>
157168
<select class="form-control" style="width: 300px;" name="eduadmin-detailViewPage"
158-
id="eduadmin-detailViewPage">
169+
id="eduadmin-detailViewPage">
159170
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
160171
</option>
161172
<?php
@@ -166,9 +177,9 @@ function edu_render_general_settings() {
166177
$suggested = true;
167178
}
168179
echo "\t\t\t\t\t\t\t<option" . ( $detailPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
169-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
170-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
171-
"</option>\n";
180+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
181+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
182+
"</option>\n";
172183
}
173184
?>
174185
</select>
@@ -181,7 +192,7 @@ function edu_render_general_settings() {
181192
<td><?php echo _x( 'Booking view page', 'backend', 'eduadmin-booking' ); ?></td>
182193
<td>
183194
<select class="form-control" style="width: 300px;" name="eduadmin-bookingViewPage"
184-
id="eduadmin-bookingViewPage">
195+
id="eduadmin-bookingViewPage">
185196
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
186197
</option>
187198
<?php
@@ -192,9 +203,9 @@ function edu_render_general_settings() {
192203
$suggested = true;
193204
}
194205
echo "\t\t\t\t\t\t\t<option" . ( $bookingPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
195-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
196-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
197-
"</option>\n";
206+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
207+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
208+
"</option>\n";
198209
}
199210
?>
200211
</select>
@@ -207,15 +218,15 @@ function edu_render_general_settings() {
207218
<td><?php _ex( 'Thank you page', 'backend', 'eduadmin-booking' ); ?></td>
208219
<td>
209220
<select class="form-control" style="width: 300px;" name="eduadmin-thankYouPage"
210-
id="eduadmin-thankYouPage">
221+
id="eduadmin-thankYouPage">
211222
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
212223
</option>
213224
<?php
214225
$thankPage = EDU()->get_option( 'eduadmin-thankYouPage' );
215226
foreach ( $pages as $p ) {
216227
echo "\t\t\t\t\t\t\t<option" . ( $thankPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
217-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
218-
"</option>\n";
228+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
229+
"</option>\n";
219230
}
220231
?>
221232
</select>
@@ -226,7 +237,7 @@ function edu_render_general_settings() {
226237
<td><?php echo _x( 'Login page', 'backend', 'eduadmin-booking' ); ?></td>
227238
<td>
228239
<select class="form-control" style="width: 300px;" name="eduadmin-loginViewPage"
229-
id="eduadmin-loginViewPage">
240+
id="eduadmin-loginViewPage">
230241
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
231242
</option>
232243
<?php
@@ -237,9 +248,9 @@ function edu_render_general_settings() {
237248
$suggested = true;
238249
}
239250
echo "\t\t\t\t\t\t\t<option" . ( $loginPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
240-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
241-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
242-
"</option>\n";
251+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
252+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
253+
"</option>\n";
243254
}
244255
?>
245256
</select>
@@ -252,7 +263,7 @@ function edu_render_general_settings() {
252263
<td><?php echo _x( 'Course interest page', 'backend', 'eduadmin-booking' ); ?></td>
253264
<td>
254265
<select class="form-control" style="width: 300px;" name="eduadmin-interestObjectPage"
255-
id="eduadmin-interestObjectPage">
266+
id="eduadmin-interestObjectPage">
256267
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
257268
</option>
258269
<?php
@@ -263,9 +274,9 @@ function edu_render_general_settings() {
263274
$suggested = true;
264275
}
265276
echo "\t\t\t\t\t\t\t<option" . ( $objectInterestPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
266-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
267-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
268-
"</option>\n";
277+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
278+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
279+
"</option>\n";
269280
}
270281
?>
271282
</select>
@@ -278,7 +289,7 @@ function edu_render_general_settings() {
278289
<td><?php echo _x( 'Event interest page', 'backend', 'eduadmin-booking' ); ?></td>
279290
<td>
280291
<select class="form-control" style="width: 300px;" name="eduadmin-interestEventPage"
281-
id="eduadmin-interestEventPage">
292+
id="eduadmin-interestEventPage">
282293
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
283294
</option>
284295
<?php
@@ -289,9 +300,9 @@ function edu_render_general_settings() {
289300
$suggested = true;
290301
}
291302
echo "\t\t\t\t\t\t\t<option" . ( $eventInterestPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
292-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
293-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
294-
"</option>\n";
303+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
304+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
305+
"</option>\n";
295306
}
296307
?>
297308
</select>
@@ -320,7 +331,7 @@ function edu_render_general_settings() {
320331
<td><?php _ex( 'List view page', 'backend', 'eduadmin-booking' ); ?></td>
321332
<td>
322333
<select class="form-control" style="width: 300px;" name="eduadmin-programme-list"
323-
id="eduadmin-programme-list">
334+
id="eduadmin-programme-list">
324335
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
325336
</option>
326337
<?php
@@ -331,9 +342,9 @@ function edu_render_general_settings() {
331342
$suggested = true;
332343
}
333344
echo "\t\t\t\t\t\t\t<option" . ( $list_page == $p->ID ? ' selected="selected"' : '' ) . ' value="' . $p->ID . '">' .
334-
htmlentities( $p->post_title . ' (ID: ' . $p->ID . ')' ) .
335-
( $suggested ? ' (' . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
336-
"</option>\n";
345+
htmlentities( $p->post_title . ' (ID: ' . $p->ID . ')' ) .
346+
( $suggested ? ' (' . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
347+
"</option>\n";
337348
}
338349
?>
339350
</select>
@@ -346,7 +357,7 @@ function edu_render_general_settings() {
346357
<td><?php _ex( 'Detail view page', 'backend', 'eduadmin-booking' ); ?></td>
347358
<td>
348359
<select class="form-control" style="width: 300px;" name="eduadmin-programme-detail"
349-
id="eduadmin-programme-detail">
360+
id="eduadmin-programme-detail">
350361
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
351362
</option>
352363
<?php
@@ -357,9 +368,9 @@ function edu_render_general_settings() {
357368
$suggested = true;
358369
}
359370
echo "\t\t\t\t\t\t\t<option" . ( $detail_page == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
360-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
361-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
362-
"</option>\n";
371+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
372+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
373+
"</option>\n";
363374
}
364375
?>
365376
</select>
@@ -372,7 +383,7 @@ function edu_render_general_settings() {
372383
<td><?php _ex( 'Booking view page', 'backend', 'eduadmin-booking' ); ?></td>
373384
<td>
374385
<select class="form-control" style="width: 300px;" name="eduadmin-programme-book"
375-
id="eduadmin-programme-book">
386+
id="eduadmin-programme-book">
376387
<option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>--
377388
</option>
378389
<?php
@@ -383,9 +394,9 @@ function edu_render_general_settings() {
383394
$suggested = true;
384395
}
385396
echo "\t\t\t\t\t\t\t<option" . ( $book_page == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" .
386-
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
387-
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
388-
"</option>\n";
397+
htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) .
398+
( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) .
399+
"</option>\n";
389400
}
390401
?>
391402
</select>
@@ -399,14 +410,14 @@ function edu_render_general_settings() {
399410
<input type="hidden" name="eduadmin-options_have_changed" value="true" />
400411
<p class="submit">
401412
<input type="submit" name="submit" id="submit" class="button button-primary"
402-
value="<?php echo esc_attr_x( 'Save settings', 'backend', 'eduadmin-booking' ); ?>" />
413+
value="<?php echo esc_attr_x( 'Save settings', 'backend', 'eduadmin-booking' ); ?>" />
403414
</p>
404415
</div>
405416
</form>
406417
<form action="" method="POST">
407418
<input type="hidden" name="act" value="clearTransients" />
408419
<input type="submit" class="button button-primary"
409-
value="<?php echo esc_attr_x( 'Clear transients/cache', 'backend', 'eduadmin-booking' ); ?>" />
420+
value="<?php echo esc_attr_x( 'Clear transients/cache', 'backend', 'eduadmin-booking' ); ?>" />
410421
</form>
411422
</div>
412423
<script type="text/javascript">

0 commit comments

Comments
 (0)