mirror of
https://github.com/silverstripe/silverstripe-userforms.git
synced 2024-10-22 17:05:42 +02:00
Merge branch '4.2' into 4.3
This commit is contained in:
Robbie Averill
commit
dd7e13e7f8
@ -261,12 +261,9 @@ class UserDefinedForm_EmailRecipient extends DataObject
|
||||
->addExtraClass('toggle-html-only'),
|
||||
TextareaField::create('EmailBody', _t('UserDefinedForm.EMAILBODY', 'Body'))
|
||||
->addExtraClass('toggle-plain-only'),
|
||||
LiteralField::create(
|
||||
'EmailPreview',
|
||||
'<div id="EmailPreview" class="field toggle-html-only">' . $preview . '</div>'
|
||||
)
|
||||
LiteralField::create('EmailPreview', $preview)
|
||||
));
|
||||
|
||||
|
||||
$fields->fieldByName('Root.EmailContent')->setTitle(_t('UserDefinedForm_EmailRecipient.EMAILCONTENTTAB', 'Email Content'));
|
||||
|
||||
// Custom rules for sending this field
|
||||
@ -291,7 +288,7 @@ class UserDefinedForm_EmailRecipient extends DataObject
|
||||
),
|
||||
$grid
|
||||
));
|
||||
|
||||
|
||||
$fields->fieldByName('Root.CustomRules')->setTitle(_t('UserDefinedForm_EmailRecipient.CUSTOMRULESTAB', 'Custom Rules'));
|
||||
|
||||
$this->extend('updateCMSFields', $fields);
|
||||
@ -420,7 +417,10 @@ class UserDefinedForm_EmailRecipient extends DataObject
|
||||
*/
|
||||
public function getEmailBodyContent()
|
||||
{
|
||||
return $this->SendPlain ? $this->EmailBody : $this->EmailBodyHtml;
|
||||
if ($this->SendPlain) {
|
||||
return DBField::create_field('HTMLText', $this->EmailBody)->NoHTML();
|
||||
}
|
||||
return DBField::create_field('HTMLText', $this->EmailBodyHtml)->RAW();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -1,14 +1,6 @@
|
||||
/**
|
||||
* Animations
|
||||
*/
|
||||
@keyframes rowSlide {
|
||||
0% {
|
||||
top: 20%;
|
||||
}
|
||||
100% {
|
||||
top: 80%;
|
||||
}
|
||||
}
|
||||
@keyframes flashBackground {
|
||||
0% {
|
||||
background-color: white;
|
||||
@ -42,10 +34,6 @@
|
||||
.cms .uf-field-editor table.ss-gridfield-table .ss-gridfield-item .handle {
|
||||
min-height: 46px;
|
||||
}
|
||||
.cms .uf-field-editor table.ss-gridfield-table .ss-gridfield-item.newField {
|
||||
position: fixed;
|
||||
animation: rowSlide .5s ease forwards;
|
||||
}
|
||||
.cms .uf-field-editor table.ss-gridfield-table .ss-gridfield-item.flashBackground {
|
||||
animation: flashBackground 2s linear;
|
||||
}
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
|
||||
$(".uf-field-editor tbody").entwine({
|
||||
onmatch: function() {
|
||||
var i,
|
||||
thisLevel,
|
||||
var i,
|
||||
thisLevel,
|
||||
depth = 0,
|
||||
$buttonrow = $('.uf-field-editor .ss-gridfield-buttonrow').addClass('stickyButtons'),
|
||||
navHeight = $('.cms-content-header.north').height() + parseInt($('.stickyButtons').css('padding-top'), 10),
|
||||
@ -17,7 +17,7 @@
|
||||
self = this;
|
||||
|
||||
this._super();
|
||||
|
||||
|
||||
// Loop through all rows and set necessary styles
|
||||
this.find('.ss-gridfield-item').each(function() {
|
||||
switch($(this).data('class')) {
|
||||
@ -37,7 +37,7 @@
|
||||
thisLevel = depth;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$(this).toggleClass('inFieldGroup', thisLevel > 0);
|
||||
for(i = 1; i <= 5; i++) {
|
||||
$(this).toggleClass('inFieldGroup-level-'+i, thisLevel >= i);
|
||||
@ -76,7 +76,7 @@
|
||||
var self = this;
|
||||
|
||||
this._super();
|
||||
|
||||
|
||||
// When the 'Add field' button is clicked set a one time listener.
|
||||
// When the GridField is reloaded focus on the newly added field.
|
||||
this.on('addnewinline', function () {
|
||||
@ -92,19 +92,11 @@
|
||||
$newField.find('.col-Title input').focus();
|
||||
}
|
||||
|
||||
// animate the row positioning (add the first class)
|
||||
if (document.createElement('div').style.animationName !== void 0) {
|
||||
$newField.addClass('newField');
|
||||
$newField.addClass('flashBackground');
|
||||
$(".cms-content-fields").scrollTop($(".cms-content-fields")[0].scrollHeight);
|
||||
if($groupEnd) {
|
||||
$groupEnd.css('visibility', 'visible');
|
||||
}
|
||||
|
||||
// Once the animation has completed
|
||||
setTimeout(function () {
|
||||
$newField.removeClass('newField').addClass('flashBackground');
|
||||
$(".cms-content-fields").scrollTop($(".cms-content-fields")[0].scrollHeight);
|
||||
if($groupEnd) {
|
||||
$groupEnd.css('visibility', 'visible');
|
||||
}
|
||||
}, 500);
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
@ -5,12 +5,11 @@
|
||||
(function ($) {
|
||||
$(document).ready(function () {
|
||||
|
||||
var sendPlain = $('input[name="SendPlain"]');
|
||||
var recipient = {
|
||||
// Some fields are only visible when HTML email are being sent.
|
||||
updateFormatSpecificFields: function () {
|
||||
var sendPlainChecked = $('#SendPlain')
|
||||
.find('input[type="checkbox"]')
|
||||
.is(':checked');
|
||||
var sendPlainChecked = sendPlain.is(':checked');
|
||||
|
||||
$(".field.toggle-html-only")[sendPlainChecked ? 'hide' : 'show']();
|
||||
$(".field.toggle-plain-only")[sendPlainChecked ? 'show' : 'hide']();
|
||||
@ -27,7 +26,7 @@
|
||||
}
|
||||
});
|
||||
|
||||
$('#SendPlain').entwine({
|
||||
sendPlain.entwine({
|
||||
onchange: function () {
|
||||
recipient.updateFormatSpecificFields();
|
||||
}
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
* Animations
|
||||
*/
|
||||
|
||||
@keyframes rowSlide {
|
||||
0% {top: 20%;}
|
||||
100% {top: 80%;}
|
||||
}
|
||||
|
||||
@keyframes flashBackground {
|
||||
0% {background-color: white;}
|
||||
10% {background-color: #dcfedd;}
|
||||
@ -30,11 +25,11 @@
|
||||
&, &:hover {
|
||||
background: white;
|
||||
}
|
||||
|
||||
|
||||
td {
|
||||
border-right-width: 0;
|
||||
border-top: 1px solid #EEE;
|
||||
|
||||
|
||||
&:last-child {
|
||||
border-right-width: 1px;
|
||||
}
|
||||
@ -44,11 +39,6 @@
|
||||
min-height: 46px;
|
||||
}
|
||||
|
||||
&.newField {
|
||||
position: fixed;
|
||||
animation: rowSlide .5s ease forwards;
|
||||
}
|
||||
|
||||
&.flashBackground {
|
||||
animation: flashBackground 2s linear;
|
||||
}
|
||||
@ -62,24 +52,24 @@
|
||||
&, &:hover {
|
||||
background: #f2f9fd;
|
||||
}
|
||||
|
||||
|
||||
td {
|
||||
border-bottom: 0;
|
||||
border-top: 1px solid #eee;
|
||||
}
|
||||
|
||||
|
||||
.col-reorder, .handle {
|
||||
background: #BEE0F8;
|
||||
border-top: 0;
|
||||
}
|
||||
|
||||
|
||||
&.inFieldGroup-level-2 {
|
||||
.col-reorder, .handle {
|
||||
background: #99CEF4;
|
||||
border-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
&.inFieldGroup-level-3 {
|
||||
.col-reorder, .handle {
|
||||
background: #89BEF4;
|
||||
@ -116,7 +106,7 @@
|
||||
td {
|
||||
border-top: 1px solid #a8d7f5;
|
||||
}
|
||||
|
||||
|
||||
label {
|
||||
font-weight: bold;
|
||||
color: #444;
|
||||
@ -135,7 +125,7 @@
|
||||
.col-buttons .action{
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
label {
|
||||
color: #777;
|
||||
}
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
class UserDefinedForm_EmailRecipientTest extends SapphireTest
|
||||
{
|
||||
protected static $fixture_file = 'UserDefinedForm_EmailRecipientTest.yml';
|
||||
|
||||
public function testShortcodesAreRenderedInEmailPreviewContent()
|
||||
{
|
||||
$page = $this->objFromFixture('SiteTree', 'about_us');
|
||||
|
||||
$recipient = UserDefinedForm_EmailRecipient::create();
|
||||
$recipient->SendPlain = false;
|
||||
$recipient->EmailBodyHtml = '<p>Some email content. About us: [sitetree_link,id=' . $page->ID . '].</p>';
|
||||
|
||||
$result = $recipient->getEmailBodyContent();
|
||||
$this->assertContains('/about-us/', $result);
|
||||
|
||||
$recipient->SendPlain = true;
|
||||
$recipient->EmailBody = 'Some email content. About us: [sitetree_link,id=' . $page->ID . '].';
|
||||
|
||||
$result = $recipient->getEmailBodyContent();
|
||||
$this->assertContains('/about-us/', $result);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
SiteTree:
|
||||
about_us:
|
||||
Title: About Us
|
||||
URLSegment: about-us
|
||||
Loading…
Reference in New Issue
Block a user