diff --git a/content/docs/1_guide/11_users/2_roles/guide.txt b/content/docs/1_guide/11_users/2_roles/guide.txt index 0e7d3bfe82..13e0185e22 100644 --- a/content/docs/1_guide/11_users/2_roles/guide.txt +++ b/content/docs/1_guide/11_users/2_roles/guide.txt @@ -54,7 +54,7 @@ tabs: info: label: Additional info - icon: instagram + icon: mastodon sections: info: type: fields @@ -63,10 +63,10 @@ tabs: label: Website type: url width: 1/2 - instagram: - label: Instagram + mastodon: + label: Mastodon type: text - icon: instagram + icon: mastodon width: 1/2 bio: label: Bio diff --git a/content/docs/2_reference/3_panel/8_samples/0_user/reference-article.txt b/content/docs/2_reference/3_panel/8_samples/0_user/reference-article.txt index d12397e9e2..8575e80529 100644 --- a/content/docs/2_reference/3_panel/8_samples/0_user/reference-article.txt +++ b/content/docs/2_reference/3_panel/8_samples/0_user/reference-article.txt @@ -39,15 +39,15 @@ columns: website: label: Website type: url - fediverse: - label: Fediverse URL + mastodon: + label: Mastodon type: url icon: mastodon placeholder: https://example.com/@username - instagram: - label: Instagram + bluesky: + label: Bluesky type: text - icon: instagram + icon: bluesky placeholder: username ``` @@ -72,10 +72,10 @@ sections: icon: mastodon placeholder: https://example.com/@username width: 1/3 - instagram: - label: Instagram + bluesky: + label: Bluesky type: text - icon: instagram + icon: bluesky placeholder: username width: 1/3 documents: diff --git a/content/docs/2_reference/7_plugins/1_extensions/0_panel-areas/reference-extension.txt b/content/docs/2_reference/7_plugins/1_extensions/0_panel-areas/reference-extension.txt index 06177c2aa2..a436b230a1 100644 --- a/content/docs/2_reference/7_plugins/1_extensions/0_panel-areas/reference-extension.txt +++ b/content/docs/2_reference/7_plugins/1_extensions/0_panel-areas/reference-extension.txt @@ -307,7 +307,7 @@ The `k-users-view` component uses the `k-inside` component as a basic wrapper. T In this example, the list of users is just a basic unordered list, but of course, this could be anything. A big table, custom cards, or whatever you need to show your users appropriately. -The backend part of your overwritten view is now sending exactly what your component needs. If you find out that you want to send your users in alphabetical groups or every user object should also contain the Instagram follower count, go for it. +The backend part of your overwritten view is now sending exactly what your component needs. If you find out that you want to send your users in alphabetical groups or every user object should also contain the Mastodon follower count, go for it. ```php Kirby::plugin('custom/users', [ diff --git a/content/docs/3_cookbook/0_development-deployment/0_programmable-blueprints/cookbook-recipe.txt b/content/docs/3_cookbook/0_development-deployment/0_programmable-blueprints/cookbook-recipe.txt index 0d64256a0b..8b21e2723c 100644 --- a/content/docs/3_cookbook/0_development-deployment/0_programmable-blueprints/cookbook-recipe.txt +++ b/content/docs/3_cookbook/0_development-deployment/0_programmable-blueprints/cookbook-recipe.txt @@ -588,8 +588,8 @@ $basicBlueprint = Data::read(__DIR__ . '/seo-basic.yml', 'yaml'); $basicBlueprint['label'] = 'SEO'; $fields = $basicBlueprint['sections']['basicMeta']['fields']; $basicBlueprint['sections']['basicMeta']['fields'] = array_merge($fields, [ - 'twitterHandle' => [ - 'label' => 'Twitter handle', + 'mastodonHandle' => [ + 'label' => 'Mastodon handle', 'type' => 'text', ] ]); @@ -599,7 +599,7 @@ return $basicBlueprint; First, we read the file we want to extend into an array with `Data::read()`. -Then we change the tab label and add a new field in the `basicMeta` section by merging the original fields array with the new `twitterHandle` field. +Then we change the tab label and add a new field in the `basicMeta` section by merging the original fields array with the new `mastodonHandle` field. We can now add this tab in our page blueprints: diff --git a/content/docs/3_cookbook/0_integrations/0_indieauth/cookbook-recipe.txt b/content/docs/3_cookbook/0_integrations/0_indieauth/cookbook-recipe.txt index aab852be27..f7cb5179fd 100644 --- a/content/docs/3_cookbook/0_integrations/0_indieauth/cookbook-recipe.txt +++ b/content/docs/3_cookbook/0_integrations/0_indieauth/cookbook-recipe.txt @@ -66,8 +66,8 @@ Let's add some to our `/site/snippets/header.php` snippet: <?= $site->title() ?> | <?= $page->title() ?> + - ``` diff --git a/content/docs/4_quicktips/0_redirects/quicktip.txt b/content/docs/4_quicktips/0_redirects/quicktip.txt index 6c508c483c..5ba153e4a2 100644 --- a/content/docs/4_quicktips/0_redirects/quicktip.txt +++ b/content/docs/4_quicktips/0_redirects/quicktip.txt @@ -94,7 +94,7 @@ This template doesn't display anything to the visitor but redirects directly to Now whenever someone visits `https://yourclientsdomain.com/blog`, they will be redirected to `https://ourawesomeproduct.tumblr.com`. And whenever someone visits `https://yourclientsdomain.com/support`, they will be redirected to `https://zendesk.com/ourawesomeproduct`. The menu is 100% editable from the Panel and you don't need to hack anything. Another side effect is that your client now has those nice branded URLs for their external support platform and blog. -Once you've installed the `link.php` template, you can also use it to create more custom shortened links for your client. By adding invisible folders to the main content folder, you could also create redirects like `http://yourclientsdomain.com/facebook` or `http://yourclientsdomain.com/someothershortenedlink` +Once you've installed the `link.php` template, you can also use it to create more custom shortened links for your client. By adding invisible folders to the main content folder, you could also create redirects like `http://yourclientsdomain.com/mastodon` or `http://yourclientsdomain.com/someothershortenedlink` ## Route instead of template diff --git a/content/docs/4_quicktips/0_share-buttons/quicktip.txt b/content/docs/4_quicktips/0_share-buttons/quicktip.txt deleted file mode 100644 index 4329e12215..0000000000 --- a/content/docs/4_quicktips/0_share-buttons/quicktip.txt +++ /dev/null @@ -1,37 +0,0 @@ -Title: Share buttons - ----- - -Description: Add basic Twitter and Facebook buttons to your site. - ----- - -Authors: - authors/sonja-broda - ----- - -Tags: integrations - ----- - -Text: - -## Tweet Button - -```php - - Tweet - -``` - -This link will share the title and the corresponding url of the current page on Twitter. Replace `@your_account` with your own user name! - -## Facebook Button - -```php - - Share on Facebook - -``` - -This link will share the current page on Facebook. diff --git a/content/home/1_company/home-story.txt b/content/home/1_company/home-story.txt index 61b3b487b4..c6b92c8e67 100644 --- a/content/home/1_company/home-story.txt +++ b/content/home/1_company/home-story.txt @@ -32,7 +32,7 @@ Mastodon: @h-and-c@h-and-c.social −--- -Instagram: @h-and-c +Bluesky: @h-and-c.com ---- @@ -57,7 +57,7 @@ Api: ```json { "site": { - "title": "H&C", "mastodon": "@h-and-c@h-and-c.social", "instagram": "@h-and-c" + "title": "H&C", "mastodon": "@h-and-c@h-and-c.social", "bluesky": "@h-and-c.com" }, "projects": [ { "title": "Creatious Labs.", "url": "/projects/creatious-labs" }, diff --git a/content/releases/3-8/release.txt b/content/releases/3-8/release.txt index 7abc196c74..4023ce251d 100644 --- a/content/releases/3-8/release.txt +++ b/content/releases/3-8/release.txt @@ -231,7 +231,7 @@ options: type: query query: site.contactoptions.toStructure text: "{< item.nameWithHtml >}" - value: "{{ item.twitter }}" + value: "{{ item.mastodon }}" ``` **Core** diff --git a/content/voices/0_andy-bell/voice.txt b/content/voices/0_andy-bell/voice.txt index 02b38d9c36..96a07e0f0b 100644 --- a/content/voices/0_andy-bell/voice.txt +++ b/content/voices/0_andy-bell/voice.txt @@ -10,8 +10,4 @@ Text: Blimey, Kirby has come on a lot since I last used it. A fantastic CMS. ---- -Link: https://twitter.com/piccalilli_/status/1191815150178897924 - ----- - Bio: Developer & author diff --git a/content/voices/0_cameron-moll/voice.txt b/content/voices/0_cameron-moll/voice.txt index 0c6ebb369e..cbd694f8c7 100644 --- a/content/voices/0_cameron-moll/voice.txt +++ b/content/voices/0_cameron-moll/voice.txt @@ -10,8 +10,4 @@ Text: I've been kicking the tires on Kirby as I revamp my site and it's been... ---- -Link: https://twitter.com/cameronmoll/status/1222951871763054593 - ----- - Bio: VP design/research diff --git a/content/voices/0_colly/voice.txt b/content/voices/0_colly/voice.txt index a464621584..071ae73f24 100644 --- a/content/voices/0_colly/voice.txt +++ b/content/voices/0_colly/voice.txt @@ -2,8 +2,6 @@ Title: Simon Collison ---- Username: colly ---- -Link: https://twitter.com/colly/status/1214864770035322880 ----- Text: Switching my sites to Kirby has transformed how I feel about them. I've rediscovered the ”designers who hack” spirit … I feel like I can build anything. ---- Website: https://colly.com diff --git a/content/voices/0_edenspiekermann/voice.txt b/content/voices/0_edenspiekermann/voice.txt index b724ffb8ea..079034f1a2 100644 --- a/content/voices/0_edenspiekermann/voice.txt +++ b/content/voices/0_edenspiekermann/voice.txt @@ -6,9 +6,6 @@ Username: edenspiekermann ---- -Link: https://twitter.com/edenspiekermann/status/504655558629392385 - ----- Website: https://www.edenspiekermann.com/ diff --git a/content/voices/0_geri-coady/voice.txt b/content/voices/0_geri-coady/voice.txt index 35112b09ef..3751a99ae1 100644 --- a/content/voices/0_geri-coady/voice.txt +++ b/content/voices/0_geri-coady/voice.txt @@ -2,10 +2,6 @@ Title: Geri Coady ---- -Link: https://twitter.com/hellogeri/status/1323753534656053251 - ----- - Website: https://www.geridrawsjapan.com/ ---- diff --git a/content/voices/0_julie-ng/voice.txt b/content/voices/0_julie-ng/voice.txt index 181bc1bd0b..bc2b076c07 100644 --- a/content/voices/0_julie-ng/voice.txt +++ b/content/voices/0_julie-ng/voice.txt @@ -1,7 +1,5 @@ Title: Julie Ng ---- -Link: https://twitter.com/jng5/status/199608333215342595 ----- Text: Really loving how flexible Kirby is. The documentation is also really thorough and fab. ---- Bio: Developer at Microsoft diff --git a/content/voices/0_matthias-ott/voice.txt b/content/voices/0_matthias-ott/voice.txt index 41418dc125..d81a78898e 100644 --- a/content/voices/0_matthias-ott/voice.txt +++ b/content/voices/0_matthias-ott/voice.txt @@ -10,8 +10,4 @@ Text: Working with Kirby is such a joy! ---- -Link: https://twitter.com/m_ott/status/1235134616023031808 - ----- - Bio: UX designer, UI engineer, teacher, speaker diff --git a/content/voices/0_nigel-ewan/voice.txt b/content/voices/0_nigel-ewan/voice.txt index dc925802fb..f242f1e59d 100644 --- a/content/voices/0_nigel-ewan/voice.txt +++ b/content/voices/0_nigel-ewan/voice.txt @@ -10,8 +10,4 @@ Text: Kirby is the best CMS I’ve ever worked with in 15-ish years of building ---- -Link: https://twitter.com/nigel/status/1215731478996377600 - ----- - Bio: Interdisciplinary designer diff --git a/content/voices/0_rene-stalder/voice.txt b/content/voices/0_rene-stalder/voice.txt index 23cd2d36d7..191dd31d5c 100644 --- a/content/voices/0_rene-stalder/voice.txt +++ b/content/voices/0_rene-stalder/voice.txt @@ -10,8 +10,4 @@ Website: https://renestalder.me/en/ ---- -Link: https://twitter.com/renestalder/status/1362077174581391364 - ----- - Bio: Front-end-developer & accessibility consultant diff --git a/content/voices/0_warchamp7/voice.txt b/content/voices/0_warchamp7/voice.txt index c71152b0f8..822ebca7c3 100644 --- a/content/voices/0_warchamp7/voice.txt +++ b/content/voices/0_warchamp7/voice.txt @@ -10,8 +10,5 @@ Text: Kirby is such a pleasure to work with ---- -Link: https://twitter.com/Warchamp7/status/1182713390881525761 - ----- Bio: Developer at @OBSProject diff --git a/site/plugins/meta/src/PageMeta.php b/site/plugins/meta/src/PageMeta.php index 8835b359a4..7e5f8f3db2 100644 --- a/site/plugins/meta/src/PageMeta.php +++ b/site/plugins/meta/src/PageMeta.php @@ -71,7 +71,8 @@ public function jsonld(): string 'logo' => url('/assets/images/kirby-signet.svg'), 'sameAs' => [ 'https://mastodon.social/@getkirby', - 'https://instagram.com/getkirby', + 'https://bsky.app/profile/getkirby.com', + 'https://www.linkedin.com/company/getkirby' ], ], [ @@ -140,12 +141,9 @@ public function social(): string $og['og:type'] = 'website'; $og['og:title'] = $this->get('ogtitle')->or($this->page->title()); - // other platforms than Twitter also rely on this to display - // large preview images, e.g. Discord - $meta['twitter:card'] = 'summary_large_image'; - // Meta and OpenGraph description $description = $this->get('description', true); + if ($description->isNotEmpty()) { $og['og:description'] = $description->excerpt(200); $meta['description'] = $description->excerpt(160); @@ -158,8 +156,6 @@ public function social(): string if ($thumbnail->alt()->isNotEmpty()) { $og['og:image:alt'] = $thumbnail->alt()->value(); } - } else if ($meta['twitter:card'] === 'summary_large_image') { - $meta['twitter:card'] = 'summary'; } return Tpl::load( diff --git a/site/snippets/layouts/footer.php b/site/snippets/layouts/footer.php index 439d033b3f..6524838b48 100644 --- a/site/snippets/layouts/footer.php +++ b/site/snippets/layouts/footer.php @@ -21,9 +21,6 @@ - - - @@ -96,7 +93,6 @@ 'Community map' => 'https://community.getkirby.com', 'Mastodon' => 'https://mastodon.social/@getkirby', 'LinkedIn' => 'https://www.linkedin.com/company/getkirby', - 'Instagram' => 'https://instagram.com/getkirby', ] ]) ?> diff --git a/site/snippets/layouts/menu.php b/site/snippets/layouts/menu.php index 51af2c3b7b..373a80bbc6 100644 --- a/site/snippets/layouts/menu.php +++ b/site/snippets/layouts/menu.php @@ -66,7 +66,6 @@ '-', 'Mastodon' => 'https://mastodon.social/@getkirby', 'LinkedIn' => 'https://www.linkedin.com/company/getkirby', - 'Instagram' => 'https://instagram.com/getkirby', ] ]) ?> diff --git a/site/snippets/templates/home/updates.php b/site/snippets/templates/home/updates.php index e6f4b6eeae..0d03c77d3d 100644 --- a/site/snippets/templates/home/updates.php +++ b/site/snippets/templates/home/updates.php @@ -2,7 +2,7 @@
$title ?? 'Join the Kirby community!', - 'subtitle' => 'Subscribe to our monthly newsletter. Enter our Discord chat. Watch the screencasts. Follow us in the fediverse and on Instagram for the latest updates.', + 'subtitle' => 'Subscribe to our monthly newsletter. Enter our Discord chat. Watch the screencasts. Follow us on Mastodon or Bluesky for the latest updates.', 'mb' => 3 ]) ?> @@ -13,6 +13,12 @@ Mastodon +
  • + +
    + Bluesky +     +
  • @@ -25,12 +31,6 @@ Discord
    • -
  • - -
    - Instagram -     -
    • diff --git a/site/snippets/templates/release-37/stats.php b/site/snippets/templates/release-37/stats.php index 0d675c9ca2..83b1789740 100644 --- a/site/snippets/templates/release-37/stats.php +++ b/site/snippets/templates/release-37/stats.php @@ -55,7 +55,7 @@

    Easy as 1-2-3

    - Show beautiful stats for your site or shop. Revenues, transactions, Instagram likes, page views… it’s totally up to you. Add as many reports to a stats section as you need. Customize reports using our query syntax, and easily integrate into page models or site methods. + Show beautiful stats for your site or shop. Revenues, transactions, Social media engagement, page views… it’s totally up to you. Add as many reports to a stats section as you need. Customize reports using our query syntax, and easily integrate into page models or site methods.
    diff --git a/site/snippets/voice.php b/site/snippets/voice.php index 72e5baaa4f..82ef5bfe50 100644 --- a/site/snippets/voice.php +++ b/site/snippets/voice.php @@ -3,7 +3,7 @@ text()->widont() ?>