Ticket #4674 - Studio: Launcher.

install/sql/system.sql

@@ -383,7 +383,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 (@iCategoryId, 'sys_std_show_header_center', '_adm_stg_cpt_option_sys_std_show_header_center', 'on', 'checkbox', '', '', '', '', 271),
 (@iCategoryId, 'sys_std_show_header_right', '_adm_stg_cpt_option_sys_std_show_header_right', 'on', 'checkbox', '', '', '', '', 272),
 (@iCategoryId, 'sys_std_show_header_right_search', '_adm_stg_cpt_option_sys_std_show_header_right_search', 'on', 'checkbox', '', '', '', '', 275),
-(@iCategoryId, 'sys_std_show_header_right_site', '_adm_stg_cpt_option_sys_std_show_header_right_site', '', 'checkbox', '', '', '', '', 276),
+(@iCategoryId, 'sys_std_show_header_right_site', '_adm_stg_cpt_option_sys_std_show_header_right_site', 'on', 'checkbox', '', '', '', '', 276),
 (@iCategoryId, 'sys_std_show_launcher_left', '_adm_stg_cpt_option_sys_std_show_launcher_left', '', 'checkbox', '', '', '', '', 280);
 
 --
@@ -4877,7 +4877,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- studio: account menu
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES
 ('sys_studio_account_popup', 'system', 'account', '_sys_menu_item_title_system_sa_account', '_sys_menu_item_title_sa_account', '{member_url}', '', '', 'ami-account.svg', '', 2147483647, 1, 0, 0, 1),
-('sys_studio_account_popup', 'system', 'site', '_sys_menu_item_title_system_sa_site', '_sys_menu_item_title_sa_site', '{url_root}', '', '', 'ami-site.svg', '', 2147483647, 1, 0, 0, 2),
+('sys_studio_account_popup', 'system', 'site', '_sys_menu_item_title_system_sa_site', '_sys_menu_item_title_sa_site', '{url_root}', '', '', 'ami-site.svg', '', 2147483647, 0, 0, 0, 2),
 ('sys_studio_account_popup', 'system', 'edit', '_sys_menu_item_title_system_sa_edit', '_sys_menu_item_title_sa_edit', 'javascript:void(0)', '{js_object}.clickEdit(this);', '', 'ami-edit.svg', '', 2147483647, 1, 0, 0, 3),
 ('sys_studio_account_popup', 'system', 'language', '_sys_menu_item_title_system_sa_language', '_sys_menu_item_title_sa_language', 'javascript:void(0)', 'bx_menu_popup(''sys_switch_language_popup'', window);', '', 'ami-language.svg', '', 2147483647, 1, 0, 0, 4),
 ('sys_studio_account_popup', 'system', 'logout', '_sys_menu_item_title_system_sa_logout', '_sys_menu_item_title_sa_logout', '{url_root}logout.php', '{js_object}.clickLogout(this);', '', 'ami-logout.svg', '', 2147483647, 1, 0, 0, 5);

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -369,24 +369,25 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
 
     public function serviceProfilesSearch ($sTerm, $iLimit)
     {
-		$aRet = array();
+        $aRet = array();
 
         $a = $this->_oDb->searchByTerm($sTerm, $iLimit);
         foreach ($a as $r) {
             $oProfile = BxDolProfile::getInstance($r['profile_id']);
 
-            if (bx_is_api()){
-                $aRet[] = $oProfile->getUnitAPI(0, ['template' => 'unit_wo_info']);
+            if (bx_is_api()) {
+                $aData = $oProfile->getUnitAPI(0, ['template' => 'unit_wo_info']);
+                $aRet[] = $aData['author_data'];
             }
             else{
-            $aRet[] = array (
-            	'label' => $this->serviceProfileName($r['content_id']), 
-                'value' => $r['profile_id'], 
-                'url' => $oProfile->getUrl(),
-            	'thumb' => $oProfile->getThumb(),
-                'unit' => $oProfile->getUnit(0, ['template' => ['name' => 'unit_wo_info', 'size' => 'icon']])
-            );
-        }
+                $aRet[] = array (
+                    'label' => $this->serviceProfileName($r['content_id']), 
+                    'value' => $r['profile_id'], 
+                    'url' => $oProfile->getUrl(),
+                    'thumb' => $oProfile->getThumb(),
+                    'unit' => $oProfile->getUnit(0, ['template' => ['name' => 'unit_wo_info', 'size' => 'icon']])
+                );
+            }
         }
 
         return $aRet;

modules/boonex/english/data/langs/system/en.xml

@@ -1884,7 +1884,7 @@
 	<string name="_adm_strg_err_width"><![CDATA[Width is essential. Please, fill in this field.]]></string>
 	<string name="_adm_strg_txt_height"><![CDATA[Height]]></string>
 	<string name="_adm_strg_err_height"><![CDATA[Height is essential. Please, fill in this field.]]></string>
-        <string name="_adm_tmi_cpt_account"><![CDATA[Account]]></string>
+        <string name="_adm_tmi_cpt_account"><![CDATA[Menu]]></string>
 	<string name="_adm_tmi_cpt_site"><![CDATA[Go To Site]]></string>
         <string name="_adm_tmi_cpt_search"><![CDATA[Search...]]></string>
 	<string name="_adm_tmi_cpt_tour"><![CDATA[Tour]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1851,7 +1851,7 @@
 	<string name="_adm_strg_err_width"><![CDATA[Нужно указать ширину. Пожалуйста, заполните это поле.]]></string>
 	<string name="_adm_strg_txt_height"><![CDATA[Высота]]></string>
 	<string name="_adm_strg_err_height"><![CDATA[Нужно указать высоту. Пожалуйста, заполните это поле.]]></string>
-        <string name="_adm_tmi_cpt_account"><![CDATA[Учетная запись]]></string>
+        <string name="_adm_tmi_cpt_account"><![CDATA[Меню]]></string>
 	<string name="_adm_tmi_cpt_site"><![CDATA[Перейти на сайт]]></string>
         <string name="_adm_tmi_cpt_search"><![CDATA[Искать...]]></string>
 	<string name="_adm_tmi_cpt_tour"><![CDATA[Инструкции]]></string>

plugins_public/tailwind/css/tailwind.css

@@ -1217,6 +1217,10 @@
         @apply text-gray-300 dark:text-gray-700;
     }
 
+    /* Studio */
+    .bx-menu-top-center .bx-menu-tab-active .bx-mi-icon {
+        @apply ring ring-blue-600 ring-offset-2 ring-offset-black;
+    }
 
     /* Modules: Timeline */
     .bx-artificer .group\/item:hover .bx-tl-item-text .bx-tl-content.bx-tl-overflow .bx-tl-content-overflow {

studio/template/css/menu_top.css

@@ -127,8 +127,7 @@ div.bx-std-menu-top .bx-menu-top-center li.bx-menu-item-static + li.bx-menu-item
 }
 */
 
-div.bx-std-menu-top .bx-menu-top-center li.bx-menu-tab-active a,
-div.bx-std-menu-top .bx-menu-top-center li a:hover {
+div.bx-std-menu-top .bx-menu-top-center li.bx-menu-tab-active a {
     border-color: rgba(37, 99, 235, 0.8);
 }
 
@@ -136,11 +135,12 @@ div.bx-std-menu-top .bx-menu-top-center li a {
     display: block;
     box-sizing: content-box;
 
-    width: 3.25rem;
-    height: 3.25rem;
-    
-    border: 0.25rem solid transparent;
+    width: 3rem;
+    height: 3rem;
+}
+div.bx-std-menu-top .bx-menu-top-center li .bx-mi-icon {
     border-radius: 0.625rem;
+    overflow: hidden;
 }
 div.bx-std-menu-top .bx-menu-top-center li img,
 div.bx-std-menu-top .bx-menu-top-center li .sys-icon {
@@ -151,8 +151,6 @@ div.bx-std-menu-top .bx-menu-top-center li .sys-icon {
     height: 3rem;
 
     margin: 0;
-
-    border: 0.125rem solid transparent;
 }
 
 div.bx-std-menu-top .bx-menu-top-center li .sys-icon {

studio/template/images/icons/ami-site.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.7">
+<path d="M8 20.064V11C8 9.895 8.895 9 10 9H20.487" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14H20.776" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.0049 11.49C11.0019 11.49 10.9999 11.492 10.9999 11.495C10.9999 11.498 11.0019 11.5 11.0049 11.5C11.0079 11.5 11.0099 11.498 11.0099 11.495C11.0099 11.492 11.0079 11.49 11.0049 11.49" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5479 11.49C13.5449 11.49 13.5429 11.492 13.5429 11.495C13.5429 11.498 13.5449 11.5 13.5479 11.5C13.5509 11.5 13.5529 11.498 13.5529 11.495C13.5529 11.492 13.5509 11.49 13.5479 11.49" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 21V21C16.971 21 21 16.971 21 12V12C21 7.029 16.971 3 12 3V3C7.029 3 3 7.029 3 12V12C3 16.971 7.029 21 12 21Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.0879 11.49C16.0849 11.49 16.0829 11.492 16.0829 11.495C16.0829 11.498 16.0849 11.5 16.0879 11.5C16.0909 11.5 16.0929 11.498 16.0929 11.495C16.0929 11.492 16.0899 11.49 16.0879 11.49" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>

studio/template/images/icons/tmi-actions.svg

@@ -1,13 +1,8 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect width="48" height="48" rx="24" fill="#374151"/>
-<g clip-path="url(#clip0_57_2065)">
-<path d="M20 28L28 20" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.6667 16L23.2841 15.2853C24.5345 14.0351 26.2303 13.3328 27.9986 13.3329C29.7668 13.333 31.4625 14.0356 32.7127 15.286C33.963 16.5364 34.6653 18.2322 34.6652 20.0005C34.665 21.7687 33.9625 23.4644 32.7121 24.7147L32.0001 25.3333" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M25.3334 32L24.8041 32.712C23.5391 33.9629 21.8318 34.6645 20.0528 34.6645C18.2737 34.6645 16.5664 33.9629 15.3014 32.712C14.6779 32.0955 14.1829 31.3614 13.8451 30.5522C13.5072 29.743 13.3333 28.8749 13.3333 27.998C13.3333 27.1211 13.5072 26.253 13.8451 25.4438C14.1829 24.6346 14.6779 23.9005 15.3014 23.284L16.0001 22.6667" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_57_2065">
-<rect width="32" height="32" fill="white" transform="translate(8 8)"/>
-</clipPath>
-</defs>
+<path d="M11.3333 24C11.3333 18.0289 11.3333 15.0433 13.1882 13.1883C15.0432 11.3333 18.0288 11.3333 23.9999 11.3333C29.971 11.3333 32.9566 11.3333 34.8117 13.1883C36.6666 15.0433 36.6666 18.0289 36.6666 24C36.6666 29.9711 36.6666 32.9567 34.8117 34.8117C32.9566 36.6667 29.971 36.6667 23.9999 36.6667C18.0288 36.6667 15.0432 36.6667 13.1882 34.8117C11.3333 32.9567 11.3333 29.9711 11.3333 24Z" stroke="#E5E7EB" stroke-width="2" stroke-linejoin="round"/>
+<path d="M19.3333 21.3333C18.2287 21.3333 17.3333 20.4379 17.3333 19.3333C17.3333 18.2288 18.2287 17.3333 19.3333 17.3333C20.4378 17.3333 21.3333 18.2288 21.3333 19.3333C21.3333 20.4379 20.4378 21.3333 19.3333 21.3333Z" stroke="#E5E7EB" stroke-width="2"/>
+<path d="M28.6667 30.6667C29.7713 30.6667 30.6667 29.7712 30.6667 28.6667C30.6667 27.5621 29.7713 26.6667 28.6667 26.6667C27.5622 26.6667 26.6667 27.5621 26.6667 28.6667C26.6667 29.7712 27.5622 30.6667 28.6667 30.6667Z" stroke="#E5E7EB" stroke-width="2"/>
+<path d="M21.3333 19.3333H30.6666" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round"/>
+<path d="M26.6666 28.6667H17.3333" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round"/>
 </svg>

studio/template/images/icons/tmi-search.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_57_1633)">
+<path d="M4 13.3333C4 14.559 4.24141 15.7727 4.71046 16.905C5.1795 18.0374 5.86699 19.0663 6.73367 19.933C7.60035 20.7997 8.62925 21.4872 9.76162 21.9562C10.894 22.4253 12.1077 22.6667 13.3333 22.6667C14.559 22.6667 15.7727 22.4253 16.905 21.9562C18.0374 21.4872 19.0663 20.7997 19.933 19.933C20.7997 19.0663 21.4872 18.0374 21.9562 16.905C22.4253 15.7727 22.6667 14.559 22.6667 13.3333C22.6667 12.1077 22.4253 10.894 21.9562 9.76162C21.4872 8.62925 20.7997 7.60035 19.933 6.73367C19.0663 5.86699 18.0374 5.1795 16.905 4.71046C15.7727 4.24141 14.559 4 13.3333 4C12.1077 4 10.894 4.24141 9.76162 4.71046C8.62925 5.1795 7.60035 5.86699 6.73367 6.73367C5.86699 7.60035 5.1795 8.62925 4.71046 9.76162C4.24141 10.894 4 12.1077 4 13.3333Z" stroke="#D1D5DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28 28L20 20" stroke="#D1D5DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_57_1633">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

studio/template/menu_top_center.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-top-center bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items><li id="bx-menu-item-__name__" class="__class__ bx-def-box-sizing __class_add__">
         <a href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
-            <div class="bx-mi-icon">
+            <div class="bx-mi-icon hover:ring hover:ring-blue-600 hover:ring-offset-2 hover:ring-offset-black">
                 <bx_include_auto:menu_icon.html />
             </div>
         </a>

studio/template/scripts/BxBaseStudioWidget.php

@@ -57,13 +57,6 @@ class BxBaseStudioWidget extends BxDolStudioWidget
 
         //--- Menu Right ---//
         $aItemsRight = [];
-        if($this->_bShowHeaderRightSite)
-            $aItemsRight['site'] = [
-                'name' => 'site',
-                'icon' => 'tmi-site.svg',
-                'link' => '{url_root}',
-                'title' => '_adm_tmi_cpt_site'
-            ];
 
         if($bHelp)
             $aItemsRight['help'] = array(
@@ -81,6 +74,14 @@ class BxBaseStudioWidget extends BxDolStudioWidget
                 'title' => '_adm_txt_show_actions'
             );
 
+        if($this->_bShowHeaderRightSite)
+            $aItemsRight['site'] = [
+                'name' => 'site',
+                'icon' => 'tmi-site.svg',
+                'link' => '{url_root}',
+                'title' => '_adm_tmi_cpt_site'
+            ];
+
         $aItemsRight['account'] = array(
             'name' => 'account',
             'icon' => 'tmi-account.svg',

studio/template/scripts/BxBaseStudioWidgets.php

@@ -73,12 +73,6 @@ class BxBaseStudioWidgets extends BxDolStudioWidgets
         $aItemsRight = array(
             'template' => 'menu_top_toolbar.html',
             'menu_items' => array(
-                'site' => array(
-                    'name' => 'site',
-                    'icon' => 'tmi-site.svg',
-                    'link' => '{url_root}',
-                    'title' => '_adm_tmi_cpt_site'
-                ),
                 'tour' => array(
                     'name' => 'tour',
                     'icon' => 'tmi-help.svg',
@@ -86,6 +80,12 @@ class BxBaseStudioWidgets extends BxDolStudioWidgets
                     'onclick' => 'glTour.start()',
                     'title' => '_adm_tmi_cpt_tour'
                 ),
+                'site' => array(
+                    'name' => 'site',
+                    'icon' => 'tmi-site.svg',
+                    'link' => '{url_root}',
+                    'title' => '_adm_tmi_cpt_site'
+                ),
                 'account' => array(
                     'name' => 'account',
                     'icon' => 'tmi-account.svg',