Ticket #4847 - Studio: Layout changes. Stage 3.

unacms · Nov 29, 2024 · b1795ec · b1795ec
1 parent 02cb290
commit b1795ec
Show file tree

Hide file tree

Showing 56 changed files with 362 additions and 301 deletions.
diff --git a/inc/classes/BxDolTemplate.php b/inc/classes/BxDolTemplate.php
@@ -1481,6 +1481,19 @@ function getIconPath($sName, $sCheckIn = BX_DOL_TEMPLATE_CHECK_IN_BOTH)
         return $this->_getAbsoluteLocation('path', $this->_sFolderIcons, $sName, $sCheckIn);
     }
 
+    function getIconContent($sName)
+    {
+        if(strpos($sName, '.svg') === false)
+            return false;
+
+        $mixedResult = false;
+        if(($sIconPath = $this->getIconPath($sName)))
+            $mixedResult = file_get_contents($sIconPath);
+        else
+            $mixedResult = bx_file_get_contents($sName);
+
+        return $mixedResult;
+    }
     /**
      * Get image/icon by name automatically. Cache item description:
      * [
@@ -3239,6 +3252,7 @@ protected function _parseContentKeys($sContent, $aCallbackPatterns = array())
             "'<bx_image_auto:([^\s]+) \/>'s" => "get_image_auto",
             "'<bx_image_url:([^\s]+) \/>'s" => "get_image_url",
             "'<bx_icon_url:([^\s]+) \/>'s" => "get_icon_url",
+            "'<bx_icon_inline:([^\s]+) \/>'s" => "get_icon_inline",
             "'<bx_text:([_\{\}\w\d\s]+[^\s]{1}) \/>'s" => "get_text",
             "'<bx_text_js:([^\s]+) \/>'s" => "get_text_js",
             "'<bx_text_attribute:([^\s]+) \/>'s" => "get_text_attribute",
@@ -3259,6 +3273,10 @@ protected function _parseContentKeys($sContent, $aCallbackPatterns = array())
                 case 'get_icon_url':
                     $sResult = $oTemplate->getIconUrl($aMatches[1]);
                     break;
+                case 'get_icon_inline':
+                    if(($sResult = $this->getIconContent($aMatches[1])) === false)
+                        $sResult = '';
+                    break;
                 case 'get_text':
                     $sResult = _t($aMatches[1]);
                     break;

diff --git a/install/sql/system.sql b/install/sql/system.sql
@@ -314,7 +314,7 @@ CREATE TABLE `sys_options_types` (
 --
 -- Dumping data for tables `sys_options_types`
 --
-INSERT INTO `sys_options_types`(`group`, `name`, `caption`, `icon`, `order`) VALUES ('system', 'system', '_adm_stg_cpt_type_system', 'cogs', 1);
+INSERT INTO `sys_options_types`(`group`, `name`, `caption`, `icon`, `order`) VALUES ('system', 'system', '_adm_stg_cpt_type_system', 'mi-cog.svg', 1);
 SET @iTypeId = LAST_INSERT_ID();
 
 --

diff --git a/modules/boonex/developer/classes/BxDevPolyglot.php b/modules/boonex/developer/classes/BxDevPolyglot.php
@@ -20,16 +20,18 @@ function __construct($aParams)
     {
         parent::__construct(isset($aParams['page']) ? $aParams['page'] : '');
 
+        $this->bPageMenuTitle = false;
+
         $this->aParams = $aParams;
         $this->sSubpageUrl = $this->aParams['url'] . '&pgt_page=';
 
         $this->oModule = BxDolModule::getInstance('bx_developer');
 
-        $this->aMenuItems = array();
+        $this->aMenuItems = false;
 
-		$this->aGridObjects = array(
-			'manage' => $this->oModule->_oConfig->getObject('grid_pgt_manage'),
-		);
+        $this->aGridObjects = [
+            'manage' => $this->oModule->_oConfig->getObject('grid_pgt_manage'),
+        ];
     }
 
     function getPageCss()

diff --git a/modules/boonex/developer/template/css/main.css b/modules/boonex/developer/template/css/main.css
@@ -1,6 +1,6 @@
 /*--- Overwrite ---*/
 body.bx-dev-page-body-columns div.bx-std-page-column.bx-std-page-content .bx-std-page-column-cnt {
-    padding: 5rem 0 0 0;
+    padding: 4.0rem 0 0 0;
 }
 body.bx-dev-page-body-single div.bx-std-page-menu,
 body.bx-dev-page-body-columns div.bx-std-page-menu {
@@ -140,5 +140,5 @@ div.bx-dev-page-column.bx-dev-page-content {
     overflow-y: auto;
 }
 div.bx-dev-page-column.bx-dev-page-content .bx-dev-page-column-cnt {
-    padding: 1.5rem;
+    padding: 1.0rem;
 }
diff --git a/modules/boonex/developer/template/page_menu.html b/modules/boonex/developer/template/page_menu.html
@@ -1,6 +1,6 @@
 <div class="bx-std-pcm-title" id="bx-std-pc-title">
     <div class="bx-std-pcm-title-cnt mx-4 pb-6 border-b border-gray-100/20">
-        <a class="bx-std-pcm-actions bx-btn" href="javascript:void(0)" onclick="__actions_onclick__" title="<bx_text_attribute:_adm_txt_show_actions />">
+        <a class="bx-std-pcm-actions flex justify-center items-center w-10 h-10 bg-gray-200 hover:bg-gray-100 border border-black/10 rounded-lg text-gray-600" href="javascript:void(0)" onclick="__actions_onclick__" title="<bx_text_attribute:_adm_txt_show_actions />">
             <img src="__actions_icon__" />
         </a>
     </div>

diff --git a/modules/boonex/english/data/langs/system/en.xml b/modules/boonex/english/data/langs/system/en.xml
@@ -493,9 +493,9 @@
 	<string name="_adm_bp_btn_page_create"><![CDATA[Create]]></string>
 	<string name="_adm_bp_btn_settings"><![CDATA[Settings]]></string>
 	<string name="_adm_bp_btn_view_page"><![CDATA[View Page]]></string>
-	<string name="_adm_bp_cpt_type_custom"><![CDATA[Custom]]></string>
+	<string name="_adm_bp_cpt_type_custom"><![CDATA[Custom Pages]]></string>
 	<string name="_adm_bp_cpt_type_modules"><![CDATA[Modules]]></string>
-	<string name="_adm_bp_cpt_type_system"><![CDATA[System]]></string>
+	<string name="_adm_bp_cpt_type_system"><![CDATA[System Pages]]></string>
 	<string name="_adm_bp_dsc_block_content_image_file"><![CDATA[The image will be displayed in block]]></string>
 	<string name="_adm_bp_dsc_block_content_lang"><![CDATA[Enter the content in accordance with the selected language]]></string>
 	<string name="_adm_bp_dsc_block_content_raw"><![CDATA[Enter HTML content here]]></string>
@@ -1112,17 +1112,16 @@
     <string name="_adm_lmi_cpt_badges"><![CDATA[Badges]]></string>
     <string name="_adm_lmi_cpt_categories"><![CDATA[Categories]]></string>
     <string name="_adm_lmi_cpt_checkout"><![CDATA[Checkout {checkout_counter}]]></string>
-    <string name="_adm_lmi_cpt_cover"><![CDATA[Cover]]></string>
+    <string name="_adm_lmi_cpt_cover"><![CDATA[Covers]]></string>
     <string name="_adm_lmi_cpt_search"><![CDATA[Search]]></string>
     <string name="_adm_lmi_cpt_search_forms"><![CDATA[Search Forms]]></string>
     <string name="_adm_lmi_cpt_search_fields"><![CDATA[Search Fields]]></string>
     <string name="_adm_lmi_cpt_search_sortable_fields"><![CDATA[Search Sortable Fields]]></string>
-    <string name="_adm_lmi_cpt_splash"><![CDATA[Splash]]></string>
+    <string name="_adm_lmi_cpt_splash"><![CDATA[Splash page]]></string>
     <string name="_adm_lmi_cpt_displays"><![CDATA[Displays]]></string>
     <string name="_adm_lmi_cpt_downloaded"><![CDATA[Downloaded]]></string>
-    <string name="_adm_lmi_cpt_etemplates"><![CDATA[Emails]]></string>
-    <string name="_adm_lmi_cpt_etemplates_hf"><![CDATA[Email Template]]></string>
-    <string name="_adm_lmi_cpt_etemplates_creative"><![CDATA[Email Template]]></string>
+    <string name="_adm_lmi_cpt_etemplates_text"><![CDATA[Email Texts]]></string>
+    <string name="_adm_lmi_cpt_etemplates_html"><![CDATA[Email Template]]></string>
     <string name="_adm_lmi_cpt_featured"><![CDATA[Featured]]></string>
     <string name="_adm_lmi_cpt_fields"><![CDATA[Fields]]></string>
     <string name="_adm_lmi_cpt_files"><![CDATA[Files]]></string>
@@ -1133,7 +1132,8 @@
     <string name="_adm_lmi_cpt_injections"><![CDATA[Injections]]></string>
     <string name="_adm_lmi_cpt_images"><![CDATA[Images]]></string>
     <string name="_adm_lmi_cpt_items"><![CDATA[Items]]></string>
-    <string name="_adm_lmi_cpt_keys"><![CDATA[Keys]]></string>
+    <string name="_adm_lmi_cpt_pgt_settings"><![CDATA[i18n Settings]]></string>
+    <string name="_adm_lmi_cpt_pgt_keys"><![CDATA[Text Keys]]></string>
     <string name="_adm_lmi_cpt_labels"><![CDATA[Labels]]></string>
     <string name="_adm_lmi_cpt_latest"><![CDATA[Latest]]></string>
     <string name="_adm_lmi_cpt_levels"><![CDATA[Levels]]></string>
@@ -1145,7 +1145,7 @@
     <string name="_adm_lmi_cpt_providers"><![CDATA[Providers]]></string>
     <string name="_adm_lmi_cpt_popular"><![CDATA[Popular]]></string>
     <string name="_adm_lmi_cpt_purchases"><![CDATA[Purchases]]></string>
-    <string name="_adm_lmi_cpt_pwa"><![CDATA[PWA]]></string>
+    <string name="_adm_lmi_cpt_pwa"><![CDATA[Progressive Web App]]></string>
     <string name="_adm_lmi_cpt_ractions"><![CDATA[Actions]]></string>
     <string name="_adm_lmi_cpt_rlevels"><![CDATA[Levels]]></string>
     <string name="_adm_lmi_cpt_sets"><![CDATA[Sets]]></string>

diff --git a/modules/boonex/russian/data/langs/system/ru.xml b/modules/boonex/russian/data/langs/system/ru.xml
@@ -491,9 +491,9 @@
 	<string name="_adm_bp_btn_page_create"><![CDATA[Создать]]></string>
 	<string name="_adm_bp_btn_settings"><![CDATA[Настройки]]></string>
 	<string name="_adm_bp_btn_view_page"><![CDATA[Просмотреть страницу]]></string>
-	<string name="_adm_bp_cpt_type_custom"><![CDATA[Индивидуальный]]></string>
+	<string name="_adm_bp_cpt_type_custom"><![CDATA[Пользовательские страницы]]></string>
 	<string name="_adm_bp_cpt_type_modules"><![CDATA[Модули]]></string>
-	<string name="_adm_bp_cpt_type_system"><![CDATA[Система]]></string>
+	<string name="_adm_bp_cpt_type_system"><![CDATA[Системные страницы]]></string>
 	<string name="_adm_bp_dsc_block_content_image_file"><![CDATA[Картинка будет отображена в блоке]]></string>
 	<string name="_adm_bp_dsc_block_content_lang"><![CDATA[Введите содержимое в соответствии с выбранным языком]]></string>
 	<string name="_adm_bp_dsc_block_content_raw"><![CDATA[Введите здесь HTML-содержимое]]></string>
@@ -1096,17 +1096,16 @@
     <string name="_adm_lmi_cpt_badges"><![CDATA[Бейджи]]></string>
     <string name="_adm_lmi_cpt_categories"><![CDATA[Категории]]></string>
     <string name="_adm_lmi_cpt_checkout"><![CDATA[Оплата {checkout_counter}]]></string>
-    <string name="_adm_lmi_cpt_cover"><![CDATA[Обложка]]></string>
+    <string name="_adm_lmi_cpt_cover"><![CDATA[Обложки]]></string>
     <string name="_adm_lmi_cpt_search"><![CDATA[Поиск]]></string>
     <string name="_adm_lmi_cpt_search_forms"><![CDATA[Формы поиска]]></string>
     <string name="_adm_lmi_cpt_search_fields"><![CDATA[Поля поиска]]></string>
     <string name="_adm_lmi_cpt_search_sortable_fields"><![CDATA[Поля сортироски поиска]]></string>
-	<string name="_adm_lmi_cpt_splash"><![CDATA[Заставка]]></string>
+	<string name="_adm_lmi_cpt_splash"><![CDATA[Страница-заставка]]></string>
 	<string name="_adm_lmi_cpt_displays"><![CDATA[Дисплеи]]></string>
 	<string name="_adm_lmi_cpt_downloaded"><![CDATA[Скачано]]></string>
-	<string name="_adm_lmi_cpt_etemplates"><![CDATA[Email-ы]]></string>
-	<string name="_adm_lmi_cpt_etemplates_hf"><![CDATA[Email-шаблон]]></string>
-        <string name="_adm_lmi_cpt_etemplates_creative"><![CDATA[Email-шаблон]]></string>
+	<string name="_adm_lmi_cpt_etemplates_text"><![CDATA[Тексты email-ов]]></string>
+        <string name="_adm_lmi_cpt_etemplates_html"><![CDATA[Email-шаблон]]></string>
 	<string name="_adm_lmi_cpt_featured"><![CDATA[Продвинутые]]></string>
 	<string name="_adm_lmi_cpt_fields"><![CDATA[Поля]]></string>
 	<string name="_adm_lmi_cpt_files"><![CDATA[Файлы]]></string>
@@ -1117,7 +1116,8 @@
 	<string name="_adm_lmi_cpt_injections"><![CDATA[Вставки]]></string>
 	<string name="_adm_lmi_cpt_images"><![CDATA[Изображения]]></string>
 	<string name="_adm_lmi_cpt_items"><![CDATA[Элементы]]></string>
-	<string name="_adm_lmi_cpt_keys"><![CDATA[Ключи]]></string>
+        <string name="_adm_lmi_cpt_pgt_settings"><![CDATA[Настройки (i18n)]]></string>
+	<string name="_adm_lmi_cpt_pgt_keys"><![CDATA[Текстовые ключи]]></string>
         <string name="_adm_lmi_cpt_labels"><![CDATA[Метки]]></string>
 	<string name="_adm_lmi_cpt_latest"><![CDATA[Новые]]></string>
 	<string name="_adm_lmi_cpt_levels"><![CDATA[Уровни]]></string>
@@ -1128,7 +1128,7 @@
         <string name="_adm_lmi_cpt_providers"><![CDATA[Поставщики]]></string>
 	<string name="_adm_lmi_cpt_popular"><![CDATA[Популярные]]></string>
 	<string name="_adm_lmi_cpt_purchases"><![CDATA[Покупки]]></string>
-        <string name="_adm_lmi_cpt_pwa"><![CDATA[PWA]]></string>
+        <string name="_adm_lmi_cpt_pwa"><![CDATA[Веб приложение]]></string>
         <string name="_adm_lmi_cpt_ractions"><![CDATA[Действия]]></string>
         <string name="_adm_lmi_cpt_rlevels"><![CDATA[Уровни]]></string>
 	<string name="_adm_lmi_cpt_sets"><![CDATA[Наборы]]></string>

diff --git a/plugins_public/tailwind/css/tailwind.css b/plugins_public/tailwind/css/tailwind.css
@@ -1250,14 +1250,6 @@
         @apply font-inter;
     }
 
-    .bx-std #bx-std-pcap-menu-popup-help .bx-popup,
-    .bx-std #bx-std-pcap-menu-popup-assistant .bx-popup,
-    .bx-std #bx-std-pcap-menu-popup-actions .bx-popup,
-    .bx-std #bx-std-pcap-menu-popup-account .bx-popup,
-    .bx-std .bx-std-mod-popup-settings-wrapper.bx-popup-applied:not(.bx-popup-chain) .bx-popup {
-        @apply ring-1 ring-gray-800;
-    }
-
     .bx-std .bx-menu-top-center .bx-menu-tab-active .bx-mi-icon {
         @apply ring-4 ring-blue-500/50 ring-offset-2 ring-offset-white;
     }

diff --git a/plugins_public/tailwind/css/tailwind.min.css b/plugins_public/tailwind/css/tailwind.min.css
diff --git a/studio/classes/BxDolStudioModule.php b/studio/classes/BxDolStudioModule.php
@@ -183,15 +183,14 @@ public function activate($sPage, $iWidgetId = 0)
         if($aResult['code'] != 0)
             return $aResult;
 
+        $this->aModule = BxDolModuleQuery::getInstance()->getModuleByName($this->sModule);
+
         $aResult = array('code' => 0, 'message' => _t('_adm_scs_operation_done'));
         if($iWidgetId == 0) {
-            $aResult['content'] = "";
-            if((int)$aModule['enabled'] == 0) {
-                $aResult['content'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('page_content_2_col.html', array(
-                    'page_menu_code' => $this->getPageMenu(),
-                    'page_main_code' => $this->getPageCode()
-                ));
-            }
+            $aResult['content'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('page_content_2_col.html', [
+                'page_menu_code' => $this->getPageMenu(),
+                'page_main_code' => $this->getPageCode()
+            ]);
         }
         else
             $aResult['widget'] = BxTemplStudioFunctions::getInstance()->getWidget($iWidgetId);

diff --git a/studio/classes/BxDolStudioPolyglot.php b/studio/classes/BxDolStudioPolyglot.php
@@ -7,11 +7,10 @@
  * @{
  */
 
-define('BX_DOL_STUDIO_PGT_TYPE_SETTINGS', 'settings');
-define('BX_DOL_STUDIO_PGT_TYPE_KEYS', 'keys');
-define('BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES', 'etemplates');
-define('BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_HF', 'etemplates_hf');
-define('BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_CREATIVE', 'etemplates_creative');
+define('BX_DOL_STUDIO_PGT_TYPE_SETTINGS', 'pgt_settings');
+define('BX_DOL_STUDIO_PGT_TYPE_KEYS', 'pgt_keys');
+define('BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_TEXT', 'etemplates_text');
+define('BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_HTML', 'etemplates_html');
 
 define('BX_DOL_STUDIO_PGT_TYPE_DEFAULT', BX_DOL_STUDIO_PGT_TYPE_SETTINGS);
 
@@ -89,7 +88,10 @@ public function checkAction()
         return $aResult;
     }
 
-    public function submitEtemplatesHf(&$oForm)
+    /**
+     * TODO: Remove (after UNA 14) if new version is working fine.
+     */
+    public function submitEtemplatesHtmlOld(&$oForm)
     {
         $sUnsubscribe = "{unsubscribe}";
         $sHeader = $oForm->getCleanValue('et_hf_header');
@@ -103,10 +105,10 @@ public function submitEtemplatesHf(&$oForm)
         if(!$bResult)
             return $this->getJsResult('_adm_pgt_err_et_hf_save');
 
-        return $this->getJsResult('_adm_pgt_scs_et_hf_save', true, true, BX_DOL_URL_STUDIO . 'polyglot.php?page=' . BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_HF); 
+        return $this->getJsResult('_adm_pgt_scs_et_hf_save', true, true, BX_DOL_URL_STUDIO . 'polyglot.php?page=' . BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_HTML); 
     }
 
-    public function submitEtemplatesCreative(&$oForm)
+    public function submitEtemplatesHtml(&$oForm)
     {
         $sUnsubscribe = "{unsubscribe}";
         $sContent = $oForm->getCleanValue('content');
@@ -121,7 +123,7 @@ public function submitEtemplatesCreative(&$oForm)
         if(!$bResult)
             return $this->getJsResult('_adm_pgt_err_et_hf_save');
 
-        return $this->getJsResult('_adm_pgt_scs_et_hf_save', true, true, BX_DOL_URL_STUDIO . 'polyglot.php?page=' . BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_CREATIVE); 
+        return $this->getJsResult('_adm_pgt_scs_et_hf_save', true, true, BX_DOL_URL_STUDIO . 'polyglot.php?page=' . BX_DOL_STUDIO_PGT_TYPE_ETEMPLATES_HTML); 
     }
 }
 

diff --git a/studio/js/module.js b/studio/js/module.js
@@ -43,27 +43,23 @@ BxDolStudioModule.prototype.activate = function(oCheckbox, sName, iWidgetId) {
         this.sActionsUrl, aParams, function(oData) {
             processJsonData(oData);
 
-            if(oData.code != 0) {
-                $('.bx-popup-applied:visible').dolPopupHide();
+            $('.bx-popup-applied:visible').dolPopupHide();
 
+            if(oData.code != 0) {
                 $(oCheckbox).attr('checked', 'checked').trigger('enable');
                 return;
             }
 
             if(iWidgetId != 0 && oData.widget.length > 0) {
-                $('.bx-popup-applied:visible').dolPopupHide();
-
                 $('#bx-std-widget-' + iWidgetId).replaceWith(oData.widget);
                 oBxDolStudioLauncher.enableJitter();
                 return;
             }
 
             var oContent = $('#bx-std-page-columns');
             if(oData.content.length > 0)
-                oContent.html(oData.content).bx_anim('show', $this.sAnimationEffect, $this.iAnimationSpeed);
-            else
                 oContent.bx_anim('hide', $this.sAnimationEffect, $this.iAnimationSpeed, function() {
-                    $(this).html(oData.content);
+                    $(this).html(oData.content).bx_anim('show', $this.sAnimationEffect, 'fast');
                 });
         },
         'json'

diff --git a/studio/template/css/launcher.css b/studio/template/css/launcher.css
@@ -200,11 +200,6 @@ div.bx-std-widget-action {
     box-sizing: content-box;
 
     margin-top: 0.25rem;
-
-    border: 2px solid #000000;
-    border-radius: 16px;
-
-    background-color: rgba(229, 231, 235, 1);
 }
 div.bx-std-widget-action:first-child {
     margin-top: 0;
@@ -272,7 +267,7 @@ div.bx-std-widget-caption-jitter {
 }
 div.bx-std-widget-caption,
 div.bx-std-widget-caption a {
-    color: rgb(156 163 175);
+    color: rgba(0, 0, 0, 0.5);
 }