diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index 7766e181be..24c52f925a 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -239,7 +239,7 @@ ** xref:editor-important-options.adoc[Integration options] ** xref:editor-size-options.adoc[Size] ** xref:editor-save-and-submit.adoc[Save and submit] -** xref:editor-premium-upgrade-promotion.adoc[Premium upgrade promotion] +** xref:promotions.adoc[Promotions] * Interface ** Editor modes *** xref:use-tinymce-classic.adoc[Classic editing mode] diff --git a/modules/ROOT/pages/editor-premium-upgrade-promotion.adoc b/modules/ROOT/pages/editor-premium-upgrade-promotion.adoc deleted file mode 100644 index 866df90217..0000000000 --- a/modules/ROOT/pages/editor-premium-upgrade-promotion.adoc +++ /dev/null @@ -1,27 +0,0 @@ -= Premium upgrade promotion -:navtitle: {productname} Premium upgrade promotion -:description: Editor options related to turning the Premium promotion display off -:keywords: upgrade, promotion, premium, button, lightning bolt - -include::partial$misc/premium-upgrade-promotion-option.adoc[] - -[[premium-upgrade-promotion-defaults]] -=== Premium upgrade promotion defaults - -When the Community distribution of {productname} 6.2 is running as a self-hosted instance, an *Upgrade* promotion button appears in the unused corner of the editor menu bar by default. The button does not appear when Community distributions of {productname} are running on the {cloudname}. - -This promotion button redirects to a link:{companyurl}/tinymce-self-hosted-premium-features/[promotion page], showcasing the benefits of the variety of xref:plugins.adoc#premium-plugins[Premium Plugins] available for {productname}. - -When {productname} 6.2 or later is running as part of a Premium plan, the *Upgrade* promotion button is disabled. And it is disabled when running with a Premium plan whether {productname} is running in the {cloudname} or as a self-hosted instance. - -The {productname} Community distribution displays the promotion button when running as a self-hosted instance because the `promotion` option is set to `true` by default. To turn this button off in the Community distribution, set the `promotion` option to `false`. - -[source,js] ----- -tinymce.init({ - selector: "textarea", // change this value according to your HTML - promotion: false -}); ----- - -IMPORTANT: It is not necessary to set `promotion` to `false` when {productname} is running as part of a Premium plan. Running {productname} as part of a Premium plan automatically disables the *Upgrade* promotion button. diff --git a/modules/ROOT/pages/initial-configuration.adoc b/modules/ROOT/pages/initial-configuration.adoc index acb77246f8..ee09416a28 100644 --- a/modules/ROOT/pages/initial-configuration.adoc +++ b/modules/ROOT/pages/initial-configuration.adoc @@ -29,7 +29,7 @@ Editor options related to saving or submitting editor content. | [.lead] -xref:editor-premium-upgrade-promotion.adoc[Premium upgrade promotion] +xref:promotions.adoc[Promotions] Editor options related to turning the Premium promotion display off. diff --git a/modules/ROOT/pages/promotions.adoc b/modules/ROOT/pages/promotions.adoc new file mode 100644 index 0000000000..0ff73b2229 --- /dev/null +++ b/modules/ROOT/pages/promotions.adoc @@ -0,0 +1,6 @@ += Premium upgrade promotion +:navtitle: {productname} Premium upgrade promotion +:description: Editor options related to turning the Premium promotion display off +:keywords: upgrade, promotion, premium, button, lightning bolt + +include::partial$misc/premium-upgrade-promotion-option.adoc[] diff --git a/modules/ROOT/partials/configuration/onboarding.adoc b/modules/ROOT/partials/configuration/onboarding.adoc new file mode 100644 index 0000000000..2e0b0952a2 --- /dev/null +++ b/modules/ROOT/partials/configuration/onboarding.adoc @@ -0,0 +1,21 @@ +[[onboarding]] +== `+onboarding+` + +The cloud version of {productname} contains a promotion for paid features included in the 14-day trial. This promotion can be toggled on or off with the `+onboarding+` option. + +The promotion will automatically disappear when the trial ends. + +*Type:* `+Boolean+` + +*Default value:* `+true+` for cloud instances; otherwise `+false+`. + +*Possible values:* `+true+`, `+false+` + +.Example: using cloud `+onboarding+` +[source,js] +---- +tinymce.init({ + selector: "textarea", // change this value according to your HTML + onboarding: false +}); +---- \ No newline at end of file diff --git a/modules/ROOT/partials/configuration/promotion.adoc b/modules/ROOT/partials/configuration/promotion.adoc index d1e54e82a4..f1dde7a210 100644 --- a/modules/ROOT/partials/configuration/promotion.adoc +++ b/modules/ROOT/partials/configuration/promotion.adoc @@ -1,7 +1,7 @@ [[promotion]] -== `+promotion+` +== `+promotion+` -{productname} 6.2 and later includes the `promotion` option. It controls the presentation or otherwise of a Tiny-specific promotion button. +The open source version of {productname} contains a promotion for paid features. This promotion can be toggled on or off with the `+promotion+` option. *Type:* `+Boolean+` @@ -9,18 +9,11 @@ *Possible values:* `+true+`, `+false+` -See xref:editor-premium-upgrade-promotion.adoc#premium-upgrade-promotion-defaults[Premium upgrade promotion defaults] for details. - -=== Example: using `+promotion+` - +.Example: using open source `+promotion+` [source,js] ---- tinymce.init({ selector: "textarea", // change this value according to your HTML promotion: true }); ----- - -The *Upgrade* promotion appears in the unused corner of the {productname} menu bar. Consequently it does not appear if the menu bar is disabled. - -NOTE: The distribution-specific defaults are not fixed. Someone running {productname} as part of a Premium plan can turn this option on. And someone running the Community distribution of {productname} as a self-hosted instance can turn this option off. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc b/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc index fff022bc2d..f056248aaf 100644 --- a/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc +++ b/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc @@ -1,4 +1,7 @@ -[[premium-upgrade-promotion-option]] -== Premium upgrade promotion option +== Open source promotion -include::partial$configuration/promotion.adoc[leveloffset=+1] \ No newline at end of file +include::partial$configuration/promotion.adoc[leveloffset=+1] + +== Cloud promotion + +include::partial$configuration/onboarding.adoc[leveloffset=+1] \ No newline at end of file