From e3536ceda945229ea556a0ca8a5ef9e7d3d761bd Mon Sep 17 00:00:00 2001 From: abhinavgandham Date: Wed, 5 Feb 2025 11:37:57 +0530 Subject: [PATCH 1/6] DOC-3132: A document watermark can now be specified for the exported file --- modules/ROOT/pages/7.7.0-release-notes.adoc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/ROOT/pages/7.7.0-release-notes.adoc b/modules/ROOT/pages/7.7.0-release-notes.adoc index 8d50e068bf..61a6e352ed 100644 --- a/modules/ROOT/pages/7.7.0-release-notes.adoc +++ b/modules/ROOT/pages/7.7.0-release-notes.adoc @@ -24,17 +24,19 @@ include::partial$misc/admon-releasenotes-for-stable.adoc[] The following premium plugin updates were released alongside {productname} {release-version}. -=== +=== Export to Word -The {productname} {release-version} release includes an accompanying release of the **** premium plugin. +The {productname} {release-version} release includes an accompanying release of the **Export to Word** premium plugin. -**** includes the following . +**Export to Word** includes the following fix. -==== +==== A document watermark can now be specified for the exported file -// CCFR here. +In previous versions of the Export to Word premium plugin, there was no watermark functionality, preventing users from adding watermarks to their exported Word documents. + +{productname} {release-version} resolves this by introducing watermark functionality in the plugin, allowing users to add watermarks to their documents. -For information on the **** plugin, see: xref:.adoc[]. +For information on the **Export to Word** plugin, see: xref:exportword.adoc[Export to Word]. [[improvements]] From 91bc05d10e102f018c5054660177789b272d0160 Mon Sep 17 00:00:00 2001 From: abhinavgandham Date: Mon, 10 Feb 2025 19:30:21 +0530 Subject: [PATCH 2/6] DOC-3132: Added the new option to the export to word documentation. --- .../examples/live-demos/exportword/index.js | 6 ++++- modules/ROOT/pages/exportword.adoc | 2 ++ .../configuration/exportword_watermark.adoc | 23 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 modules/ROOT/partials/configuration/exportword_watermark.adoc diff --git a/modules/ROOT/examples/live-demos/exportword/index.js b/modules/ROOT/examples/live-demos/exportword/index.js index c2dac8038c..8231df6657 100644 --- a/modules/ROOT/examples/live-demos/exportword/index.js +++ b/modules/ROOT/examples/live-demos/exportword/index.js @@ -16,6 +16,10 @@ tinymce.init({ left: "1in", right: "1in" } - } + }, + watermark: { + source: 'http://moxiecode.cachefly.net/tinymce/v9/images/logo.png', + washout: true + }, } }); diff --git a/modules/ROOT/pages/exportword.adoc b/modules/ROOT/pages/exportword.adoc index f633967941..683f32eec9 100644 --- a/modules/ROOT/pages/exportword.adoc +++ b/modules/ROOT/pages/exportword.adoc @@ -77,6 +77,8 @@ include::partial$configuration/exportword_converter_options.adoc[leveloffset=+1] include::partial$configuration/exportword_converter_style.adoc[leveloffset=+1] +include::partial$configuration/exportword_watermark.adoc[leveloffset=+1] + == Commands The {pluginname} plugin provides the following {productname} commands. diff --git a/modules/ROOT/partials/configuration/exportword_watermark.adoc b/modules/ROOT/partials/configuration/exportword_watermark.adoc new file mode 100644 index 0000000000..a9fed95359 --- /dev/null +++ b/modules/ROOT/partials/configuration/exportword_watermark.adoc @@ -0,0 +1,23 @@ +[[watermark]] +== `watermark` + +The `watermark` option allows integrators to add watermarks to their exported word documents. + +*Type:* `+Object+` + +=== Example : using `watermark` + +[source,js] +---- +tinymce.init({ + selector: "textarea", + plugins: ['exportword'], + toolbar: 'exportword', + exportword_converter_options: { + watermark: { + source: 'http://moxiecode.cachefly.net/tinymce/v9/images/logo.png', + washout: true, + } + } +}); +---- \ No newline at end of file From 3c64e12f7fb5b11740d6a8ce3e8b0594de9db69a Mon Sep 17 00:00:00 2001 From: "CODE:AG" <57781325+abhinavgandham@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:34:54 +0530 Subject: [PATCH 3/6] Update modules/ROOT/partials/configuration/exportword_watermark.adoc Co-authored-by: Karl Kemister-Sheppard --- .../configuration/exportword_watermark.adoc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/ROOT/partials/configuration/exportword_watermark.adoc b/modules/ROOT/partials/configuration/exportword_watermark.adoc index a9fed95359..dc09b74c0f 100644 --- a/modules/ROOT/partials/configuration/exportword_watermark.adoc +++ b/modules/ROOT/partials/configuration/exportword_watermark.adoc @@ -10,14 +10,14 @@ The `watermark` option allows integrators to add watermarks to their exported wo [source,js] ---- tinymce.init({ - selector: "textarea", - plugins: ['exportword'], - toolbar: 'exportword', - exportword_converter_options: { - watermark: { - source: 'http://moxiecode.cachefly.net/tinymce/v9/images/logo.png', - washout: true, - } - } + selector: "textarea", + plugins: ['exportword'], + toolbar: 'exportword', + exportword_converter_options: { + watermark: { + source: 'http://moxiecode.cachefly.net/tinymce/v9/images/logo.png', + washout: true, + } + } }); ---- \ No newline at end of file From dda78f59ce1d62733c1b5f58b9e3c4aeab6bb84b Mon Sep 17 00:00:00 2001 From: "CODE:AG" <57781325+abhinavgandham@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:35:23 +0530 Subject: [PATCH 4/6] Update modules/ROOT/partials/configuration/exportword_watermark.adoc Co-authored-by: Karl Kemister-Sheppard --- modules/ROOT/partials/configuration/exportword_watermark.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/partials/configuration/exportword_watermark.adoc b/modules/ROOT/partials/configuration/exportword_watermark.adoc index dc09b74c0f..c8d2dcfa17 100644 --- a/modules/ROOT/partials/configuration/exportword_watermark.adoc +++ b/modules/ROOT/partials/configuration/exportword_watermark.adoc @@ -1,7 +1,7 @@ [[watermark]] == `watermark` -The `watermark` option allows integrators to add watermarks to their exported word documents. +The `watermark` option provides integrators with a way to include semi-transparent image watermarks on each page of the exported document, which can be useful for branding, copyright protection, or decorative purposes. *Type:* `+Object+` From a66aaa3f3c916d91ed8ec7f76aeea3d0621541ff Mon Sep 17 00:00:00 2001 From: "CODE:AG" <57781325+abhinavgandham@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:35:39 +0530 Subject: [PATCH 5/6] Update modules/ROOT/pages/7.7.0-release-notes.adoc Co-authored-by: Karl Kemister-Sheppard --- modules/ROOT/pages/7.7.0-release-notes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/7.7.0-release-notes.adoc b/modules/ROOT/pages/7.7.0-release-notes.adoc index 61a6e352ed..4e64386f15 100644 --- a/modules/ROOT/pages/7.7.0-release-notes.adoc +++ b/modules/ROOT/pages/7.7.0-release-notes.adoc @@ -32,7 +32,7 @@ The {productname} {release-version} release includes an accompanying release of ==== A document watermark can now be specified for the exported file -In previous versions of the Export to Word premium plugin, there was no watermark functionality, preventing users from adding watermarks to their exported Word documents. +Previously, the **Export to Word** premium plugin did not support watermarks, preventing integrators from adding them to exported Word documents. {productname} {release-version} resolves this by introducing watermark functionality in the plugin, allowing users to add watermarks to their documents. From 39d3cad85bc5305359f2401ea775b5726c2b8937 Mon Sep 17 00:00:00 2001 From: "CODE:AG" <57781325+abhinavgandham@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:50:12 +0530 Subject: [PATCH 6/6] Update modules/ROOT/pages/7.7.0-release-notes.adoc Co-authored-by: Karl Kemister-Sheppard --- modules/ROOT/pages/7.7.0-release-notes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/7.7.0-release-notes.adoc b/modules/ROOT/pages/7.7.0-release-notes.adoc index 4e64386f15..cc19597dcb 100644 --- a/modules/ROOT/pages/7.7.0-release-notes.adoc +++ b/modules/ROOT/pages/7.7.0-release-notes.adoc @@ -34,7 +34,7 @@ The {productname} {release-version} release includes an accompanying release of Previously, the **Export to Word** premium plugin did not support watermarks, preventing integrators from adding them to exported Word documents. -{productname} {release-version} resolves this by introducing watermark functionality in the plugin, allowing users to add watermarks to their documents. +With the release of {productname} {release-version} watermark functionality has been introduced, enabling watermarks to be included in exported documents. For information on the **Export to Word** plugin, see: xref:exportword.adoc[Export to Word].