Merge branch 'hotfix/fix_code_style_and_css' into 'release/2.3.0'

Fix code style and CSS See merge request metamodels/core!306
MetaModels · Jul 19, 2024 · 7e47d01 · 7e47d01
2 parents f16b01b + 7b177ac
commit 7e47d01
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/src/CoreBundle/EventListener/DcGeneral/Table/RenderSettings/JumpToListener.php b/src/CoreBundle/EventListener/DcGeneral/Table/RenderSettings/JumpToListener.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/core.
  *
- * (c) 2012-2023 The MetaModels team.
+ * (c) 2012-2024 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +14,7 @@
  * @author     Christian Schiffler <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2023 The MetaModels team.
+ * @copyright  2012-2024 The MetaModels team.
  * @license    https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -42,17 +42,17 @@ class JumpToListener extends AbstractAbstainingListener
     private const DEFAULT_TYPE = UrlGeneratorInterface::ABSOLUTE_PATH;
 
     private const TYPE_MAP = [
-        'absolute_url' => UrlGeneratorInterface::ABSOLUTE_URL,
+        'absolute_url'  => UrlGeneratorInterface::ABSOLUTE_URL,
         'absolute_path' => UrlGeneratorInterface::ABSOLUTE_PATH,
         'relative_path' => UrlGeneratorInterface::RELATIVE_PATH,
-        'network_path' => UrlGeneratorInterface::NETWORK_PATH,
+        'network_path'  => UrlGeneratorInterface::NETWORK_PATH,
     ];
 
     private const TYPE_MAP_INVERSE = [
-        UrlGeneratorInterface::ABSOLUTE_URL => 'absolute_url',
+        UrlGeneratorInterface::ABSOLUTE_URL  => 'absolute_url',
         UrlGeneratorInterface::ABSOLUTE_PATH => 'absolute_path',
         UrlGeneratorInterface::RELATIVE_PATH => 'relative_path',
-        UrlGeneratorInterface::NETWORK_PATH => 'network_path',
+        UrlGeneratorInterface::NETWORK_PATH  => 'network_path',
     ];
 
     /**
@@ -168,7 +168,7 @@ public function encodeValue(EncodePropertyValueFromWidgetEvent $event)
 
         foreach ($value as $k => $v) {
             $value[$k]['value'] = \str_replace(['{{link_url::', '}}'], ['', ''], $v['value']);
-            $value[$k]['type'] = self::TYPE_MAP[$v['type']] ?? self::DEFAULT_TYPE;
+            $value[$k]['type']  = self::TYPE_MAP[$v['type']] ?? self::DEFAULT_TYPE;
         }
 
         $event->setValue(\serialize($value));
@@ -208,7 +208,7 @@ public function buildWidget(BuildWidgetEvent $event)
             foreach ((array) $metaModel->getAvailableLanguages() as $strLangCode) {
                 $arrLanguages[$strLangCode] = $this->translator
                     ->trans('LNG.' . $strLangCode, [], 'contao_languages');
-                $rowClasses[] = ($strLangCode === $fallback) ? 'fallback_language' : 'normal_language';
+                $rowClasses[]               = ($strLangCode === $fallback) ? 'fallback_language' : 'normal_language';
             }
 
             $extra['minCount'] = \count($arrLanguages);
@@ -221,16 +221,11 @@ public function buildWidget(BuildWidgetEvent $event)
             $extra['maxCount'] = 1;
 
             $extra['columnFields']['langcode']['options'] = [
-                'xx' => $this->translator
-                    ->trans(
-                        'jumpTo_allLanguages',
-                        [],
-                        'tl_metamodel_rendersettings'
-                    )
+                'xx' => $this->translator->trans('jumpTo_allLanguages', [], 'tl_metamodel_rendersettings')
             ];
         }
 
-        $extra['columnFields']['type']['options'] = $this->getUrlTypes();
+        $extra['columnFields']['type']['options']   = $this->getUrlTypes();
         $extra['columnFields']['filter']['options'] = $this->getFilterSettings($model);
 
         $event->getProperty()->setExtra($extra);

diff --git a/src/CoreBundle/Resources/public/css/style.css b/src/CoreBundle/Resources/public/css/style.css
@@ -179,12 +179,13 @@ form[id^=mm_] .sort_hint {
   width: 15%;
 }
 #tl_metamodel_rendersettings .jumpTo_page input {
-  width: 88%;
+  width: 83%;
 }
 #tl_metamodel_rendersettings .jumpTo_filter {
   width: 55%;
 }
-#tl_metamodel_rendersettings .jumpTo_filter select {
+#tl_metamodel_rendersettings .jumpTo_filter select,
+#tl_metamodel_rendersettings .jumpTo_filter div.tl_select {
   width: 100%;
 }
 #tl_metamodel_rendersettings .operations {

diff --git a/src/CoreBundle/Resources/public/scss/style.scss b/src/CoreBundle/Resources/public/scss/style.scss
@@ -159,12 +159,12 @@ form[id^=mm_] .sort_hint {
   .jumpTo_page {
     width: 15%;
     input {
-      width: 88%;
+      width: 83%;
     }
   }
   .jumpTo_filter {
     width: 55%;
-    select {
+    select, div.tl_select {
       width: 100%;
     }
   }