Skip to content

Commit

Permalink
Prepare Release 2.2 (#719)
Browse files Browse the repository at this point in the history 
* Add WhatsApp sharer button (#651)

* Add WhatsApp sharer button

* Extend GitHub workflow for all dev branches

* Fix coding standard for new sharer

* Avoid using pixabay images in templates and Sunflower instances. (#708)

* Replace background image of block next-events

* Remove sample picture import from sunflower-theme.de

* Update documentation about free image sources

* Fix font im backend editor

* Update templates not to use pixabay images as default

* Fix person and homepage template

* Add optional field for contact-form receiver email (#709)

* Send copy of email in contact-form to sender if desired (#711)

* Fix whole day events (imported and manual edited) (#714)

* Enhance contact form block: show only valid options (#716)

* Add option to show latest posts with 2 or 3 columns (#715)

* pattern for a linkseite for social media (#710)

* add the pattern of linkseite

* Fix block errors

* update linkseite social icons + picture

* add doku to blocks

* add the changes of 2.2 in changelog

* Make linkseite template full-width and with round image

* Fix link to changelog in docu

---------

Co-authored-by: Alexander Bigga <[email protected]>

* Show websitename in page metadata to enhance SEO (search engine optimization) (#718)

---------

Co-authored-by: Hanna H. <[email protected]>
  • Loading branch information
@albig @HueHa-v
albig and HueHa-v authored Sep 3, 2024
1 parent ebe8d8f commit 37084a7
Show file tree
Hide file tree
Showing 48 changed files with 781 additions and 412 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
root = true

[*]
# WordPress Coding Style uses TABs for PHP, JS and CSS files
# WordPress Coding Style uses TABs for PHP, JS, HTML and CSS files
# https://developer.wordpress.org/coding-standards/wordpress-coding-standards/
indent_style = tab
indent_size = 4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- main
pull_request:
branches:
- dev
- dev*
- main

env:
Expand Down
5 changes: 3 additions & 2 deletions assets/css/editor-style.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@font-face {
font-family: GrueneType;
src: url("assets/fonts/GrueneType-BlackCondensedItalic.woff2") format("woff2"), url("assets/fonts/GrueneType-BlackCondensedItalic.ttf") format("truetype");
src: url("../fonts/GrueneType-BlackCondensedItalic.woff2") format("woff2"), url("../fonts/GrueneType-BlackCondensedItalic.ttf") format("truetype");
font-weight: 900;
font-style: normal;
font-display: swap;
Expand Down Expand Up @@ -520,9 +520,10 @@ p a {
}

.next-events {
background-image: url("../img/sunflower1.jpg");
background-image: url("../img/jeb-buchman-NjrjrdJE8As-unsplash-1.jpg");
background-size: cover;
background-position: top;
flex-direction: column;
}

.sunflower-has-background-dim>* {
Expand Down
21 changes: 0 additions & 21 deletions assets/custom-jquery-date-time-picker.js
View file

This file was deleted.

Binary file added assets/img/jeb-buchman-NjrjrdJE8As-unsplash-1.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/img/sunflower1.jpg
View file
Binary file not shown.
119 changes: 119 additions & 0 deletions assets/js/custom-jquery-date-time-picker.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/* eslint-disable no-undef */
jQuery( function ( $ ) {
$.datetimepicker.setLocale( 'de' );

const isWholeDay = $( 'input[name="_sunflower_event_whole_day"]' ).is(
':checked'
);

if ( isWholeDay === true ) {
$(
'input.datetimepicker[name="_sunflower_event_from"]'
).datetimepicker( {
timepicker: false,
dayOfWeekStart: 1,
format: 'd.m.Y',
} );
$(
'input.datetimepicker[name="_sunflower_event_until"]'
).datetimepicker( {
timepicker: false,
dayOfWeekStart: 1,
format: 'd.m.Y',
onShow() {
this.setOptions( {
value: $(
'input.datetimepicker[name="_sunflower_event_until"]'
).val()
? $(
'input.datetimepicker[name="_sunflower_event_until"]'
).val()
: $(
'input.datetimepicker[name="_sunflower_event_from"]'
).val(),
} );
},
} );
} else {
$(
'input.datetimepicker[name="_sunflower_event_from"]'
).datetimepicker( {
timepicker: true,
dayOfWeekStart: 1,
format: 'd.m.Y H:i',
} );
$(
'input.datetimepicker[name="_sunflower_event_until"]'
).datetimepicker( {
timepicker: true,
dayOfWeekStart: 1,
format: 'd.m.Y H:i',
onShow() {
this.setOptions( {
value: $(
'input.datetimepicker[name="_sunflower_event_until"]'
).val()
? $(
'input.datetimepicker[name="_sunflower_event_until"]'
).val()
: $(
'input.datetimepicker[name="_sunflower_event_from"]'
).val(),
} );
},
} );
}

$( 'input[name="_sunflower_event_whole_day"]' ).change( function () {
if ( this.checked ) {
$(
'input.datetimepicker[name="_sunflower_event_from"]'
).datetimepicker( {
timepicker: false,
dayOfWeekStart: 1,
format: 'd.m.Y',
} );
$(
'input.datetimepicker[name="_sunflower_event_until"]'
).datetimepicker( {
timepicker: false,
dayOfWeekStart: 1,
format: 'd.m.Y',
} );

const from = $(
'input.datetimepicker[name="_sunflower_event_from"]'
)
.val()
.substring( 0, 10 );
const until = $(
'input.datetimepicker[name="_sunflower_event_until"]'
)
.val()
.substring( 0, 10 );

$( 'input.datetimepicker[name="_sunflower_event_from"]' ).val(
from
);
$( 'input.datetimepicker[name="_sunflower_event_until"]' ).val(
until
);
} else {
$(
'input.datetimepicker[name="_sunflower_event_from"]'
).datetimepicker( {
timepicker: true,
dayOfWeekStart: 1,
format: 'd.m.Y H:i',
} );
$(
'input.datetimepicker[name="_sunflower_event_until"]'
).datetimepicker( {
timepicker: true,
dayOfWeekStart: 1,
format: 'd.m.Y H:i',
} );
}
} );
} );
/* eslint-enable no-undef */
2 changes: 2 additions & 0 deletions assets/js/frontend.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,11 @@ jQuery( '#sunflower-contact-form' ).on( 'submit', function ( e ) {
message: jQuery( '#message' ).val(),
name: jQuery( '#name' ).val(),
mail: jQuery( '#mail' ).val(),
mailTo: jQuery( '#mail-to' ).val(),
phone: jQuery( '#phone' ).val(),
title: jQuery( '#contact-form-title' ).html(),
captcha: jQuery( '#captcha' ).val(),
sendCopy: jQuery( '#send-copy' ).val(),
},
} )
.done( function ( response ) {
Expand Down
1 change: 0 additions & 1 deletion functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
require_once __DIR__ . '/functions/activation.php';
require_once __DIR__ . '/functions/comments.php';
require_once __DIR__ . '/functions/icalimport.php';
require_once __DIR__ . '/functions/pictureimport.php';
require_once __DIR__ . '/functions/emailscrambler.php';
require_once __DIR__ . '/functions/contact-form.php';
require_once __DIR__ . '/functions/api.php';
Expand Down
18 changes: 13 additions & 5 deletions functions/block-patterns/elemente/person-2.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!-- wp:columns -->
<!-- wp:columns {"metadata":{"categories":["sunflower-elemente"],"patternName":"sunflower/person-2","name":"Person-2"}} -->
<div class="wp-block-columns"><!-- wp:column {"className":"mb-md-4"} -->
<div class="wp-block-column mb-md-4"><!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2024/08/Soncnica_-_Sunflower_-_Helianthus_annuus-1024x768.jpg" alt="Eine gelbe Sonnenblume vor blauem Himmel."/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname-Doppelname</p>
<!-- /wp:paragraph -->

Expand All @@ -28,6 +28,10 @@
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-facebook-f"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-whatsapp"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-whatsapp"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-threads"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-threads"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand Down Expand Up @@ -56,8 +60,8 @@
<!-- /wp:column -->

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2024/08/Soncnica_-_Sunflower_-_Helianthus_annuus-1024x768.jpg" alt="Eine gelbe Sonnenblume vor blauem Himmel."/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname</p>
<!-- /wp:paragraph -->

Expand All @@ -82,6 +86,10 @@
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-facebook-f"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-whatsapp"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-whatsapp"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-threads"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-threads"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand Down
32 changes: 22 additions & 10 deletions functions/block-patterns/elemente/person-3.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!-- wp:columns -->
<!-- wp:columns {"metadata":{"categories":["sunflower-elemente"],"patternName":"sunflower/person-3","name":"Person-3"}} -->
<div class="wp-block-columns"><!-- wp:column {"className":"mb-md-4"} -->
<div class="wp-block-column mb-md-4"><!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2024/08/Soncnica_-_Sunflower_-_Helianthus_annuus-1024x768.jpg" alt="Eine gelbe Sonnenblume vor blauem Himmel."/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname-Doppelname</p>
<!-- /wp:paragraph -->

Expand All @@ -15,7 +15,7 @@
<p class="person-mail no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- /wp:paragraph -->

<!-- wp:group {"className":"d-flex p-0"} -->
<!-- wp:group {"className":"d-flex p-0","layout":{"type":"flex","flexWrap":"wrap"}} -->
<div class="wp-block-group d-flex p-0"><!-- wp:sunflower/meta-data {"icon":"fab fa-x-twitter"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-x-twitter"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand All @@ -28,6 +28,10 @@
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-facebook-f"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-whatsapp"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-whatsapp"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-threads"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-threads"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand Down Expand Up @@ -56,8 +60,8 @@
<!-- /wp:column -->

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2024/08/Soncnica_-_Sunflower_-_Helianthus_annuus-1024x768.jpg" alt="Eine gelbe Sonnenblume vor blauem Himmel."/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname</p>
<!-- /wp:paragraph -->

Expand All @@ -69,7 +73,7 @@
<p class="person-mail no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- /wp:paragraph -->

<!-- wp:group {"className":"d-flex p-0"} -->
<!-- wp:group {"className":"d-flex p-0","layout":{"type":"flex","flexWrap":"wrap"}} -->
<div class="wp-block-group d-flex p-0"><!-- wp:sunflower/meta-data {"icon":"fab fa-x-twitter"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-x-twitter"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand All @@ -82,6 +86,10 @@
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-facebook-f"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-whatsapp"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-whatsapp"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-threads"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-threads"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand Down Expand Up @@ -110,8 +118,8 @@
<!-- /wp:column -->

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-column"><!-- wp:media-text {"align":"wide","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2024/08/Soncnica_-_Sunflower_-_Helianthus_annuus-1024x768.jpg" alt="Eine gelbe Sonnenblume vor blauem Himmel."/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname</p>
<!-- /wp:paragraph -->

Expand All @@ -123,7 +131,7 @@
<p class="person-mail no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- /wp:paragraph -->

<!-- wp:group {"className":"d-flex p-0"} -->
<!-- wp:group {"className":"d-flex p-0","layout":{"type":"flex","flexWrap":"wrap"}} -->
<div class="wp-block-group d-flex p-0"><!-- wp:sunflower/meta-data {"icon":"fab fa-x-twitter"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-x-twitter"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand All @@ -136,6 +144,10 @@
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-facebook-f"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-whatsapp"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-whatsapp"></i></a></div>
<!-- /wp:sunflower/meta-data -->

<!-- wp:sunflower/meta-data {"icon":"fab fa-threads"} -->
<div class="wp-block-sunflower-meta-data"><a href="" target="_blank" rel="noopener noreferrer"><i class="fab fa-threads"></i></a></div>
<!-- /wp:sunflower/meta-data -->
Expand Down
Loading

0 comments on commit 37084a7

Please sign in to comment.