Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
27 changes: 0 additions & 27 deletions modules/ROOT/pages/editor-premium-upgrade-promotion.adoc

This file was deleted.

2 changes: 1 addition & 1 deletion modules/ROOT/pages/initial-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 6 additions & 0 deletions modules/ROOT/pages/promotions.adoc
Original file line number Diff line number Diff line change
@@ -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[]
21 changes: 21 additions & 0 deletions modules/ROOT/partials/configuration/onboarding.adoc
Original file line number Diff line number Diff line change
@@ -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
});
----
15 changes: 4 additions & 11 deletions modules/ROOT/partials/configuration/promotion.adoc
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
[[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+`

*Default value:* `+true+` in Community self-hosted instances; otherwise `+false+`.

*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.
----
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
[[premium-upgrade-promotion-option]]
== Premium upgrade promotion option
== Open source promotion

include::partial$configuration/promotion.adoc[leveloffset=+1]
include::partial$configuration/promotion.adoc[leveloffset=+1]

== Cloud promotion

include::partial$configuration/onboarding.adoc[leveloffset=+1]