Ticket #3629 - Artificer template (Part 2)

modules/boonex/artificer/data/template/system/css/general.css

@@ -39,7 +39,6 @@ import url(../../../../../../../template/css/general.css);
 .bx-menu-profile-stats li.bx-psmi-show-less {
     text-transform: uppercase;
     font-size: 0.875rem;
-    color: rgba(0, 0, 0, 0.5);
 }
 
 .bx-menu-profile-stats  li.bx-psmi-show-more:hover,

modules/boonex/artificer/data/template/system/menu_profile_followings.html

@@ -2,7 +2,7 @@
     <bx_repeat:menu_items>
         <li class="bx-menu-item bx-menu-item-__name__ __class_add__ text-sm font-medium">
             <div class="bx-menu-item-cnt">
-                <div class="bx-menu-item-link flex items-center justify-between p-2 text-gray-600 dark:text-gray-300 dark:hover:text-gray-100 hover:bg-gray-900/5 dark:hover:bg-gray-700 hover:text-gray-900 rounded-md">
+                <div class="bx-menu-item-link flex items-center justify-between p-2 text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-slate-900/5 dark:hover:bg-slate-700 rounded-md">
                     <a class="flex items-center w-full uppercase" href="__link__" onclick="__onclick__"__attrs__>
                         <span class="bx-menu-item-icon flex items-center justify-center h-6 w-6 leading-6 text-base">
                             <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>

modules/boonex/artificer/data/template/system/menu_profile_followings_subitems.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-item-subitems bx-menu-pf-subitems bx-menu-ver">
     <bx_repeat:menu_items>
         <li class="bx-menu-subitem bx-menu-subitem-__name__ __class_add__ text-sm font-medium">
-            <div class="bx-menu-item-cnt flex items-center pl-4 pr-2 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 rounded-md">
+            <div class="bx-menu-item-cnt flex items-center pl-4 pr-2 py-2 text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-slate-900/5 dark:hover:bg-slate-700 rounded-md">
                 <a class="flex items-center" href="__link__" onclick="__onclick__"__attrs__>
                     <span class="bx-menu-item-icon flex items-center justify-center h-6 w-6 mr-2 leading-6 text-xl">
                         <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>

modules/boonex/artificer/data/template/system/menu_profile_stats.html

@@ -1,6 +1,6 @@
 <ul class="bx-menu-profile-stats bx-menu-ver bx-menu-object-__object__">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item-__name__ __class_add__ group text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-gray-900/5 dark:hover:bg-gray-700 text-sm font-medium rounded-md">
+        <li class="bx-menu-item-__name__ __class_add__ group text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-slate-900/5 dark:hover:bg-slate-700 text-sm font-medium rounded-md">
             <div class="bx-menu-item-cnt flex items-center justify-between p-2">
                 <a class="flex flex-1 items-center truncate" href="__link__" onclick="__onclick__"__attrs__>
                     <span class="bx-menu-item-icon flex items-center justify-center h-6 w-6 leading-6 text-base">
@@ -11,7 +11,7 @@
                     <span class="bx-menu-item-title ml-2 truncate" sidebar-toggle-item>__title__</span>
                 </a>
                 <bx_if:addon>
-                    <div class="bx-menu-addon inline-block ml-auto bg-gray-200 dark:bg-gray-800 group-hover:bg-gray-300 dark:group-hover:bg-gray-700 text-gray-600 dark:text-gray-300 text-xs rounded-full" sidebar-toggle-item>
+                    <div class="bx-menu-addon inline-block ml-auto bg-blue-200 text-blue-800 text-xs rounded-full" sidebar-toggle-item>
                         <div class="bx-menu-addon-cnt py-0.5 px-2">__addon__</div>
                     </div>
                 </bx_if:addon>

modules/boonex/artificer/data/template/system/popup_box.html

@@ -2,7 +2,7 @@
     <div class="bx-popup-gap mx-4 my-px">
         <div class="bx-popup bx-popup-box bx-popup-width relative ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 rounded-md shadow">
             <div class="bx-popup-header flex items-center justify-between p-3 md:p-4 lg:p-6">
-                <h2 id="__id___title">__title__</h2>
+                <div class="text-lg lg:text-xl leading-6 font-semibold text-gray-800 dark:text-gray-100" id="__id___title">__title__</div>
                 <div class="bx-popup-close-wrapper relative">
                     <a href="javascript:void(0);" class="bx-popup-element-close flex items-center justify-center w-6 h-6 text-base"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
                 </div>

modules/boonex/artificer/data/template/system/profile_avatar.html

@@ -2,7 +2,7 @@
     <div class="bx-profile-avatar-cnt relative flex items-center">
         <div class="bx-pa-img absolute">__profile_unit__</div>
         <div class="bx-pa-info w-full" sidebar-toggle-item>
-            <div class="bx-pa-info-cnt flex flex-col justify-center h-10 pl-14 pr-4 box-border">
+            <div class="bx-pa-info-cnt flex flex-col justify-center h-10 pl-12 pr-4 box-border">
                 <div class="bx-pai-line text-gray-600 dark:text-gray-300 text-sm group-hover:text-gray-800 dark:group-hover:text-white font-semibold truncate">
                     <a href="__profile_url__" title="__profile_title_attr__">__profile_title__</a>
                 </div>

modules/boonex/artificer/data/template/system/profile_avatar_switcher.html

@@ -1,4 +1,4 @@
-<div class="bx-profile-avatar-switcher bx-popup-width">
+<div class="bx-profile-avatar-switcher">
     <div class="bx-pas-cnt">
         <div class="bx-pas-list">__profile_switcher__</div>
         <bx_if:multiple_profiles_mode>

modules/boonex/artificer/data/template/system/profile_stats.html

@@ -4,7 +4,7 @@
             <div class="bx-profile-avatar-cnt flex items-center cursor-pointer" onclick="window.location.href='__profile_url__'">
                 <div class="bx-pa-img absolute">__profile_unit__</div>
                 <div class="bx-pa-info w-full">
-                    <div class="bx-pa-info-cnt flex flex-col justify-center h-10 pl-14 box-border">
+                    <div class="bx-pa-info-cnt flex flex-col justify-center h-10 pl-12 box-border">
                         <div class="bx-pai-line text-gray-600 dark:text-gray-300 text-sm group-hover:text-gray-800 dark:group-hover:text-white font-semibold truncate">__profile_title__</div>
                         <div class="bx-pai-line text-green-600 dark:text-green-400 text-xs truncate uppercase tracking-wider font-normal">
                             <div><!--<bx_include_auto:menu_icon.html />--><span>__profile_acl_title__</span></div>

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

@@ -3477,6 +3477,7 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_txt_friends_counter"><![CDATA[Friends: {0}]]></string>
     <string name="_sys_txt_login_invalid_role"><![CDATA[Access denied]]></string>
     <string name="_sys_txt_my_profiles"><![CDATA[Create a new profile]]></string>
+    <string name="_sys_txt_switch_profiles"><![CDATA[Switch to]]></string>
     <string name="_sys_txt_new_picture"><![CDATA[New Picture]]></string>
     <string name="_sys_txt_not_found"><![CDATA[Not found]]></string>
     <string name="_sys_txt_no_picture_uploaded"><![CDATA[No picture uploaded]]></string>

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

@@ -3435,6 +3435,7 @@
     <string name="_sys_txt_friends_counter"><![CDATA[Друзья: {0}]]></string>
     <string name="_sys_txt_login_invalid_role"><![CDATA[Доступ запрещён]]></string>
     <string name="_sys_txt_my_profiles"><![CDATA[Создать новый профайл]]></string>
+    <string name="_sys_txt_switch_profiles"><![CDATA[Переключиться в]]></string>
     <string name="_sys_txt_new_picture"><![CDATA[Новая картинка]]></string>
     <string name="_sys_txt_not_found"><![CDATA[Не найдено]]></string>
     <string name="_sys_txt_no_picture_uploaded"><![CDATA[Картинка не загружена]]></string>

plugins_public/tailwind/css/tailwind.css

@@ -532,8 +532,13 @@
 
     /* Profile Stats menu */
     .bx-artificer .bx-menu-profile-stats.bx-menu-ver li.bx-menu-tab-active {
-        @apply bg-gray-900/[.08] dark:bg-gray-900 ring-1 ring-gray-200 dark:ring-gray-800 text-gray-900 dark:text-white;
+        @apply bg-slate-900/[.08] dark:bg-slate-900 ring-1 ring-gray-200 dark:ring-gray-800 text-gray-900 dark:text-white;
     }
+    .bx-artificer .bx-menu-profile-stats.bx-menu-ver li.bx-psmi-show-more,
+    .bx-artificer .bx-menu-profile-stats.bx-menu-ver li.bx-psmi-show-less {
+        @apply text-gray-400 dark:text-gray-500 hover:text-gray-700 dark:hover:text-gray-300
+    }
+
 
     /* Profile Cover Actions */
     .bx-artificer .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor.bx-menu-hor-inline li.bx-mi-primary {

template/scripts/BxBaseMenuProfileStats.php

@@ -109,12 +109,14 @@ class BxBaseMenuProfileStats extends BxTemplMenuAccountNotifications
     
     protected function _getMenuItem($a)
     {
-        if(isset($a['link']))
-            $a['link'] = bx_append_url_params($a['link'], [
+        $mixedResult = parent::_getMenuItem($a);
+
+        if($mixedResult !== false && !empty($mixedResult['link']) && strpos($mixedResult['link'], 'javascript:') === false)
+            $mixedResult['link'] = bx_append_url_params($mixedResult['link'], [
                 'owner' => 1
             ]);
 
-        return parent::_getMenuItem($a);
+        return $mixedResult;
     }
 }
 

template/scripts/BxBaseServiceProfiles.php

@@ -51,7 +51,7 @@ class BxBaseServiceProfiles extends BxDol
         $sSwitcher = '';
         $aSwitcher = bx_srv('system', 'account_profile_switcher', array(false, null, '', true), 'TemplServiceProfiles');
         if($aSwitcher !== false)
-            $sSwitcher = BxTemplFunctions::getInstance()->transBox('bx-profile-switcher', $oTemplate->parseHtmlByName('profile_avatar_switcher.html', array(
+            $sSwitcher = BxTemplFunctions::getInstance()->popupBox('bx-profile-switcher', _t('_sys_txt_switch_profiles'), $oTemplate->parseHtmlByName('profile_avatar_switcher.html', array(
                 'profile_switcher' => $aSwitcher['content'],
                 'bx_if:multiple_profiles_mode' => array(
                     'condition' => empty($aSwitcher['content']) || BxDolAccount::isAllowedCreateMultiple($oProfile->id()),