From cdd484dcb9a192f77093f48af7deb6cdaf27c9ea Mon Sep 17 00:00:00 2001 From: Alexander Vetrov Date: Thu, 3 Sep 2026 18:16:55 +0300 Subject: [PATCH 1/4] KEYS-39938 change one time password mail template --- DC/6.7.0/mail_templates/onetimepassword.dcl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DC/6.7.0/mail_templates/onetimepassword.dcl b/DC/6.7.0/mail_templates/onetimepassword.dcl index 755732cfe..e362a4733 100644 --- a/DC/6.7.0/mail_templates/onetimepassword.dcl +++ b/DC/6.7.0/mail_templates/onetimepassword.dcl @@ -14,9 +14,11 @@ resource mail_template onetimepassword { {{include 'standard-header'}} -

- Your one time code: {{ data.code }} -

+
+
To activate, please enter the code below in your browser
+

{{ data.code }}

+
This code will expire in {{ data.expiredIn }} minutes
+
{{include 'standard-footer'}}" autolink = { From dbfaf11f86468a310d935c3e620f9c7ebd8bd021 Mon Sep 17 00:00:00 2001 From: Alexander Vetrov Date: Mon, 7 Sep 2026 10:35:15 +0300 Subject: [PATCH 2/4] KEYS-38938 update one time password mail template, add terms and conditions of use template --- DC/6.7.0/mail_templates/onetimepassword.dcl | 8 +- .../mail_templates/termsconditionsfooter.dcl | 100 ++++++++++++++++++ 2 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 DC/6.7.0/mail_templates/termsconditionsfooter.dcl diff --git a/DC/6.7.0/mail_templates/onetimepassword.dcl b/DC/6.7.0/mail_templates/onetimepassword.dcl index e362a4733..8be7fee63 100644 --- a/DC/6.7.0/mail_templates/onetimepassword.dcl +++ b/DC/6.7.0/mail_templates/onetimepassword.dcl @@ -14,13 +14,15 @@ resource mail_template onetimepassword { {{include 'standard-header'}} -
+ +
+

Hello!

To activate, please enter the code below in your browser
-

{{ data.code }}

+

{{ data.code }}

This code will expire in {{ data.expiredIn }} minutes
-{{include 'standard-footer'}}" +{{include 'terms-conditions-footer'}}" autolink = { portal_name = '' language_id = resource.language.english.id diff --git a/DC/6.7.0/mail_templates/termsconditionsfooter.dcl b/DC/6.7.0/mail_templates/termsconditionsfooter.dcl new file mode 100644 index 000000000..8ba29eb88 --- /dev/null +++ b/DC/6.7.0/mail_templates/termsconditionsfooter.dcl @@ -0,0 +1,100 @@ +resource mail_template terms_conditions_footer { + portal_name = '' + language_id = resource.language.english.id + template_name = 'terms-conditions-footer' + subject = 'terms-conditions-footer' + system = true + body = ' + + + + + + + + + + + + + + + +
By registering you agree to Terms & conditions of Use.
+ For activation issues, please file a support ticket through our KeyShot Support page. +
+ + + + +
+

KeyShot, 575 Anton Blvd Suite 650, Costa Mesa, CA, 92626, USA, (949) 274-8871

+

info@keyshot.com | keyshot.com

+
+ + + + + + + + + + + + + +
+ YouTube + + Facebook + + Twitter + + Instagram + + Pinterest +
+ + + + + + + + +
+ Support + • + Go to account +
+ + + + + + + + +' + autolink = { + portal_name = '' + language_id = resource.language.english.id + template_name = 'terms-conditions-footer' + } +} + From 567020ddc576aa22db21832aa85ef51b8656663d Mon Sep 17 00:00:00 2001 From: Bernadette Besenhofer Date: Mon, 7 Sep 2026 13:00:39 +0200 Subject: [PATCH 3/4] KEYS-38938 Updates --- .../6.7.0/mail_templates/standardfooter.dcl | 3 - DC/6.7.0/mail_templates/onetimepassword.dcl | 40 +++---- .../mail_templates/termsconditionsfooter.dcl | 100 ------------------ 3 files changed, 22 insertions(+), 121 deletions(-) delete mode 100644 DC/6.7.0/mail_templates/termsconditionsfooter.dcl diff --git a/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl b/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl index db372c375..771973923 100644 --- a/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl +++ b/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl @@ -14,9 +14,6 @@ patch mail_template standardfooter { - - - + +{{include 'standard-footer'}}" } - diff --git a/DC/6.7.0/mail_templates/termsconditionsfooter.dcl b/DC/6.7.0/mail_templates/termsconditionsfooter.dcl deleted file mode 100644 index 8ba29eb88..000000000 --- a/DC/6.7.0/mail_templates/termsconditionsfooter.dcl +++ /dev/null @@ -1,100 +0,0 @@ -resource mail_template terms_conditions_footer { - portal_name = '' - language_id = resource.language.english.id - template_name = 'terms-conditions-footer' - subject = 'terms-conditions-footer' - system = true - body = ' - - -
If you don\'t have a KeyShot Account, create one here.
For any issues, please file a support ticket through our KeyShot Support page. diff --git a/DC/6.7.0/mail_templates/onetimepassword.dcl b/DC/6.7.0/mail_templates/onetimepassword.dcl index 8be7fee63..92029e104 100644 --- a/DC/6.7.0/mail_templates/onetimepassword.dcl +++ b/DC/6.7.0/mail_templates/onetimepassword.dcl @@ -2,31 +2,35 @@ resource mail_template onetimepassword { portal_name = '' language_id = resource.language.english.id template_name = 'one-time-password' - subject = 'One time passwod' + subject = 'One-time code' system = true body = "{{include 'html-header-start'}} -One time password +One-time code {{include 'html-header-end'}} -One time password requested +One-time code requested {{include 'standard-header'}} - -
-

Hello!

-
To activate, please enter the code below in your browser
-

{{ data.code }}

-
This code will expire in {{ data.expiredIn }} minutes
-
- -{{include 'terms-conditions-footer'}}" - autolink = { - portal_name = '' - language_id = resource.language.english.id - template_name = 'one-time-password' - } +
 + + + + + + + + + + + + +
Please enter the code below in your browser
{{ data.code }}
This code will expire in {{ data.expiredIn }} minutes
+
- - - - - - - - - - - - -
By registering you agree to Terms & conditions of Use.
- For activation issues, please file a support ticket through our KeyShot Support page. -
- - - - -
-

KeyShot, 575 Anton Blvd Suite 650, Costa Mesa, CA, 92626, USA, (949) 274-8871

-

info@keyshot.com | keyshot.com

-
- - - - - - - - - - - - - -
- YouTube - - Facebook - - Twitter - - Instagram - - Pinterest -
- - - - - - - - -
- Support - • - Go to account -
- - - - - - - - -' - autolink = { - portal_name = '' - language_id = resource.language.english.id - template_name = 'terms-conditions-footer' - } -} - From 5a0368682e0275eaff280adce5961768d2963c0d Mon Sep 17 00:00:00 2001 From: Bernadette Besenhofer Date: Mon, 7 Sep 2026 13:58:17 +0200 Subject: [PATCH 4/4] KEYS-38938 Updates --- DC/6.7.0/mail_templates/onetimepassword.dcl | 42 ++++++++++++--------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/DC/6.7.0/mail_templates/onetimepassword.dcl b/DC/6.7.0/mail_templates/onetimepassword.dcl index 92029e104..d643e731b 100644 --- a/DC/6.7.0/mail_templates/onetimepassword.dcl +++ b/DC/6.7.0/mail_templates/onetimepassword.dcl @@ -13,24 +13,32 @@ resource mail_template onetimepassword { One-time code requested {{include 'standard-header'}} + + + + + + + + +
Hello!
+ + + + + + + + + + + + +
Please enter the code below in your browser
{{ data.code }}
This code will expire in {{ data.expiredIn }} minutes
+
- - - - - - - - - - - - - -
Please enter the code below in your browser
{{ data.code }}
This code will expire in {{ data.expiredIn }} minutes
- {{include 'standard-footer'}}" }