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

unacms · Dec 24, 2024 · 81cb0e7 · 81cb0e7
1 parent 0129571
commit 81cb0e7
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 49 deletions.
diff --git a/modules/boonex/ads/template/category_form.html b/modules/boonex/ads/template/category_form.html
@@ -1,4 +1,4 @@
-<div class="bx-ads-category-form bx-def-color-bg-block">
+<div class="bx-ads-category-form">
     <div class="bx-ads-category-form-cnt">
         __form__
         <script language="javascript">

diff --git a/modules/boonex/english/data/langs/system/en.xml b/modules/boonex/english/data/langs/system/en.xml
@@ -1132,6 +1132,7 @@
     <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>

diff --git a/modules/boonex/forum/template/category_visible_for.html b/modules/boonex/forum/template/category_visible_for.html
@@ -1,4 +1,4 @@
-<div class="bx-forum-visible-for bx-def-color-bg-block">
+<div class="bx-forum-visible-for">
     <div class="bx-forum-visible-for-cnt">
         __form__
         <script language="javascript">

diff --git a/modules/boonex/help_tours/classes/BxHelpToursGridItems.php b/modules/boonex/help_tours/classes/BxHelpToursGridItems.php
@@ -11,15 +11,18 @@
 
 class BxHelpToursGridItems extends BxTemplGrid
 {
+    protected $_sModule;
+    protected $_oModule;
+
     protected $_iTourId;
     protected $_aTourPageBlocks;
 
     public function __construct ($aOptions, $oTemplate = false)
     {
-        $this->MODULE = 'bx_help_tours';
-    	$this->_oModule = BxDolModule::getInstance($this->MODULE);
+        $this->_sModule = 'bx_help_tours';
+    	$this->_oModule = BxDolModule::getInstance($this->_sModule);
     	if(!$oTemplate)
-			$oTemplate = $this->_oModule->_oTemplate;
+            $oTemplate = $this->_oModule->_oTemplate;
 
     	parent::__construct ($aOptions, $oTemplate);
 
@@ -84,7 +87,7 @@ private function getAddEditForm($iEntry) {
             echoJson($aRes);
         } else {
             $s = '
-                <div class="bx-def-color-bg-block">' . $oForm->getCode(true) . '</div>                
+                <div>' . $oForm->getCode(true) . '</div>                
                 <script>                    
                     $(document).ready(function () {
                         $("#'.$oForm->aFormAttrs['id'].'").ajaxForm({
@@ -361,7 +364,7 @@ function getCode($isDisplayHeader = true)
             'js_object' => $this->getJsObject(),
             'grid_object' => $this->_sObject,
             'tour' => $this->_iTourId,
-            'page_url' => BX_DOL_URL_STUDIO.'module.php?name='.$this->MODULE.'&page=items',
+            'page_url' => BX_DOL_URL_STUDIO.'module.php?name=' . $this->_sModule . '&page=items',
         ]);
     }
 }

diff --git a/modules/boonex/help_tours/classes/BxHelpToursGridTours.php b/modules/boonex/help_tours/classes/BxHelpToursGridTours.php
@@ -13,12 +13,15 @@
 
 class BxHelpToursGridTours extends BxTemplGrid
 {
+    protected $_sModule;
+    protected $_oModule;
+
     public function __construct ($aOptions, $oTemplate = false)
     {
-        $this->MODULE = 'bx_help_tours';
-    	$this->_oModule = BxDolModule::getInstance($this->MODULE);
+        $this->_sModule = 'bx_help_tours';
+    	$this->_oModule = BxDolModule::getInstance($this->_sModule);
     	if(!$oTemplate)
-			$oTemplate = $this->_oModule->_oTemplate;
+            $oTemplate = $this->_oModule->_oTemplate;
 
         parent::__construct ($aOptions, $oTemplate);
     }
@@ -88,7 +91,7 @@ private function getAddEditForm($iEntry) {
             echoJson($aRes);
         } else {
             $s = '
-                <div class="bx-def-color-bg-block">' . $oForm->getCode(true) . '</div>                
+                <div>' . $oForm->getCode(true) . '</div>                
                 <script>                    
                     $(document).ready(function () {
                         $("#'.$oForm->aFormAttrs['id'].'").ajaxForm({
@@ -140,7 +143,7 @@ public function performActionEditItems()
         }
 
         echoJson(array(
-            'redirect' => BX_DOL_URL_STUDIO.'module.php?name='.$this->MODULE.'&tour='.$iTourId.'&page=items',
+            'redirect' => BX_DOL_URL_STUDIO.'module.php?name=' . $this->_sModule . '&tour=' . $iTourId . '&page=items',
         ));
     }
 

diff --git a/modules/boonex/oauth2/classes/BxOAuthStudioPage.php b/modules/boonex/oauth2/classes/BxOAuthStudioPage.php
@@ -19,11 +19,10 @@ function __construct($sModule, $mixedPageName, $sPage = "")
 
         $this->oModule = BxDolModule::getInstance('bx_oauth');
 
-        $this->aMenuItems = array(
-            'settings' => array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
-            'keys' => array('name' => 'keys', 'icon' => 'key', 'title' => '_adm_lmi_cpt_keys'),
-            'help' => array('name' => 'help', 'icon' => 'question', 'title' => '_bx_oauth_help'),
-        );
+        $this->aMenuItems = array_merge($this->aMenuItems, [
+            'keys' => ['name' => 'keys', 'icon' => 'key', 'title' => '_bx_oauth_lmi_cpt_keys'],
+            'help' => ['name' => 'help', 'icon' => 'question', 'title' => '_bx_oauth_help']
+        ]);
     }
 
     function getKeys ()

diff --git a/modules/boonex/oauth2/install/langs/en.xml b/modules/boonex/oauth2/install/langs/en.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
-	<string name="_sys_module_oauth2"><![CDATA[OAuth2 Server]]></string>
-	<string name="_bx_oauth_administration"><![CDATA[OAuth2 Server]]></string>
-	<string name="_bx_oauth"><![CDATA[OAuth2 Server]]></string>
-	<string name="_bx_oauth_help"><![CDATA[Information]]></string>
-	<string name="_bx_oauth_help_text"><![CDATA[Add clients to allow them to use profile information from this site on client's sites. <br />
+    <string name="_sys_module_oauth2"><![CDATA[OAuth2 Server]]></string>
+    <string name="_bx_oauth_administration"><![CDATA[OAuth2 Server]]></string>
+    <string name="_bx_oauth"><![CDATA[OAuth2 Server]]></string>
+    <string name="_bx_oauth_help"><![CDATA[Information]]></string>
+    <string name="_bx_oauth_help_text"><![CDATA[Add clients to allow them to use profile information from this site on client's sites. <br />
 Client's sites must have "UNA Connect" module installed. <br />
 Specify the following "Main UNA Site URL" on the client sites:<br />
 <strong>{0}</strong>]]></string>
     <string name="_bx_oauth_client_url"><![CDATA[Client Site URL]]></string>
-	<string name="_bx_oauth_client_id"><![CDATA[Client Key]]></string>
-	<string name="_bx_oauth_client_secret"><![CDATA[Client Secret]]></string>
-	<string name="_bx_oauth_add"><![CDATA[Add new client]]></string>
-	<string name="_bx_oauth_clients"><![CDATA[OAuth2 clients]]></string>
-	<string name="_bx_oauth_authorization"><![CDATA[Authorization]]></string>
+    <string name="_bx_oauth_client_id"><![CDATA[Client Key]]></string>
+    <string name="_bx_oauth_client_secret"><![CDATA[Client Secret]]></string>
+    <string name="_bx_oauth_add"><![CDATA[Add new client]]></string>
+    <string name="_bx_oauth_clients"><![CDATA[OAuth2 clients]]></string>
+    <string name="_bx_oauth_authorization"><![CDATA[Authorization]]></string>
     <string name="_bx_oauth_authorize_app"><![CDATA[Choose which profile to connect with "{0}":]]></string>
     <string name="_bx_oauth_form_valid_url"><![CDATA[Valid URL is required]]></string>
     <string name="_bx_oauth_url"><![CDATA[URL]]></string>
     <string name="_bx_oauth_connect"><![CDATA[Connect]]></string>
 
-	<string name="_bx_oauth_adm_stg_cpt_type"><![CDATA[OAuth2 Server]]></string>
-	<string name="_bx_oauth_adm_stg_cpt_category_general"><![CDATA[General]]></string>
-	<string name="_bx_oauth_adm_stg_opt_refresh_token_lifetime"><![CDATA[Refresh token lifetime (in seconds)]]></string>
-	<string name="_bx_oauth_adm_stg_opt_always_issue_new_refresh_token"><![CDATA[Always issue new refresh token]]></string>
+    <string name="_bx_oauth_lmi_cpt_keys"><![CDATA[Keys]]></string>
+
+    <string name="_bx_oauth_adm_stg_cpt_type"><![CDATA[OAuth2 Server]]></string>
+    <string name="_bx_oauth_adm_stg_cpt_category_general"><![CDATA[General]]></string>
+    <string name="_bx_oauth_adm_stg_opt_refresh_token_lifetime"><![CDATA[Refresh token lifetime (in seconds)]]></string>
+    <string name="_bx_oauth_adm_stg_opt_always_issue_new_refresh_token"><![CDATA[Always issue new refresh token]]></string>
 </resources>
diff --git a/modules/boonex/russian/data/langs/bx_oauth/ru.xml b/modules/boonex/russian/data/langs/bx_oauth/ru.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
-	<string name="_sys_module_oauth2"><![CDATA[OAuth2 сервер]]></string>
-	<string name="_bx_oauth_administration"><![CDATA[OAuth2 сервер]]></string>
-	<string name="_bx_oauth"><![CDATA[OAuth2 сервер]]></string>
-	<string name="_bx_oauth_help"><![CDATA[Информация]]></string>
-	<string name="_bx_oauth_help_text"><![CDATA[Что-бы использовать информацию из профайла на клиентских сайтах, нужно добавить новый клиентский сайт. <br />
+    <string name="_sys_module_oauth2"><![CDATA[OAuth2 сервер]]></string>
+    <string name="_bx_oauth_administration"><![CDATA[OAuth2 сервер]]></string>
+    <string name="_bx_oauth"><![CDATA[OAuth2 сервер]]></string>
+    <string name="_bx_oauth_help"><![CDATA[Информация]]></string>
+    <string name="_bx_oauth_help_text"><![CDATA[Что-бы использовать информацию из профайла на клиентских сайтах, нужно добавить новый клиентский сайт. <br />
 На клиентском сайте должен быть установлен "UNA Connect" модуль.<br />
 Нужно указать следующий "URL главного UNA сайта" на клиентских сайтах:<br />
 <strong>{0}</strong>]]></string>
     <string name="_bx_oauth_client_url"><![CDATA[Ссылка на клиентский сайт]]></string>
-	<string name="_bx_oauth_client_id"><![CDATA[Ключ клиента]]></string>
-	<string name="_bx_oauth_client_secret"><![CDATA[Секретный код]]></string>
-	<string name="_bx_oauth_add"><![CDATA[Добавить]]></string>
-	<string name="_bx_oauth_clients"><![CDATA[Клиенты OAuth2]]></string>
-	<string name="_bx_oauth_authorization"><![CDATA[Авторизация]]></string>
+    <string name="_bx_oauth_client_id"><![CDATA[Ключ клиента]]></string>
+    <string name="_bx_oauth_client_secret"><![CDATA[Секретный код]]></string>
+    <string name="_bx_oauth_add"><![CDATA[Добавить]]></string>
+    <string name="_bx_oauth_clients"><![CDATA[Клиенты OAuth2]]></string>
+    <string name="_bx_oauth_authorization"><![CDATA[Авторизация]]></string>
     <string name="_bx_oauth_authorize_app"><![CDATA[Выбери профайл, для использования на "{0}":]]></string>
     <string name="_bx_oauth_form_valid_url"><![CDATA[Нужно ввести правильный URL]]></string>
     <string name="_bx_oauth_url"><![CDATA[URL]]></string>
     <string name="_bx_oauth_connect"><![CDATA[Связать]]></string>
 
-	<string name="_bx_oauth_adm_stg_cpt_type"><![CDATA[OAuth2 сервер]]></string>
-	<string name="_bx_oauth_adm_stg_cpt_category_general"><![CDATA[Общие]]></string>
-	<string name="_bx_oauth_adm_stg_opt_refresh_token_lifetime"><![CDATA[Срок действия токена обновления (в секундах)]]></string>
-	<string name="_bx_oauth_adm_stg_opt_always_issue_new_refresh_token"><![CDATA[Всегда создавать новый токен обновления]]></string>
+    <string name="_bx_oauth_lmi_cpt_keys"><![CDATA[Ключи]]></string>
+
+    <string name="_bx_oauth_adm_stg_cpt_type"><![CDATA[OAuth2 сервер]]></string>
+    <string name="_bx_oauth_adm_stg_cpt_category_general"><![CDATA[Общие]]></string>
+    <string name="_bx_oauth_adm_stg_opt_refresh_token_lifetime"><![CDATA[Срок действия токена обновления (в секундах)]]></string>
+    <string name="_bx_oauth_adm_stg_opt_always_issue_new_refresh_token"><![CDATA[Всегда создавать новый токен обновления]]></string>
 </resources>
diff --git a/modules/boonex/russian/data/langs/system/ru.xml b/modules/boonex/russian/data/langs/system/ru.xml
@@ -1116,6 +1116,7 @@
 	<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>

diff --git a/plugins_public/tailwind/css/tailwind.css b/plugins_public/tailwind/css/tailwind.css
@@ -839,11 +839,14 @@
     }
 
     /* Common elements: Forms: Checkbox/Radio Set Input */
-    .bx-std .bx-form-input-wrapper-checkbox_set,
-    .bx-std .bx-form-input-wrapper-radio_set,
     .bx-artificer .bx-form-input-wrapper-checkbox_set,
     .bx-artificer .bx-form-input-wrapper-radio_set {
         @apply relative block w-full py-2 px-3;
+    }
+    .bx-std .bx-form-input-checkbox_set,
+    .bx-std .bx-form-input-radio_set,
+    .bx-artificer .bx-form-input-wrapper-checkbox_set,
+    .bx-artificer .bx-form-input-wrapper-radio_set {
         @apply bg-gray-50 dark:bg-gray-900/50 focus:bg-white dark:focus:bg-gray-900;
         @apply border border-gray-300 dark:border-gray-700 focus:border-blue-500 dark:focus:border-blue-500 focus:border-opacity-70 focus:ring-2 focus:ring-blue-500 focus:ring-opacity-20 focus:outline-none;
         @apply leading-6 text-base font-medium text-gray-700 dark:text-gray-300 focus:text-gray-900 dark:focus:text-gray-100;

diff --git a/plugins_public/tailwind/css/tailwind.min.css b/plugins_public/tailwind/css/tailwind.min.css
diff --git a/studio/template/scripts/BxBaseStudioAudit.php b/studio/template/scripts/BxBaseStudioAudit.php
@@ -55,7 +55,7 @@ function getPageMenu($aMenu = [], $aMarkers = [])
         return parent::getPageMenu($aMenu);
     }
 
-    protected function getGeneral()
+    protected function getReports()
     {
         return $this->getGrid();
     }