Skip to content

Shortcodes: update Recipe shortcode from WordPress.com#7125

Merged
dereksmart merged 8 commits intomasterfrom
update/recipe-shortcode-wpcom-merge
May 29, 2017
Merged

Shortcodes: update Recipe shortcode from WordPress.com#7125
dereksmart merged 8 commits intomasterfrom
update/recipe-shortcode-wpcom-merge

Conversation

@jeherve
Copy link
Copy Markdown
Member

@jeherve jeherve commented May 5, 2017

Changes proposed in this Pull Request:

  • Bring changes from WordPress.com over to Jetpack to sync the Recipe shortcode.

Testing instructions:

  • Insert a recipe in a new post, by following the instructions here
  • Publish your post.
  • Run your post through Google's Rich Snippets testing tool and make sure no errors are returned. You will see some warnings but those are okay for now.

Proposed changelog entry for your changes:

  • Shortcodes: update schema.org markup for the Recipe shortcode.

sarahmonster and others added 7 commits May 5, 2017 12:52
There were two problem identified with the Schema.org markup:

Merges r143990-wpcom
There were three problems identified with the Schema.org markup:

- `itemscope itemtype="http://schema.org/Recipe"` needed to be applied to the containing div
- `itemprop="name"` needed to be applied to the title h3
- the recipe image should use `itemprop="image"` instead of `thumbnailUrl`

The first two issues are resolved by adding the relevant attributes to the
$allowedposttags global (they were being stripped out by wp_kses_post),
and the latter is solved by changing the itemprop value.

Merges r143993-wpcom
…to satisfy Schema.org requirements.

Merges r143997-wpcom
Stripping content on save.

r143990-wpcom
r143993-wpcom
r143997-wpcom

https://[private link]

Merges r144007-wpcom
There were several problems identified with the Schema.org markup:
- `itemscope itemtype="http://schema.org/Recipe"` needed to be applied to the containing div:
Output: `<div class="hrecipe jetpack-recipe" itemscope="" itemtype="http://schema.org/Recipe">`
- `itemprop="name"` needed to be applied to the title h3:
Output: `<h3 class="jetpack-recipe-title" itemprop="name">`
- the recipe image should use `itemprop="image"` instead of `thumbnailUrl`:
Output: `<img class="jetpack-recipe-image" itemprop="image" ...>`
- the description should have an `itemprop="description"`
Output: `<p class="jetpack-recipe-description" itemprop="description">`
- `itemprop="recipeInstructions"` should be set on the ul containing the instructions
Output: `<li itemprop="recipeIngredient">`
- `itemprop="recipeIngredient"` should be set for every li in the directions list
Output: `<ul itemprop="recipeInstructions">`
This change fixed the issues listed above and outputs the correct attributes.

Merges r145089-wpcom
Avoid errors when running phpcs.

Merges r155633-wpcom
…7130)

We previously displayed the total recipe time as the user provided it in the shortcode.
While that works on the site, that format isn't compatible with Schema.org.
Search engines relying on Schema.org to display recipe previews expect the recipe time to use ISO 8601 formatted duration
interval.

This commit does 2 things:
- It adds a new shared function allowing you to convert any user-inputted duration into ISO 8601 formatted duration.
- It uses the shared function to output a new `time` tag in the recipe output, where that formatted duration is added as a
datetime attribute.
@eliorivero
Copy link
Copy Markdown
Contributor

Interesting that the time added in the example https://en.support.wordpress.com/recipes/#example is not correct for Google and throws a warning.
Instead of time="2hr 30min" or 2h30m you have to add 2:30 following the ISO 8601 time format https://en.wikipedia.org/wiki/ISO_8601#Times
Only then you don't get a warning for this.
Still, this does the job, and the correct format could be stated in a doc.
LGTM 🐑

@jeherve
Copy link
Copy Markdown
Member Author

jeherve commented May 26, 2017

Yeah, ideally we would convert as many provided times into ISO 8601 formatted duration as possible, so the site owner can just enter any time they want. I'm just not sure how to do that yet. That's something I'll think about!

@eliorivero eliorivero added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review This PR is ready for review. labels May 27, 2017
@dereksmart dereksmart merged commit 8b92d40 into master May 29, 2017
@dereksmart dereksmart deleted the update/recipe-shortcode-wpcom-merge branch May 29, 2017 16:23
@dereksmart dereksmart removed the [Status] Ready to Merge Go ahead, you can push that green button! label May 29, 2017
jeherve added a commit that referenced this pull request May 29, 2017
eliorivero pushed a commit that referenced this pull request May 30, 2017
* Changelog: first pass at a changelog for 5.0

* Changelog: delete 4.9 testing list.

* Changelog: update minimum WP version to match ver. in jetpack.php

Fixes #7158

* Changelog: add #6051

* Changelog: add #6753

* Changelog: add #6928

* Changelog: add #6964

* Changelog: add #7014

* Changelog: add #7057

* Changelog: add #7060

* Changelog: add #7068

* Changelog: add #7070

* Changelog: add #7072

* Changelog: add #7071

* Changelog: add release date and post shortlink.

* Changelog: add #7094

* Changelog: add #7100

* Changelog: add #7108

* Changelog: add #7113

* Changelog: add #7123

* Changelog: add #7135

* Changelog: add #7143

* Changelog: add #7151

* Changelog: add #6996

* Changelog: add #7105

* Changelog: add #7132

* Changelog: add #7166

* Changelog: fix typo in 4.9 changelog.

* Changelog: remove older releases' changelogs.

@see p1HpG7-42e-p2

* Changelog: add #7090

* Changelog: add #7095

* Changelog: add #7112

* Changelog: add #7115

* Changelog: add #7122

* Changelog: add #7137

* Changelog: add #7138

* Changelog: add #7140

* Changelog: add #7154

* Changelog: add ##7155

* Changelog: add #7163

* Changelog: add #7167

* Changelog: add #7171

* Changelog: add #7180

* Changelog: add #7181

* Changelog: add #7183

* Changelog: add #7184

* Changelog: add #7189

* Changelog: add #7191

* Changelog: add #7193

* Changelog: add #7198

* Changelog: add #7200

* Changelog: add #7209

* Changelog: add #7212

* Testing list: add instructions for #7115

* Changelog: add #7188

* Changelog: add #7205

* Changelog: add #7225

* Changelog: add #6872

* Changelog: add #7107

* Changelog: add #7118

* Changelog: add #7142

* Changelog: add #7170

* Changelog: add #7210

* Changelog: add #7218

* Changelog: add #7232

* Changelog: add #7211

* Changelog: add #7213

* Changelog: add #7229

* Changelog: add #7230

* Changelog: add #7214

* Draft changelog for 5.0

* Changelog updates: 2nd pass at a clearer changelog.

- Fix typos.
- Use consistent tense and tone across all changelog.
- Remove unclear items.

* Changelog: add #7026

* Changelog: add #7058

* Changelog: add #7125

* Changelog: add #7249

* Changelog: add #7185

* add mentions of image widget migration

* Changelog: add info about new output for CLI command.

* Changelog: add WP version number matching the new Image Widget.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants