Ticket #4028 - Artificer: Account Sidebar should use the same menu as Account popup.

modules/boonex/artificer/data/template/system/css/menu-sidebar.css

@@ -81,14 +81,42 @@
 }
 
 /*--- Account Sidebar ---*/
-.bx-sidebar.bx-sidebar-account .bx-sb-profile .bx-base-pofile-unit {
-    margin: 0;
+.bx-sidebar .bx-sb-theme-switcher .sys-icon {
+    font-size: 1.5rem;
+}
+
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup > div {
+    flex: 1 1 0%;
+}
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup > div.bx-menu-account-popup-profile-active {
+    flex-grow: 0;
 }
-.bx-sidebar .bx-sb-theme-switcher .sys-icon{
-    font-size: 24px;
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup > div.bx-menu-account-popup-profile-switcher {
+    flex-basis: auto;
+    overflow-y: auto;
+}
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup > div.bx-menu-account-popup-profile-create {
+    flex-basis: auto;
+    flex-grow: 2;
+}
+
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup-profile-active .bx-base-pofile-unit {
+    margin: 0 1rem 0.5rem 1rem;
 }
-.bx-sidebar.bx-sidebar-account .bx-sb-menu .bx-menu-item-addon.bx-def-unit-alert {
+
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup-profile-notifications {
+    margin: 0.5rem 0;
+}
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup-profile-notifications .bx-menu-item-addon.bx-def-unit-alert {
     top: auto;
     right: 0.5rem;
     padding: 0 0.25rem;
+}
+
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup-profile-create .bx-map-profile-create-cnt {
+    padding-bottom: 0;
+}
+.bx-sidebar.bx-sidebar-account .bx-menu-account-popup-profile-create .bx-btn {
+    justify-content: center;
+    width: 100%;
 }

modules/boonex/artificer/data/template/system/scripts/BxTemplFunctions.php

@@ -217,21 +217,17 @@ class BxTemplFunctions extends BxBaseFunctions
                 'popup' => BxTemplFunctions::getInstance()->transBox('bx-sb-theme-switcher-menu', $oMenu->getCode(), true)
             ];
         }
+        
+        $sMenuAccountPopup = 'sys_account_popup';
+        $oMenuAccountPopup = BxTemplMenu::getObjectInstance($sMenuAccountPopup);
 
         return $this->_oTemplate->parsePageByName('sidebar_account.html', [
             'bx_if:color_scheme_switcher' => [
                 'condition' => $bTmplVarsColorSchemeSwitcher,
                 'content' => $aTmplVarsColorSchemeSwitcher
             ],
-            'active_profile' => $oProfile->getUnit(),
-            'menu_notifications' => BxDolMenu::getObjectInstance('sys_account_notifications')->getCode(),
-            'profile_switcher' => $sSwitcher,
-            'bx_if:multiple_profiles_mode' => [
-                'condition' => BxDolAccount::isAllowedCreateMultiple($oProfile->id()),
-                'content' => [
-                    'url_switch_profile' => BxDolPermalinks::getInstance()->permalink('page.php?i=account-profile-switcher')
-        	]
-            ]
+            'ap_menu_object' => $sMenuAccountPopup,
+            'bx_repeat:ap_menu_items' => $oMenuAccountPopup->getMenuItems(),
         ]);
     }
 }

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

@@ -1,7 +1,7 @@
 <div class="bx-sidebar bx-sidebar-account bx-def-z-index-modal fixed flex justify-end inset-0" role="dialog" aria-modal="true">
     <div class="bx-sidebar-account-bg fixed inset-0 bg-gray-600 opacity-75" aria-hidden="true"></div>
     <div class="flex-shrink-0 w-14" aria-hidden="true"></div>
-    <div class="bx-sidebar-cnt relative flex-1 flex flex-col max-w-xs w-full py-4 bg-white dark:bg-gray-900">
+    <div class="bx-sidebar-cnt relative flex max-w-xs w-full py-4 bg-white dark:bg-gray-900">
         <div class="absolute top-0 left-0 -ml-12 pt-2">
             <button type="button" class="bx-sidebar-account-close ml-1 flex items-center justify-center h-10 w-10 rounded-full focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white">
                 <span class="sr-only"><bx_text:_bx_artificer_txt_close_sidebar /></span>
@@ -10,24 +10,16 @@
                 </svg>
             </button>
         </div>
-        <div class="bx-sb-profile flex-shrink-0 px-4 pb-4 flex justify-between items-center">__active_profile__
-            <bx_if:color_scheme_switcher>
-                <div class="bx-sb-theme-switcher">
-                    <a class="hover:no-underline" href="javascript:" onclick="oBxArtificerUtils.getColorSchemeMenu()"><i class="sys-icon desktop"></i></a>
-                </div>
-                __popup__
-            </bx_if:color_scheme_switcher>
-        </div>
-        <hr class="bx-def-hr" />
-        <div class="bx-sb-menu flex-1 my-2">__menu_notifications__</div>
-        <div class="bx-sb-profile-switcher flex-auto overflow-y-auto">__profile_switcher__</div>
-        <bx_if:multiple_profiles_mode>
-            <hr class="bx-def-hr" />
-            <div class="bx-sb-profile-create flex-1 mt-4 mx-4">
-                <a class="bx-btn w-full justify-center" href="__url_switch_profile__">
-                    <i class="sys-icon plus"></i><span class="pl-2"><bx_text:_sys_txt_my_profiles /></span>
-                </a>
+        <bx_if:color_scheme_switcher>
+            <div class="bx-sb-theme-switcher absolute h-10 right-4 leading-10">
+                <a class="hover:no-underline" href="javascript:" onclick="oBxArtificerUtils.getColorSchemeMenu()"><i class="sys-icon desktop"></i></a>
             </div>
-        </bx_if:multiple_profiles_mode>
+            __popup__
+        </bx_if:color_scheme_switcher>
+        <div class="bx-menu-account-popup bx-menu-object-__ap_menu_object__ flex flex-col w-full">
+            <bx_repeat:ap_menu_items>
+                <div class="bx-menu-account-popup-__name__">__item__</div>
+            </bx_repeat:ap_menu_items>
+        </div>
     </div>
 </div>

modules/boonex/decorous/data/template/system/menu_account_popup.html

@@ -1,7 +1,7 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
     <div class="bx-sliding-menu-main-cnt">
-        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h2" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
-        <div class="bx-menu-account-popup bx-menu-object-__object__">
+        <a class="bx-sliding-menu-close mt-2 mr-4 z-10 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
+        <div class="bx-menu-account-popup bx-menu-object-__object__ space-y-2">
             <bx_repeat:menu_items>
                 <div class="bx-menu-account-popup-__name__">__item__</div>
             </bx_repeat:menu_items>

modules/boonex/lucid/data/template/system/menu_account_popup.html

@@ -1,7 +1,7 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
     <div class="bx-sliding-menu-main-cnt">
-        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h2" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
-        <div class="bx-menu-account-popup bx-menu-object-__object__">
+        <a class="bx-sliding-menu-close mt-2 mr-4 z-10 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
+        <div class="bx-menu-account-popup bx-menu-object-__object__ space-y-2">
             <bx_repeat:menu_items>
                 <div class="bx-menu-account-popup-__name__">__item__</div>
             </bx_repeat:menu_items>

template/css/menu.css

@@ -666,13 +666,12 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
     width: auto;
 }
 
-.bx-menu-account-popup-profile-active {
-    margin-right: 2rem;
-}
 .bx-menu-account-popup-profile-active .bx-base-pofile-unit {
     float: none;
     width: 100%;
+    box-sizing: border-box;
     margin: 0;
+    padding-right: 2rem;
 }
 
 .bx-menu-account-popup-profile-notifications {
@@ -683,6 +682,10 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
     max-width: 50rem;
 }
 
+.bx-menu-account-popup-profile-switcher .sys-profile-switch-row:last-child {
+    padding-bottom: 0px;
+}
+
 .bx-menu-account-popup-profile-create {
     text-align: center;
 }
@@ -690,7 +693,6 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
 .bx-menu-account-popup-profile-create a {
     text-decoration:none;
 }
-
 .bx-menu-account-popup-profile-create .bx-btn {
     float: none;
     display: inline-block;

template/map_profile_active.html

@@ -1,2 +1 @@
-__profile_unit__
-<hr class="bx-def-hr bx-def-margin-sec-top" />
+__profile_unit__

template/map_profile_create.html

@@ -1,5 +1,5 @@
 <hr class="bx-def-hr" />
-<div class="bx-def-padding">
+<div class="bx-map-profile-create-cnt p-4">
     <a class="bx-btn" href="__url_switch_profile__">
         <i class="sys-icon plus"></i><span class="bx-def-padding-sec-left"><bx_text:_sys_txt_my_profiles /></span>
     </a>

template/map_profile_notifications.html

@@ -0,0 +1,2 @@
+<hr class="bx-def-hr" />
+<div class="bx-map-profile-notifications-cnt mt-2">__menu__</div>

template/menu_account_popup.html

@@ -1,8 +1,8 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
     <div class="bx-def-page-width bx-def-centered">
         <div class="bx-sliding-menu-main-cnt">
-            <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
-            <div class="bx-menu-account-popup bx-menu-object-__object__ bx-def-padding-top bx-def-padding-leftright">
+            <a class="bx-sliding-menu-close mt-2 mr-4 z-10 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
+            <div class="bx-menu-account-popup bx-menu-object-__object__ px-4 pt-4 space-y-2">
                 <bx_repeat:menu_items>
                     <div class="bx-menu-account-popup-__name__">__item__</div>
                 </bx_repeat:menu_items>

template/scripts/BxBaseMenuAccountPopup.php

@@ -39,7 +39,9 @@ class BxBaseMenuAccountPopup extends BxTemplMenuCustom
 
     protected function _getMenuItemProfileNotifications ($aItem)
     {
-        return BxDolMenu::getObjectInstance('sys_account_notifications')->getCode();
+        return $this->_oTemplate->parseHtmlByName('map_profile_notifications.html', [
+            'menu' => BxDolMenu::getObjectInstance('sys_account_notifications')->getCode()
+        ]);
     }
 
     protected function _getMenuItemProfileSwitcher ($aItem)