Merge pull request #108 from contao-themes-net/2.19.0

2.19.0
contao-themes-net · Aug 1, 2022 · 56500b6 · 56500b6
2 parents afde149 + a445cad
commit 56500b6
Show file tree

Hide file tree

Showing 18 changed files with 231 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+[//]: <> (
+Types of changes
+    Added for new Addeds.
+    Changed for changes in existing functionality.
+    Deprecated for soon-to-be removed Addeds.
+    Removed for now removed Addeds.
+    Fixed for any bug fixes.
+    Security in case of vulnerabilities.
+)
+
+## [2.19.0](https://github.com/contao-themes-net/mate-theme-bundle/tree/2.19.0) – 2022-08-01
+
+- [Added] add variables to style input and select fields
+- [Added] change teaserbox and contentbox link fields
+- [Added] add support for Symfony 5 public entry point
+- [Fixed] fix og:image bug in fe_page
+- [Fixed] fix button hover background
+- [Fixed] fix navigation for many menu items
+- [Fixed] update language files
+- [Fixed] fix button styles ([#94](https://github.com//contao-themes-net/mate-theme-bundle/issues/94))
+- [Fixed] add protected legend in dca
+- [Fixed] fix 'Warning: Undefined array key "mate_navbar"'
+- [Fixed] fix 'Warning: Attempt to read property "path" on null'
+
 ## [2.18.0](https://github.com/contao-themes-net/mate-theme-bundle/tree/2.18.0) – 2022-05-12
 
 - [info] remove support for Contao 4.4 and php <=7.1

diff --git a/src/Module/MateThemeSetup.php b/src/Module/MateThemeSetup.php
@@ -2,9 +2,15 @@
 
 namespace ContaoThemesNet\MateThemeBundle\Module;
 
-class MateThemeSetup extends \BackendModule
+use Contao\BackendModule;
+use Contao\File;
+use Contao\Folder;
+use Contao\Input;
+use ContaoThemesNet\MateThemeBundle\ThemeUtils;
+
+class MateThemeSetup extends BackendModule
 {
-    const VERSION = '2.18.0';
+    const VERSION = '2.19.0';
 
     protected $strTemplate = 'be_mateTheme_setup';
 
@@ -13,14 +19,20 @@ class MateThemeSetup extends \BackendModule
      */
     protected function compile()
     {
-        switch (\Input::get('act')) {
+        switch (Input::get('act')) {
             case 'syncFolder':
-                $path = TL_ROOT . '/web/bundles/matetheme';
-                if(!file_exists("files/mate")) {
-                    new \Folder("files/mate");
+                $path = sprintf(
+                    '%s/%s/bundles/matetheme',
+                    ThemeUtils::getRootDir(),
+                    ThemeUtils::getWebDir()
+                );
+
+                if(!file_exists(ThemeUtils::getRootDir()."/files/mate")) {
+                    new Folder("files/mate");
                 }
+
                 $this->getFiles($path);
-                $this->getSqlFiles($path = TL_ROOT . "/vendor/contao-themes-net/mate-theme-bundle/src/templates/mate");
+                $this->getSqlFiles(ThemeUtils::getRootDir()."/vendor/contao-themes-net/mate-theme-bundle/src/templates/mate");
                 $this->Template->message = true;
                 $this->Template->version = MateThemeSetup::VERSION;
                 $this->import('Automator');
@@ -45,8 +57,8 @@ protected function getFiles($path) {
                 $filesFolder = "files/mate".str_replace("matetheme","",substr($path,$pos))."/".$dir;
 
                 if($dir != "_mate_variables.scss" && $dir != "_mate_colors.scss" && $dir != "backend.css" && $dir != "mate.scss" && $dir != "materialize.scss" && $dir != "maklermodul.scss" && $dir != "style.scss" && $dir != "mate_win.scss" && $dir != "materialize_win.scss") {
-                    if(!file_exists(TL_ROOT."/".$filesFolder)) {
-                        $objFile = new \File("web/bundles/".substr($path,$pos)."/".$dir, true);
+                    if(!file_exists(ThemeUtils::getRootDir()."/".$filesFolder)) {
+                        $objFile = new File(ThemeUtils::getWebDir().'/bundles/'.substr($path,$pos).'/'.$dir, true);
                         $objFile->copyTo($filesFolder);
                     }
                 }
@@ -56,7 +68,7 @@ protected function getFiles($path) {
                 $filesFolder = "files/mate".str_replace("matetheme","",substr($path,$pos))."/".$dir;
                 if($dir != "fonts" && $dir != "js" && $dir != "components" && $dir != "mate_color_schemes" && $dir != "css") {
                     if(!file_exists($filesFolder)) {
-                        new \Folder($filesFolder);
+                        new Folder($filesFolder);
                     }
                     $this->getFiles($folder);
                 }
@@ -69,7 +81,7 @@ protected function getSqlFiles($path) {
             if(!is_dir($path."/".$dir)) {
                 $pos = strpos($path,"/vendor");
                 $filesFolder = "templates/" . $dir;
-                $objFile = new \File(substr($path,$pos)."/".$dir, true);
+                $objFile = new File(substr($path,$pos)."/".$dir, true);
                 $objFile->copyTo($filesFolder);
             }
         }

diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php
@@ -11,11 +11,11 @@
  * Add palette to tl_content
  */
 
-$GLOBALS['TL_DCA']['tl_content']['palettes']['mateTeaserBox'] = '{type_legend},type,headline;{text_legend},text,mateTeaserbox_subHeadline;{image_legend},addImage;{mateTeaserBoxSettings},mateTeaserBox_page,mateTeaserBox_pageText;{template_legend:hide},mateTeaserBox_customTpl;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;space;{invisible_legend:hide},invisible,start,stop';
+$GLOBALS['TL_DCA']['tl_content']['palettes']['mateTeaserBox'] = '{type_legend},type,headline;{text_legend},text,mateTeaserbox_subHeadline;{image_legend},addImage;{mateTeaserBoxSettings},mateTeaserBox_page,mateTeaserBox_pageText;{template_legend:hide},mateTeaserBox_customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;space;{invisible_legend:hide},invisible,start,stop';
 
-$GLOBALS['TL_DCA']['tl_content']['palettes']['mateContentBox'] = '{type_legend},type,headline;{text_legend},text;{image_legend},addImage;{mateContentBoxSettings},mateContentBox_page,mateContentBox_pageText;{template_legend:hide},mateContentBox_customTpl;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;space;{invisible_legend:hide},invisible,start,stop';
+$GLOBALS['TL_DCA']['tl_content']['palettes']['mateContentBox'] = '{type_legend},type,headline;{text_legend},text;{image_legend},addImage;{mateContentBoxSettings},mateContentBox_page,mateContentBox_pageText;{template_legend:hide},mateContentBox_customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;space;{invisible_legend:hide},invisible,start,stop';
 
-$GLOBALS['TL_DCA']['tl_content']['palettes']['mateParallaxElement'] = '{type_legend},type,headline;{mateParallaxElementSettings},mateParallaxElement_text,mateParallaxElement_height,mateTeaserBox_page,mateTeaserBox_pageText;{image_legend},addImage;{template_legend:hide},mateParallaxElement_customTpl;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;space;{invisible_legend:hide},invisible,start,stop';
+$GLOBALS['TL_DCA']['tl_content']['palettes']['mateParallaxElement'] = '{type_legend},type,headline;{mateParallaxElementSettings},mateParallaxElement_text,mateParallaxElement_height,mateTeaserBox_page,mateTeaserBox_pageText;{image_legend},addImage;{template_legend:hide},mateParallaxElement_customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;space;{invisible_legend:hide},invisible,start,stop';
 
 $GLOBALS['TL_DCA']['tl_content']['palettes']['mateTextBackgroundElement'] = '{type_legend},type,headline;{text_legend},text;{image_legend},addImage;{mateTextBackground_settings},mate_background_image;{template_legend:hide},mateTextBackgroundElement_customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{advanced_classes_legend},advancedCss;{invisible_legend:hide},invisible,start,stop';
 
@@ -28,10 +28,13 @@
 (
     'label' => & $GLOBALS['TL_LANG']['tl_content']['mateTeaserBox_page'],
     'exclude' => true,
-    'inputType' => 'pageTree',
+    'inputType' => 'text',
+    'wizard' => [['tl_content', 'pagePicker']],
     'eval' => array (
-        'fieldType' => 'radio',
-        'tl_class'=>'w50 autoheight'
+        'mandatory' => true,
+        'rgxp' => 'url',
+        'decodeEntities' => true,
+        'tl_class'=>'w50 wizard'
     ),
     'reference' => &$GLOBALS['TL_LANG']['tl_content']['mateTeaserBox_page'],
     'sql' => "text NULL"
@@ -51,10 +54,13 @@
 (
     'label' => & $GLOBALS['TL_LANG']['tl_content']['mateContentBox_page'],
     'exclude' => true,
-    'inputType' => 'pageTree',
+    'inputType' => 'text',
+    'wizard' => [['tl_content', 'pagePicker']],
     'eval' => array (
-        'fieldType' => 'radio',
-        'tl_class'=>'w50'
+        'mandatory' => true,
+        'rgxp' => 'url',
+        'decodeEntities' => true,
+        'tl_class'=>'w50 wizard'
     ),
     'reference' => &$GLOBALS['TL_LANG']['tl_content']['mateContentBox_page'],
     'sql' => "text NULL"

diff --git a/src/Resources/contao/elements/Mate/ContentBox.php b/src/Resources/contao/elements/Mate/ContentBox.php
@@ -58,7 +58,7 @@ protected function compile()
         }
 
         $this->Template->page = $this->mateContentBox_page;
-        $this->Template->href = \FilesModel::findByUuid($this->singleSRC)->path;
+        if(!is_null($this->singleSRC)) $this->Template->href = \FilesModel::findByUuid($this->singleSRC)->path;
         $this->Template->pageText = $this->mateContentBox_pageText;
 
         // add an image

diff --git a/src/Resources/contao/languages/de/default.php b/src/Resources/contao/languages/de/default.php
@@ -20,13 +20,7 @@
 $GLOBALS['TL_LANG']['tl_module']['mateTheme']['mateNavbar'][0] = 'Navbar (mate)3';
 $GLOBALS['TL_LANG']['tl_module']['mateTheme']['mateNavbar'][1] = 'Navbar (mate)4';
 
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type1'] = 'Navigation ohne Dropdown, rechtsbündig';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type2'] = 'Navigation ohne Dropdown, linksbündig';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type3'] = 'Logo und Navigation untereinander/zentriert';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type4'] = 'NavBar mit Tabs';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type5'] = 'Navigation mit Dropdown, rechtsbündig';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type6'] = 'NavBar mit Buttons';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type7'] = 'Mobile NavBar';
+
 
 // theme helper tags
 $GLOBALS['TL_LANG']['tl_article']['pdir_th_tag'] = array('Theme Helper Tag', 'Bitte wählen Sie einen Theme Helper Tag um den Inhalt dieses Artikels als Insert Tag zu nutzen.');
@@ -63,3 +57,6 @@
 $GLOBALS['TL_LANG']['tl_article']['th_tags']['MATE05/08'] = 'Footer / 08';
 $GLOBALS['TL_LANG']['tl_article']['th_tags']['MATE05/09'] = 'Footer / 09';
 $GLOBALS['TL_LANG']['tl_article']['th_tags']['MATE05/10'] = 'Footer / 10';
+
+$GLOBALS['TL_LANG']['mateTheme']['readMore'] = 'Mehr dazu';
+$GLOBALS['TL_LANG']['mateTheme']['continueReading'] = 'Weiterlesen';
diff --git a/src/Resources/contao/languages/de/tl_module.php b/src/Resources/contao/languages/de/tl_module.php
@@ -4,13 +4,21 @@
 $GLOBALS['TL_LANG']['tl_module']['modal_text_legend'] = 'Inhalt des Modalen Dialog';
 $GLOBALS['TL_LANG']['tl_module']['mate_slider_legend'] = 'MATE Slider Einstellungen';
 
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type1'] = 'Navigation ohne Dropdown, rechtsbündig';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type2'] = 'Navigation ohne Dropdown, linksbündig';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type3'] = 'Logo und Navigation untereinander/zentriert';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type4'] = 'NavBar mit Tabs';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type5'] = 'Navigation mit Dropdown, rechtsbündig';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type6'] = 'NavBar mit Buttons';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type7'] = 'Mobile NavBar';
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type1'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type1'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type2'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type2'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type3'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type3'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type4'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type4'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type5'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type5'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type6'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type6'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type7'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type7'];
+
 $GLOBALS['TL_LANG']['tl_module']['mateShowLogo'] = ['Logo anzeigen','Logo im Header anzeigen'];
 $GLOBALS['TL_LANG']['tl_module']['mateShowSearch'] = ['Suche anzeigen','Suchicon im Header anzeigen'];
 $GLOBALS['TL_LANG']['tl_module']['mateShowMobileMenu'] = ['Mobile Navigation anzeigen','Stelle mobile Navigation mit einem Menü-Icon dar'];

diff --git a/src/Resources/contao/languages/en/default.php b/src/Resources/contao/languages/en/default.php
@@ -20,14 +20,6 @@
 $GLOBALS['TL_LANG']['tl_module']['mateTheme']['mateNavbar'][0] = 'Navbar (mate)3';
 $GLOBALS['TL_LANG']['tl_module']['mateTheme']['mateNavbar'][1] = 'Navbar (mate)4';
 
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type1'] = 'Navigation without Dropdown, align right';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type2'] = 'Navigation without Dropdown, align left';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type3'] = 'Logo and navigation among each other/centered';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type4'] = 'NavBar mit Tabs';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type5'] = 'Navigation with Dropdown';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type6'] = 'NavBar mit Buttons';
-$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type7'] = 'Mobile NavBar';
-
 // theme helper tags
 $GLOBALS['TL_LANG']['tl_article']['pdir_th_tag'] = array('Theme Helper Tag', 'Please select a theme helper tag to use content of this article as insert tag.');
 
@@ -64,3 +56,6 @@
 $GLOBALS['TL_LANG']['tl_article']['th_tags']['MATE05/08'] = 'Footer / 08';
 $GLOBALS['TL_LANG']['tl_article']['th_tags']['MATE05/09'] = 'Footer / 09';
 $GLOBALS['TL_LANG']['tl_article']['th_tags']['MATE05/10'] = 'Footer / 10';
+
+$GLOBALS['TL_LANG']['mateTheme']['readMore'] = 'Read more';
+$GLOBALS['TL_LANG']['mateTheme']['continueReading'] = 'Read more';
diff --git a/src/Resources/contao/languages/en/tl_module.php b/src/Resources/contao/languages/en/tl_module.php
@@ -4,13 +4,22 @@
 $GLOBALS['TL_LANG']['tl_module']['modal_text_legend'] = 'ModalElement Content';
 $GLOBALS['TL_LANG']['tl_module']['mate_slider_legend'] = 'MATE Slider Settings';
 
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type1'] = 'Navigation without Dropdown, align right';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type2'] = 'Navigation without Dropdown, align left';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type3'] = 'Logo and navigation among each other/centered';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type4'] = 'NavBar mit Tabs';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type5'] = 'Navigation with Dropdown';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type6'] = 'NavBar mit Buttons';
+$GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type7'] = 'Mobile NavBar';
+
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type1'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type1'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type2'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type2'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type3'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type3'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type4'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type4'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type5'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type5'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type6'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type6'];
 $GLOBALS['TL_LANG']['tl_module']['mate_navbar']['type7'] = $GLOBALS['TL_LANG']['tl_content']['mate_navbar']['type7'];
+
 $GLOBALS['TL_LANG']['tl_module']['mateShowLogo'] = ['show logo','show logo in header'];
 $GLOBALS['TL_LANG']['tl_module']['mateShowSearch'] = ['show search icon','show search icon in header'];
 $GLOBALS['TL_LANG']['tl_module']['mateShowMobileMenu'] = ['show mobile menu','show mobile menu with a menu icon'];

diff --git a/src/Resources/contao/templates/elements/mate/ce_mate_contentbox.html5 b/src/Resources/contao/templates/elements/mate/ce_mate_contentbox.html5
@@ -9,7 +9,7 @@
 
         <?php if ($this->headline): ?>
           <<?= $this->hl ?>>
-            <?php if($this->page != ""): ?><a href="{{link_url::<?= $this->page ?>}}"><?php endif; ?>
+            <?php if($this->page != ""): ?><a href="<?php if(is_numeric($this->page)): ?>{{link_url::<?= $this->page ?>}}<?php else: ?><?= $this->page ?><?php endif; ?>"><?php endif; ?>
               <?= $this->headline ?>
             <?php if($this->page != ""): ?></a><?php endif; ?>
           </<?= $this->hl ?>>
@@ -19,7 +19,7 @@
 
         <?php if($this->pageText != ""): ?>
           <div class="pageLink">
-            <a href="{{link_url::<?= $this->page ?>}}"><?= $this->pageText ?></a>
+            <a href="<?php if(is_numeric($this->page)): ?>{{link_url::<?= $this->page ?>}}<?php else: ?><?= $this->page ?><?php endif; ?>"><?= $this->pageText ?></a>
           </div>
         <?php endif; ?>
 

diff --git a/src/Resources/contao/templates/elements/mate/ce_mate_teaserbox.html5 b/src/Resources/contao/templates/elements/mate/ce_mate_teaserbox.html5
@@ -3,7 +3,7 @@
     <?php $this->block('content'); ?>
 
       <?php if ($this->addImage): ?>
-        <?php if($this->page != ""): ?><a href="{{link_url::<?= $this->page ?>}}" title="<?= $this->pageText ?>" <?= $this->target ?><?= $this->rel ?>><?php endif; ?>
+        <?php if($this->page != ""): ?><a href="<?php if(is_numeric($this->page)): ?>{{link_url::<?= $this->page ?>}}<?php else: ?><?= $this->page ?><?php endif; ?>" title="<?= $this->pageText ?>" <?= $this->target ?><?= $this->rel ?>><?php endif; ?>
           <?php $this->insert('image', $this->arrData); ?>
         <?php if($this->page != ""): ?></a><?php endif; ?>
       <?php endif; ?>
@@ -12,7 +12,7 @@
 
       <?php if ($this->headline): ?>
         <<?= $this->hl ?>>
-          <?php if($this->page != ""): ?><a href="{{link_url::<?= $this->page ?>}}"><?php endif; ?>
+          <?php if($this->page != ""): ?><a href="<?php if(is_numeric($this->page)): ?>{{link_url::<?= $this->page ?>}}<?php else: ?><?= $this->page ?><?php endif; ?>"><?php endif; ?>
             <?= $this->headline ?>
           <?php if($this->page != ""): ?></a><?php endif; ?>
         </<?= $this->hl ?>>
@@ -22,7 +22,7 @@
 
       <?php if($this->pageText != ""): ?>
         <div class="pageLink">
-          <a href="{{link_url::<?= $this->page ?>}}"><?= $this->pageText ?></a>
+          <a href="<?php if(is_numeric($this->page)): ?>{{link_url::<?= $this->page ?>}}<?php else: ?><?= $this->page ?><?php endif; ?>"><?= $this->pageText ?></a>
         </div>
       <?php endif; ?>
 

diff --git a/src/Resources/contao/templates/elements/mate/ce_mate_teaserbox_link.html5 b/src/Resources/contao/templates/elements/mate/ce_mate_teaserbox_link.html5
@@ -1,5 +1,5 @@
 <div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
-	<a href="{{link_url::<?= $this->page ?>}}" <?= $this->target ?><?= $this->rel ?> class="inside">
+	<a href="<?php if(is_numeric($this->page)): ?>{{link_url::<?= $this->page ?>}}<?php else: ?><?= $this->page ?><?php endif; ?>" <?= $this->target ?><?= $this->rel ?> class="inside">
     <?php $this->block('content'); ?>
 
       <?php if ($this->addImage): ?>

diff --git a/src/Resources/contao/templates/layouts/mate/fe_page_mate.html5 b/src/Resources/contao/templates/layouts/mate/fe_page_mate.html5
@@ -12,17 +12,7 @@
 
   <?= $this->viewport ?>
 
-  <link rel="stylesheet" type="text/css" media="all" href="<?php
-  // add stylesheets
-  $combiner = new Combiner();
-
-  if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-    $combiner->add('bundles/matetheme/sass/mate_win.scss');
-  } else {
-    $combiner->add('bundles/matetheme/sass/mate.scss');
-  }
-
-  echo $combiner->getCombinedFile(); ?>">
+  <link rel="stylesheet" type="text/css" media="all" href="<?= ContaoThemesNet\MateThemeBundle\ThemeUtils::getCombinedStylesheet(); ?>">
 
   <?= $this->stylesheets ?>
 
@@ -31,7 +21,7 @@
   <meta property="og:title" content="<?php echo $this->pageTitle; ?> - <?php echo $this->mainTitle; ?>" />
   <meta property="og:description" content="<?php echo $this->description; ?>" />
   <meta property="og:url" content="{{env::url}}/{{env::request}}" />
-  <?php if($GLOBALS['og:image']) echo '<meta property="og:image" content="'.$GLOBALS['og:image'].'" />'; ?>
+  <?php if(isset($GLOBALS['og:image'])) echo '<meta property="og:image" content="'.$GLOBALS['og:image'].'" />'; ?>
 
   <link rel="shortcut icon" href="files/mate/img/favicon.ico" type="image/x-icon" />
 <?php $this->endblock(); ?>

diff --git a/src/Resources/contao/templates/modules/mate/news_mate_short.html5 b/src/Resources/contao/templates/modules/mate/news_mate_short.html5
@@ -18,7 +18,7 @@
       </div>
 
       <?php if ($this->hasText || $this->hasTeaser): ?>
-        <a class="more" href="<?= $this->link ?>">Weiterlesen</a>
+        <a class="more" href="<?= $this->link ?>"><?= $GLOBALS['TL_LANG']['mateTheme']['continueReading'] ?></a>
       <?php endif; ?>
     </div>