diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-actions-and-events.md b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-actions-and-events.md index f4b6ae92c2a..2eff3006256 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-actions-and-events.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-actions-and-events.md @@ -560,7 +560,7 @@ event.response changeToLayoutContainer - Update's amp-list's layout to layout="CONTAINTER" to allow dynamic resizing. + Update's amp-list's layout to layout="CONTAINER" to allow dynamic resizing. refresh @@ -726,7 +726,7 @@ actions that apply to the whole document. navigateTo(url=STRING, target=STRING, opener=BOOLEAN) -

Navigates current window to given URL, to the optional specified target if given (currenly only supporting _top and _blank ). The optional opener parameter can be specified when using a target of _blank to allow the newly opened page to access window.opener.

+

Navigates current window to given URL, to the optional specified target if given (currently only supporting _top and _blank ). The optional opener parameter can be specified when using a target of _blank to allow the newly opened page to access window.opener.

Caveat: Using normal <a> links is recommended wherever possible since AMP.navigateTo is not recognized by web crawlers.

diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-email-actions-and-events.md b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-email-actions-and-events.md index 1fd79eb4734..9214634a15a 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-email-actions-and-events.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/amp-email-actions-and-events.md @@ -447,7 +447,7 @@ event.response changeToLayoutContainer - Update's amp-list's layout to layout="CONTAINTER" to allow dynamic resizing. + Update's amp-list's layout to layout="CONTAINER" to allow dynamic resizing. refresh diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-format.md b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-format.md index 6ec086658b2..95bf6299237 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-format.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-format.md @@ -49,7 +49,7 @@ An AMP email message MUST - contain a top-level `` tag (`` is accepted as well). [🔗](#ampd) - contain `` and `` tags (They are optional in HTML). [🔗](#crps) - contain a `` tag as the first child of their head tag. [🔗](#chrs) -- contain a `` tag inside their head tag. [🔗](#scrpt) +- contain a `` tag inside their head tag. [🔗](#script) - contain amp4email boilerplate (``) inside their head tag to initially hide the content until AMP JS is loaded. [🔗](#boilerplate) The entire AMPHTML markup must not exceed 200,000 bytes. diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-structure.md b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-structure.md index e69de29bb2d..cc6756b4d34 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-structure.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/email-spec/amp-email-structure.md @@ -0,0 +1,92 @@ +--- +$title: Structure and rendering of AMP emails +order: 2 +formats: + - email +teaser: + text: >- + Email is structured as a MIME tree. This MIME tree contains the message body + and any attachments to the email. +toc: true +--- + + + + + +Email is structured as a [MIME tree](https://en.wikipedia.org/wiki/MIME). This MIME tree contains the message body and any attachments to the email. + +To embed AMP within an email, add a new MIME part with a content type of `text/x-amp-html` as a descendant of `multipart/alternative`. It should live alongside the existing `text/html` or `text/plain` parts. This ensures that the email message works on all clients. + + + + + +For more information about the `multipart/alternative` subtype, refer to [RFC 1521, section 7.2.3](https://tools.ietf.org/html/rfc1521#section-7.2.3). + +## Additional information + +The `text/x-amp-html` part must be nested under a `multipart/alternative` node. +An email cannot have more than one `text/x-amp-html` part inside a `multipart/alternative` node. + +The `multipart/alternative` must contain at least one non-AMP (`text/plain` or `text/html`) node in addition to the +`text/x-amp-html` node. This will be displayed to users whose email clients don't support AMP or who opted out via +their email provider's settings. + +Note: Some email clients[[1]](https://openradar.appspot.com/radar?id=6054696888303616) will only render the last MIME part, +so we recommend placing the `text/x-amp-html` MIME part _before_ the `text/html` MIME part. + +### Replying/forwarding semantics + +The email client strips out the `text/x-amp-html` part of the MIME tree when a user replies to or forwards an AMP email message. + +### Expiry + +The email client may stop displaying the AMP part of an email after a set period of time, e.g. 30 days. In this +case, emails will display the `text/html` or `text/plain` part. + +## Example + + +[sourcecode:html] +From: Person A +To: Person B +Subject: An AMP email! +Content-Type: multipart/alternative; boundary="001a114634ac3555ae05525685ae" + +--001a114634ac3555ae05525685ae +Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes + +Hello World in plain text! + +--001a114634ac3555ae05525685ae +Content-Type: text/x-amp-html; charset="UTF-8" + + + + + + + + + +Hello World in AMP! + + +--001a114634ac3555ae05525685ae +Content-Type: text/html; charset="UTF-8" + +Hello World in HTML! +--001a114634ac3555ae05525685ae-- +[/sourcecode] + \ No newline at end of file diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amp-video-interface.md b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amp-video-interface.md index aeabc6e02a3..ac68f4afe95 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amp-video-interface.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amp-video-interface.md @@ -59,7 +59,6 @@ these players implement. - [amp-nexxtv-player](https://amp.dev/documentation/components/amp-nexxtv-player) - [amp-ooyala-player](https://amp.dev/documentation/components/amp-ooyala-player) - [amp-powr-player](https://amp.dev/documentation/components/amp-powr-player) -- [amp-redbull-player](https://amp.dev/documentation/components/amp-redbull-player) - [amp-vimeo](https://amp.dev/documentation/components/amp-vimeo) - [amp-viqeo-player](https://amp.dev/documentation/components/amp-viqeo-player) - [amp-wistia-player](https://amp.dev/documentation/components/amp-wistia-player) diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amphtml.md b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amphtml.md index fe148eb604a..7f06b506211 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amphtml.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/learn/spec/amphtml.md @@ -178,7 +178,7 @@ AMP HTML documents MUST - contain a `` tag inside their head that points to the regular HTML version of the AMP HTML document or to itself if no such HTML version exists. [🔗](#canon) - contain a `` tag as the first child of their head tag. [🔗](#chrs) - contain a `` tag inside their head tag. It's also recommended to include `minimum-scale=1` and `initial-scale=1`. [🔗](#vprt) -- contain a `` tag inside their head tag. [🔗](#scrpt) +- contain a `` tag inside their head tag. [🔗](#script) - contain the [AMP boilerplate code](https://github.com/ampproject/amphtml/blob/master/docs/spec/amp-boilerplate.md) (`head > style[amp-boilerplate]` and `noscript > style[amp-boilerplate]`) in their head tag. [🔗](#boilerplate) ### Metadata @@ -583,7 +583,7 @@ Currently, the following SVG elements are allowed: - [descriptive elements](https://svgwg.org/svg2-draft/struct.html#TermDescriptiveElement): "desc", "metadata", and "title". - [filter primitive elements](https://drafts.fxtf.org/filter-effects/#filter-primitive): "feColorMatrix", "feComposite", "feGaussianBlur", "feMerge", "feMergeNode", and "feOffset". - uncategorized elements: "view", and "filter". -- deprecated elements: ["glyph"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyph), ["glyphRef"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyphRef), ["hkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/hkern), ["solidcolor"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/solidcolor), ["tref"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/tref), and ["vkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/vkern). +- deprecated elements: ["glyph"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyph), ["glyphRef"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/glyphRef), ["hkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/hkern), ["tref"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/tref), and ["vkern"](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/vkern). As well as these attributes: diff --git a/pages/content/amp-dev/documentation/guides-and-tutorials/optimize-measure/configure-analytics/analytics-vendors.md b/pages/content/amp-dev/documentation/guides-and-tutorials/optimize-measure/configure-analytics/analytics-vendors.md index f6c00dc7a0a..5876183faff 100644 --- a/pages/content/amp-dev/documentation/guides-and-tutorials/optimize-measure/configure-analytics/analytics-vendors.md +++ b/pages/content/amp-dev/documentation/guides-and-tutorials/optimize-measure/configure-analytics/analytics-vendors.md @@ -95,7 +95,7 @@ Adds support for AppsFlyer. More details for adding AppsFlyer support can be fou Type attribute value: `atinternet` -Adds support for AT Internet. More details for adding AT Internet support can be found at [developers.atinternet-solutions.com](http://developers.atinternet-solutions.com/javascript-en/advanced-features-javascript-en/accelerated-mobile-pages-amp-javascript-en/). +Adds support for AT Internet. More details for adding AT Internet support can be found at [developers.atinternet-solutions.com](https://developers.atinternet-solutions.com/as2-tagging-en/javascript-en/advanced-features-javascript-en/accelerated-mobile-pages-amp-javascript-en/index.html). ### Baidu Analytics @@ -204,7 +204,6 @@ Adds support for Dynatrace real user monitoring. Requires defining _var_ `app` w Type attribute value: `epica` Adds support for EPICA page views and events. -More details can be found at [EPICA docs](https://www.epica.ai). ### Eulerian Analytics @@ -257,7 +256,7 @@ Unlike other analytics vendors, Google Tag Manager is a tag management service, Type attribute value: `ibeatanalytics` -Adds support for Ibeat Analytics. More details for adding Ibeat support can be found at [Ibeat Integration Support](https://ibeat.indiatimes.com/support.html#h.a5rit14mwie1). +Adds support for Ibeat Analytics. @@ -347,13 +346,13 @@ Adds support for Krux. Configuration details can be found at [help.krux.com](htt Type attribute value: `linkpulse` -Adds support for Linkpulse. Configuration details can be found at [docs.linkpulse.com](http://docs.linkpulse.com). +Adds support for Linkpulse. Configuration details can be found at [docs.linkpulse.com](https://www.kilkaya.com/). ### Lotame Type attribute value: `lotame` -Adds support for Lotame. More information and configuration details can be found at [my.lotame.com](https://my.lotame.com/t/83h37h9/overview-1st-party-data-collection-in-google-amp). +Adds support for Lotame. More information and configuration details can be found at [my.lotame.com](https://my.lotame.com/). ### Mapp Intelligence @@ -427,6 +426,12 @@ Adds support for [SOASTA mPulse](https://www.soasta.com/mPulse). Configuration d Type attribute value: `navegg` +### Neodata + +Type attribute value: `neodata` + +Adds support for Neodata Audience Platform. Please contact our support team to get set up with your `sysId`, `tagId` and `advId` parameters in the `vars` section. + ### New Relic Type attribute value: `newrelic` @@ -443,7 +448,7 @@ Adds support for Nielsen DCR. Please contact your Nielsen representative to get Type attribute value: `nielsen-marketing-cloud` -Adds support for Nielsen Marketing Cloud. More details can be found at [Nielsen Marketing Cloud](http://www.nielsen.com/us/en/solutions/capabilities/nielsen-marketing-cloud.html). +Adds support for Nielsen Marketing Cloud. More details can be found at [Nielsen Marketing Cloud](https://www.nielsen.com/solutions/media-planning/marketing-cloud/). ### OEWA @@ -580,13 +585,13 @@ Find out more on the implementation check our documentation at [docs.rudderstack Type attribute value: `segment` Adds support for segment page views and events. -To see the full list of fields that you can send, see [Segment Spec](https://segment.com/docs/spec/). +To see the full list of fields that you can send, see [Segment Spec](https://segment.com/docs/connections/spec/). ### SensorsData Type attribute value: `sensorsanalytics` -Adds support for Sensors Data. More details for adding Sensors Data support can be found at [sensorsdata.com](https://manual.sensorsdata.cn/sa/latest/web-js-sdk-7548149.html). +Adds support for Sensors Data. More details for adding Sensors Data support can be found at [sensorsdata.com](https://manual.sensorsdata.cn/). ### ShinyStat @@ -650,6 +655,10 @@ Type attribute value: `treasuredata` Adds support for Treasure Data. Configuration details can be found at [docs.treasuredata.com](https://docs.treasuredata.com/display/public/INT/Google+Accelerated+Mobile+Pages+AMP). +### Triboo Data Analytics + +Type attribute value: `tribooanalytics` + ### Umeng+ Analytics Type attribute value: `umenganalytics` diff --git a/pages/shared/data/faq.yaml b/pages/shared/data/faq.yaml index 070e8949018..2ea1735950e 100644 --- a/pages/shared/data/faq.yaml +++ b/pages/shared/data/faq.yaml @@ -112,6 +112,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/adman.md - label: Admanmedia url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/admanmedia.md + - label: AdMatic + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/admatic.md - label: Admixer url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/admixer.md - label: Adnuntius @@ -150,6 +152,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/adstir.md - label: AdStyle url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/adstyle.md + - label: Adsviu + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/adsviu.md - label: AdTech url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/adtech.md - label: Adtelligent @@ -198,6 +202,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/baidu.md - label: BeaverAds url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/beaverads.md + - label: Bidgear + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/bidgear.md - label: Bidtellect url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/bidtellect.md - label: Blade @@ -270,6 +276,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/f1e.md - label: F1H url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/f1h.md + - label: Fairground + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/fairground.md - label: FeedAd url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/feedad.md - label: felmat @@ -316,6 +324,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/imonomy.md - label: Improve Digital url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/improvedigital.md + - label: IncrementX + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/incrementx.md - label: Industrybrains url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/industrybrains.md - label: InMobi @@ -386,6 +396,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/miximedia.md - label: Mixpo url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/mixpo.md + - label: Momagic + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/momagic.md - label: Monetizer101 url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/monetizer101.md - label: mox.tv @@ -434,6 +446,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/opinary.md - label: Outbrain url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/outbrain.md + - label: Pixad + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/pixad.md - label: Pixels url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/pixels.md - label: PlayStream @@ -462,6 +476,8 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/pubmatic.md - label: Pubmine url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/pubmine.md + - label: Example + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/pubscale.md - label: puffnetwork url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/puffnetwork.md - label: Pulse @@ -516,12 +532,16 @@ platform_and_vendor_partners: url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/seedtag.md - label: Sekindo url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/sekindo.md + - label: Sevio + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/sevio.md - label: Sharethrough url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/sharethrough.md - label: SHE Media url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/shemedia.md - label: Sklik.cz url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/sklik.md + - label: Example + url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/skoiy.md - label: SlimCut Media url: https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/../../ads/vendors/slimcutmedia.md - label: SmartAdServer diff --git a/platform/config/component-versions.json b/platform/config/component-versions.json index 825d91f9500..69cca5de34a 100644 --- a/platform/config/component-versions.json +++ b/platform/config/component-versions.json @@ -105,7 +105,6 @@ "amp-powr-player": "0.1", "amp-reach-player": "0.1", "amp-recaptcha-input": "0.1", - "amp-redbull-player": "0.1", "amp-reddit": "0.1", "amp-render": "1.0", "amp-resize-observer-polyfill": "0.1", @@ -116,6 +115,7 @@ "amp-sidebar": "0.1", "amp-skimlinks": "0.1", "amp-slides": "0.1", + "amp-slikeplayer": "0.1", "amp-smartlinks": "0.1", "amp-social-share": "0.1", "amp-soundcloud": "0.1", @@ -124,6 +124,9 @@ "amp-sticky-ad": "1.0", "amp-story": "1.0", "amp-story-360": "0.1", + "amp-story-audio-sticker": "0.1", + "amp-story-audio-sticker-pretap": "1.0", + "amp-story-audio-sticker-posttap": "1.0", "amp-story-auto-ads": "0.1", "amp-story-auto-analytics": "0.1", "amp-story-captions": "0.1",