- Icon font can now be changed via the config

- Add branch alias
contao-thememanager · Oct 19, 2020 · 9095c56 · 9095c56
1 parent 6275704
commit 9095c56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -44,6 +44,9 @@
     ]
   },
   "extra":{
+    "branch-alias": {
+      "dev-master": "1.2.x-dev"
+    },
     "contao-manager-plugin": "ContaoThemeManager\\Core\\ContaoManager\\Plugin"
   }
 }
diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -5,6 +5,9 @@
  * (c) https://www.oveleon.de/
  */
 
+// Contao ThemeManager
+$GLOBALS['CTM_SETTINGS']['iconFont'] = 'files/assets/fontello/font/fontello.svg';
+
 // Add configuration dca for themes
 $GLOBALS['BE_MOD']['design']['themes']['tables'][] = 'tl_thememanager';
 

diff --git a/src/Resources/contao/templates/rsce/rsce_icon_text_config.php b/src/Resources/contao/templates/rsce/rsce_icon_text_config.php
@@ -21,7 +21,7 @@
                 'en' => array('Icon', 'Please select an icon from the icon overview.'),
             ),
             'inputType' => 'rocksolid_icon_picker',
-            'eval' => array('iconFont' => 'files/assets/fontello/font/fontello.svg'),
+            'eval' => array('iconFont' => $GLOBALS['CTM_SETTINGS']['iconFont']),
         ),
         'text' => array(
             'label' => array(

diff --git a/src/Resources/contao/templates/rsce/rsce_icon_text_list_config.php b/src/Resources/contao/templates/rsce/rsce_icon_text_list_config.php
@@ -38,7 +38,7 @@
                         'en' => array('Icon', 'Please select an icon from the icon overview.'),
                     ),
                     'inputType' => 'rocksolid_icon_picker',
-                    'eval' => array('iconFont' => 'files/assets/fontello/font/fontello.svg'),
+                    'eval' => array('iconFont' => $GLOBALS['CTM_SETTINGS']['iconFont']),
                 ),
                 'text' => array(
                     'label' => array(