Просмотр исходного кода

Ticket #4438 - Add setting to disable FontAwesome loading.

AntonLV 3 лет назад
Родитель
Сommit
c89adabefc

+ 2 - 1
install/sql/system.sql

@@ -367,6 +367,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 
 (@iCategoryId, 'sys_css_media_classes', '_adm_stg_cpt_option_sys_css_media_classes', '{"phone":"(max-width:720px)","phone2":"(min-width:533px) and (max-width:720px)","tablet":"(min-width:720px) and (max-width:1280px)","tablet2":"(min-width:1024px) and (max-width:1280px)","desktop":"(min-width:1280px)"}', 'digit', '', '', '', '', 180),
 (@iCategoryId, 'sys_css_tailwind_default', '_adm_stg_cpt_option_sys_css_tailwind_default', 'tailwind.min.css', 'select', 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:27:"get_options_taiwind_default";s:5:"class";s:13:"TemplServices";}', '', '', '', 181),
+(@iCategoryId, 'sys_css_icons_default', '_adm_stg_cpt_option_sys_css_icons_default', 'icons.css', 'digit', '', '', '', '', 182),
 
 (@iCategoryId, 'sys_files_ext_images', '_adm_stg_cpt_option_sys_files_ext_images', 'jpg,jpeg,jpe,gif,png,webp', 'digit', '', '', '', '', 200),
 (@iCategoryId, 'sys_files_ext_video', '_adm_stg_cpt_option_sys_files_ext_video', 'avi,flv,mpg,mpeg,wmv,mp4,m4v,mov,qt,divx,xvid,3gp,3g2,webm,mkv,ogv,ogg,rm,rmvb,asf,drc,ts', 'digit', '', '', '', '', 210),
@@ -6157,7 +6158,7 @@ INSERT INTO `sys_preloader`(`module`, `type`, `content`, `active`, `order`) VALU
 ('system', 'css_system', 'common.css', 1, 10),
 ('system', 'css_system', 'default.less', 1, 11),
 ('system', 'css_system', 'general.css', 1, 12),
-('system', 'css_system', 'icons.css', 1, 13),
+('system', 'css_system', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:21:"get_preloader_content";s:6:"params";a:1:{i:0;s:5:"icons";}s:5:"class";s:12:"BaseServices";}', 1, 13),
 ('system', 'css_system', 'colors.css', 1, 14),
 ('system', 'css_system', 'forms.css', 1, 15),
 ('system', 'css_system', 'media-desktop.css', 1, 20),

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -1689,6 +1689,7 @@
     <string name="_adm_stg_cpt_option_sys_fixed_header"><![CDATA[Fixed header]]></string>
     <string name="_adm_stg_cpt_option_sys_css_media_classes"><![CDATA[CSS @media intervals]]></string>
     <string name="_adm_stg_cpt_option_sys_css_tailwind_default"><![CDATA[Active Tailwind build]]></string>
+    <string name="_adm_stg_cpt_option_sys_css_icons_default"><![CDATA[Active Icons set]]></string>
     <string name="_adm_stg_cpt_option_sys_files_ext_images"><![CDATA[Allowed extensions for image's files]]></string>
     <string name="_adm_stg_cpt_option_sys_files_ext_video"><![CDATA[Allowed extensions for video files]]></string>
     <string name="_adm_stg_cpt_option_sys_files_ext_imagevideo"><![CDATA[Allowed extensions for image and video files]]></string>

+ 1 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -1667,6 +1667,7 @@
     <string name="_adm_stg_cpt_option_sys_fixed_header"><![CDATA[Статический заголовок]]></string>
     <string name="_adm_stg_cpt_option_sys_css_media_classes"><![CDATA[CSS @media интервалы]]></string>
     <string name="_adm_stg_cpt_option_sys_css_tailwind_default"><![CDATA[Активная сборка Tailwind]]></string>
+    <string name="_adm_stg_cpt_option_sys_css_icons_default"><![CDATA[Активный набор Icons]]></string>
     <string name="_adm_stg_cpt_option_sys_files_ext_images"><![CDATA[Разрешенные расширения для файлов изображений]]></string>
     <string name="_adm_stg_cpt_option_sys_files_ext_video"><![CDATA[Разрешенные расширения для видеофайлов]]></string>
     <string name="_adm_stg_cpt_option_sys_files_ext_imagevideo"><![CDATA[Разрешенные расширения для файлов изображений и видео]]></string>

+ 4 - 0
template/scripts/BxBaseServices.php

@@ -97,6 +97,10 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
         $sResult = '';
 
         switch($sName) {
+            case 'icons':
+                $sResult = getParam('sys_css_icons_default');
+                break;
+
             case 'tailwind':
                 $sFile = getParam('sys_css_tailwind_default');
                 if(empty($sFile))