diff --git a/CHANGELOG.md b/CHANGELOG.md index 688a3dd..935ce1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,4 +26,8 @@ #### 0.7.0 - FIX: minor typo fixes -- ADD: Overwrite font on import to avoid duplicates \ No newline at end of file +- ADD: Overwrite font on import to avoid duplicates + +#### 0.7.1 + +- FIX: minor typo and code quality fixes \ No newline at end of file diff --git a/README.md b/README.md index 0b3a172..3104087 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Please use only free or properly licensed fonts. - Generate and load font CSS - Manage font styles (bold, italic etc.) - Assign fonts to CSS selectors automaticly -- Tested on Contao 4.3.11, 4.4.20, 4.5.10 +- Tested on Contao 4.3.11, 4.4.20 - 4.4.24, 4.5.10, 4.6.3 #### TODO diff --git a/src/Resources/contao/dca/tl_fonts.php b/src/Resources/contao/dca/tl_fonts.php index 8777b87..ae72992 100644 --- a/src/Resources/contao/dca/tl_fonts.php +++ b/src/Resources/contao/dca/tl_fonts.php @@ -290,7 +290,7 @@ public function renderStyleLabel($row, $label = false) if ($format) { $format = implode(', ', $format); - $label = sprintf('[%s]%s %s', $format, $this->getFontFaceName($row['pid']), $label); + $label = sprintf('[%s]%s%s', $format, $this->getFontFaceName($row['pid']), $label); } if ($row['style'] !== 'normal') { @@ -336,7 +336,7 @@ public function checkPermission() */ private function getFontFaceName($fontId) { - $fontFace = $this->Database->prepare('SELECT name FROM tl_fonts_faces WHERE id = ? LIMIT 1')->execute($fontId); + $fontFace = $this->Database->prepare('SELECT `name` FROM `tl_fonts_faces` WHERE `id` = ? LIMIT 1')->execute($fontId); if ($fontFace->name) { return ' '.$fontFace->name; } diff --git a/src/Resources/contao/dca/tl_user_group.php b/src/Resources/contao/dca/tl_user_group.php index 6f1e0d1..4b226ac 100644 --- a/src/Resources/contao/dca/tl_user_group.php +++ b/src/Resources/contao/dca/tl_user_group.php @@ -1,13 +1,12 @@ &$GLOBALS['TL_LANG']['tl_user_group']['webfont_generator'], 'exclude' => true, 'inputType' => 'checkbox', 'options' => array('create', 'delete'), 'reference' => &$GLOBALS['TL_LANG']['MSC'], - 'eval' => array('multiple'=>true), + 'eval' => array('multiple' => true), 'sql' => "blob NULL" ); diff --git a/src/Resources/contao/languages/de/tl_fonts_faces.xlf b/src/Resources/contao/languages/de/tl_fonts_faces.xlf index 0b70095..a0e2bdc 100644 --- a/src/Resources/contao/languages/de/tl_fonts_faces.xlf +++ b/src/Resources/contao/languages/de/tl_fonts_faces.xlf @@ -83,7 +83,7 @@ CSS import - CSS importieren + CSS-Import Import existing CSS files @@ -91,11 +91,11 @@ Source files - CSS-Dateien + Quelldateien Here you can upload one or more .css files to be imported. - Hier können Sie eines oder mehrere CSS-Dateien hochladen. + Hier können Sie eine oder mehrere .css-Dateien für den Import hochladen. Overwrite font