IMPR: minor updates

This commit is contained in:
Tony Air 2020-10-26 17:25:06 +07:00
parent 71c59f3d83
commit 31ef11047c
5 changed files with 40 additions and 23 deletions

View File

@ -29,3 +29,6 @@ SilverStripe\Control\Session:
cookie_secure: true cookie_secure: true
strict_user_agent_check: false strict_user_agent_check: false
timeout: 604800 timeout: 604800
SilverStripe\Control\Email\Email:
send_all_emails_from: noreply@twma.pro

View File

@ -59,10 +59,10 @@ body.shrink {
// sticky footer // sticky footer
@media (min-width: $full-body-min-width) { @media (min-width: $full-body-min-width) {
body { /*body {
height: 100%; height: 100%;
min-height: 100%; min-height: 100%;
} }*/
.wrapper { .wrapper {
min-height: 100%; min-height: 100%;

View File

@ -56,6 +56,7 @@ class EmbeddedObjectExtension extends DataExtension
if ($this->owner->getField('Loop')) { if ($this->owner->getField('Loop')) {
$params[] = 'loop=1'; $params[] = 'loop=1';
$params[] = 'playlist='.$videoID;
} }
$this->owner->EmbedHTML = preg_replace( $this->owner->EmbedHTML = preg_replace(

View File

@ -16,6 +16,8 @@
<% if $Lat && $Lng %> <% if $Lat && $Lng %>
data-lat="$Lat" data-lat="$Lat"
data-lng="$Lng" data-lng="$Lng"
<% else_if $FullAddress %>
data-address="$FullAddress.XML"
<% else_if $Address %> <% else_if $Address %>
data-address="$Address.XML" data-address="$Address.XML"
<% end_if %> <% end_if %>

View File

@ -68,27 +68,6 @@ let plugins = [
canPrint: true, canPrint: true,
}), }),
require('autoprefixer'), require('autoprefixer'),
new FaviconsWebpackPlugin({
title: 'Webpack App',
logo: path.join(__dirname, conf.APPDIR, conf.SRC, 'favicon.png'),
prefix: '/icons/',
emitStats: false,
persistentCache: true,
inject: false,
statsFilename: path.join(conf.APPDIR, conf.DIST, 'icons', 'iconstats.json'),
icons: {
android: true,
appleIcon: true,
appleStartup: true,
coast: true,
favicons: true,
firefox: true,
opengraph: true,
twitter: true,
yandex: true,
windows: true,
},
}),
/*new ImageminPlugin({ /*new ImageminPlugin({
bail: false, // Ignore errors on corrupted images bail: false, // Ignore errors on corrupted images
cache: true, cache: true,
@ -129,6 +108,38 @@ let plugins = [
}),*/ }),*/
]; ];
const faviconPath = path.join(__dirname, conf.APPDIR, conf.SRC, 'favicon.png');
if (filesystem.existsSync(faviconPath)) {
plugins.push(
new FaviconsWebpackPlugin({
title: 'Webpack App',
logo: faviconPath,
prefix: '/icons/',
emitStats: false,
persistentCache: true,
inject: false,
statsFilename: path.join(
conf.APPDIR,
conf.DIST,
'icons',
'iconstats.json',
),
icons: {
android: true,
appleIcon: true,
appleStartup: true,
coast: true,
favicons: true,
firefox: true,
opengraph: true,
twitter: true,
yandex: true,
windows: true,
},
}),
);
}
// add themes favicons // add themes favicons
commonVariables.themes.forEach((theme) => { commonVariables.themes.forEach((theme) => {
const faviconPath = path.join(__dirname, theme, conf.SRC, 'favicon.png'); const faviconPath = path.join(__dirname, theme, conf.SRC, 'favicon.png');