Dev: Seperated font packages in a singe package definition file

LimeSurvey · Jan 18, 2018 · 4c40b61 · 4c40b61
1 parent 3fe4e75
commit 4c40b61
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 74 deletions.
diff --git a/application/config/fonts.php b/application/config/fonts.php
@@ -0,0 +1,88 @@
+<?php if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+/**
+ * Font packages
+ * @license GPL v3
+ * core path is application/core/packages
+ *
+ * Note: When debug mode, asset manager is turned off by default.
+ * To enjoy this feature, add to your package definition a 'devBaseUrl' with the relative url to your package
+ *
+ */
+$debug = isset($userConfig['config']['debug']) ? $userConfig['config']['debug'] : 0;
+/* To add more easily min version : config > 2 , seems really an core dev issue to fix bootstrap.js ;) */
+$minVersion = ($debug > 0) ? "" : ".min";
+/* needed ? @see third_party.php */
+if (isset($_GET['isAjax'])) {
+    return array();
+}
+return array(
+
+    'fontawesome' => array(
+        //'basePath' => 'third_party.bootstrap', // Need fix third_party alias
+        'devBaseUrl' => 'assets/fonts/font-src/fontawesome/',
+        'basePath' => 'fonts.font-src.fontawesome',
+        'css'=> array(
+            'css/font-awesome'.$minVersion.'.css',
+        ),
+    ),
+
+    'font-roboto' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'roboto.css',
+        ),
+    ),
+
+    'font-icomoon' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'icomoon.css',
+        ),
+    ),
+
+    'font-noto' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'noto.css',
+        ),
+    ),
+
+    'font-news_cycle' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'news_cycle.css',
+        ),
+    ),
+
+    'font-ubuntu' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'ubuntu.css',
+        ),
+    ),
+
+    'font-lato' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'lato.css',
+        ),
+    ),
+
+    // see: https://www.w3schools.com/cssref/css_websafe_fonts.asp
+    'font-websafe' => array(
+        'devBaseUrl' => 'assets/fonts/',
+        'basePath' => 'fonts',
+        'css' => array(
+            'websafe.css',
+        ),
+    ),
+
+);
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -109,7 +109,8 @@
             'packages' => array_merge(
                 require('third_party.php'),
                 require('packages.php'),
-                require('questiontypes.php')
+                require('questiontypes.php'),
+                require('fonts.php')
             ),
             'class' => 'application.core.LSYii_ClientScript'
         ),

diff --git a/application/config/packages.php b/application/config/packages.php
@@ -235,70 +235,6 @@
         )
     ),
 
-    'font-roboto' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'roboto.css',
-        ),
-    ),
-
-    'font-icomoon' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'icomoon.css',
-        ),
-    ),
-
-    'font-noto' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'noto.css',
-        ),
-    ),
-
-    'font-news_cycle' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'news_cycle.css',
-        ),
-    ),
-
-    'font-ubuntu' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'ubuntu.css',
-        ),
-    ),
-
-    'font-lato' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'lato.css',
-        ),
-    ),
-
-    // see: https://www.w3schools.com/cssref/css_websafe_fonts.asp
-    'font-websafe' => array(
-        'devBaseUrl' => 'assets/fonts/',
-        'basePath' => 'fonts',
-        'position' =>CClientScript::POS_BEGIN,
-        'css' => array(
-            'websafe.css',
-        ),
-    ),
-
     'surveymenufunctions' => array(
         'devBaseUrl' => 'assets/packages/surveymenufunctions/',
         'basePath' => 'core.surveymenufunctions',

diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -153,15 +153,6 @@
         )
     ),
 
-    'fontawesome' => array(
-        //'basePath' => 'third_party.bootstrap', // Need fix third_party alias
-        'devBaseUrl' => 'assets/fonts/font-src/fontawesome/',
-        'basePath' => 'fonts.font-src.fontawesome',
-        'css'=> array(
-            'css/font-awesome'.$minVersion.'.css',
-        ),
-    ),
-
     // jQuery UI
     'jqueryui' => array(
         'devBaseUrl' => 'third_party/jquery-ui',