diff --git a/app/_config/config.yml b/app/_config/config.yml index 03ec033..fae6aa9 100644 --- a/app/_config/config.yml +++ b/app/_config/config.yml @@ -29,3 +29,6 @@ SilverStripe\Control\Session: cookie_secure: true strict_user_agent_check: false timeout: 604800 + +SilverStripe\Control\Email\Email: + send_all_emails_from: noreply@twma.pro diff --git a/app/client/src/scss/_layout.scss b/app/client/src/scss/_layout.scss index 82c0a81..e318e7b 100644 --- a/app/client/src/scss/_layout.scss +++ b/app/client/src/scss/_layout.scss @@ -59,10 +59,10 @@ body.shrink { // sticky footer @media (min-width: $full-body-min-width) { - body { + /*body { height: 100%; min-height: 100%; - } + }*/ .wrapper { min-height: 100%; diff --git a/app/src/Extensions/EmbeddedObjectExtension.php b/app/src/Extensions/EmbeddedObjectExtension.php index 6a4f337..b1f656e 100644 --- a/app/src/Extensions/EmbeddedObjectExtension.php +++ b/app/src/Extensions/EmbeddedObjectExtension.php @@ -56,6 +56,7 @@ class EmbeddedObjectExtension extends DataExtension if ($this->owner->getField('Loop')) { $params[] = 'loop=1'; + $params[] = 'playlist='.$videoID; } $this->owner->EmbedHTML = preg_replace( diff --git a/app/templates/Objects/Map.ss b/app/templates/Objects/Map.ss index 70fae84..b3abcf5 100644 --- a/app/templates/Objects/Map.ss +++ b/app/templates/Objects/Map.ss @@ -16,6 +16,8 @@ <% if $Lat && $Lng %> data-lat="$Lat" data-lng="$Lng" + <% else_if $FullAddress %> + data-address="$FullAddress.XML" <% else_if $Address %> data-address="$Address.XML" <% end_if %> diff --git a/webpack.config.prod.js b/webpack.config.prod.js index 729db07..ad7f859 100755 --- a/webpack.config.prod.js +++ b/webpack.config.prod.js @@ -68,27 +68,6 @@ let plugins = [ canPrint: true, }), 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({ bail: false, // Ignore errors on corrupted images 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 commonVariables.themes.forEach((theme) => { const faviconPath = path.join(__dirname, theme, conf.SRC, 'favicon.png');