Ticket #3399 - Menus, Popups, etc. Production build for Tailwind.

inc/classes/BxDolMenu.php

@@ -132,23 +132,32 @@ class BxDolMenu extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
      */
     static public function getObjectInstance($sObject, $oTemplate = false)
     {
-        if (isset($GLOBALS['bxDolClasses']['BxDolMenu!'.$sObject]))
-            return $GLOBALS['bxDolClasses']['BxDolMenu!'.$sObject];
-
-        $aObject = BxDolMenuQuery::getMenuObject($sObject);
-        if (!$aObject || !is_array($aObject) || (int)$aObject['active'] == 0)
-            return false;
+        $oMenu = false;
+        if (!isset($GLOBALS['bxDolClasses']['BxDolMenu!'.$sObject])) {
+            $aObject = BxDolMenuQuery::getMenuObject($sObject);
+            if (!$aObject || !is_array($aObject) || (int)$aObject['active'] == 0)
+                return false;
+
+            $sClass = 'BxTemplMenu';
+            if (!empty($aObject['override_class_name'])) {
+                $sClass = $aObject['override_class_name'];
+                if (!empty($aObject['override_class_file']))
+                    require_once(BX_DIRECTORY_PATH_ROOT . $aObject['override_class_file']);
+            }
 
-        $sClass = 'BxTemplMenu';
-        if (!empty($aObject['override_class_name'])) {
-            $sClass = $aObject['override_class_name'];
-            if (!empty($aObject['override_class_file']))
-                require_once(BX_DIRECTORY_PATH_ROOT . $aObject['override_class_file']);
+            $oMenu = new $sClass($aObject, $oTemplate);
+            $GLOBALS['bxDolClasses']['BxDolMenu!'.$sObject] = $oMenu;
         }
+        else
+            $oMenu = $GLOBALS['bxDolClasses']['BxDolMenu!'.$sObject];
 
-        $o = new $sClass($aObject, $oTemplate);
+        bx_alert('system', 'get_object', 0, false, array(
+            'type' => 'menu',
+            'name' => $sObject,
+            'object' => &$oMenu,
+        ));
 
-        return ($GLOBALS['bxDolClasses']['BxDolMenu!'.$sObject] = $o);
+        return $oMenu;
     }
 
     /**

install/sql/system.sql

@@ -4227,7 +4227,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_account_notifications', 'system', 'dashboard', '_sys_menu_item_title_system_dashboard', '_sys_menu_item_title_dashboard', 'page.php?i=dashboard', '', '', 'tachometer-alt', '', '', 2147483646, 1, 1, 1),
 ('sys_account_notifications', 'system', 'profile', '_sys_menu_item_title_system_profile', '_sys_menu_item_title_profile', '{member_url}', '', '', 'user', '', '', 2147483644, 1, 1, 2),
 ('sys_account_notifications', 'system', 'account-settings', '_sys_menu_item_title_system_account_settings', '_sys_menu_item_title_account_settings', 'page.php?i=account-settings-email', '', '', 'cog', '', '', 2147483646, 1, 1, 3),
-('sys_account_notifications', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '_sys_menu_item_title_add_content', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_add_content\', $(\'bx-menu-toolbar-item-add-content a\').get(0), \'site\');', '', 'plus', '', '', 2147483646, 1, 1, 4),
+('sys_account_notifications', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '_sys_menu_item_title_add_content', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_add_content\', $(\'#bx-menu-toolbar-item-add-content a\').get(0), \'site\');', '', 'plus', '', '', 2147483646, 1, 1, 4),
 ('sys_account_notifications', 'system', 'studio', '_sys_menu_item_title_system_studio', '_sys_menu_item_title_studio', '{studio_url}', '', '', 'wrench', '', '', 2147483646, 1, 0, 5),
 ('sys_account_notifications', 'system', 'cart', '_sys_menu_item_title_system_cart', '_sys_menu_item_title_cart', 'cart.php', '', '', 'cart-plus col-red3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:20:"get_cart_items_count";s:6:"params";a:0:{}s:5:"class";s:21:"TemplPaymentsServices";}', '', 2147483646, 1, 1, 6),
 ('sys_account_notifications', 'system', 'orders', '_sys_menu_item_title_system_orders', '_sys_menu_item_title_orders', 'orders.php', '', '', 'cart-arrow-down col-green3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"get_orders_count";s:6:"params";a:1:{i:0;s:3:"new";}s:5:"class";s:21:"TemplPaymentsServices";}', '', 2147483646, 0, 1, 7),

modules/base/general/classes/BxBaseModGeneralMenuViewActions.php

@@ -43,6 +43,8 @@ class BxBaseModGeneralMenuViewActions extends BxTemplMenuCustom
         $this->_oMenuActionsMore = null;
         $this->_oMenuSocialSharing = null;
 
+        $this->_sTmplContent = $this->_oTemplate->getHtml($this->getTemplateName('menu_custom_actions.html'));
+        $this->_sTmplContentItem = $this->_oTemplate->getHtml($this->getTemplateNameItem('menu_custom_item_actions.html'));
         $this->_bShowAsButton = true;
         $this->_bShowTitle = true;
         $this->_sClassMiSa = 'bx-base-general-ea-sa';
@@ -71,6 +73,11 @@ class BxBaseModGeneralMenuViewActions extends BxTemplMenuCustom
             $this->addMarkers(array('content_id' => (int)$this->_iContentId));
     }
 
+    public function setShowAsButton($bShowAsButton)
+    {
+        $this->_bShowAsButton = $bShowAsButton;
+    }
+
     /**
      * Check if menu items is visible with extended checking linked to "allow*" method of particular module
      * Associated "allow*" method with particular menu item is stored in module config in MENU_ITEM_TO_METHOD array.

modules/base/profile/classes/BxBaseModProfileMenuViewActionsAll.php

@@ -21,10 +21,6 @@ class BxBaseModProfileMenuViewActionsAll extends BxBaseModGeneralMenuViewActions
     {
         parent::__construct($aObject, $oTemplate);
 
-        $this->_sTmplContent = $this->_oTemplate->getHtml($this->getTemplateName('menu_custom_actions.html'));
-        $this->_sTmplContentItem = $this->_oTemplate->getHtml($this->getTemplateNameItem('menu_custom_item_actions.html'));
-        $this->_bShowAsButton = false;
-
         if(empty($this->_iContentId) && bx_get('profile_id') !== false)
             $this->setContentId(BxDolProfile::getInstance(bx_process_input(bx_get('profile_id'), BX_DATA_INT))->getContentId());
     }

modules/base/text/template/menu_custom_actions.html

@@ -0,0 +1 @@
+<bx_include_auto:menu_custom_hor.html />

modules/base/text/template/menu_custom_item_actions.html

@@ -0,0 +1 @@
+<bx_include_auto:menu_custom_item.html />

modules/boonex/artificer/classes/BxArtificerAlertsResponse.php

@@ -29,9 +29,27 @@ class BxArtificerAlertsResponse extends BxDolAlertsResponse
         if(!method_exists($this, $sMethod))
             return;
 
+        if(BxDolTemplate::getInstance()->getCode() != $this->_oModule->_oConfig->getUri())
+            return;
+
         $this->$sMethod($oAlert);
     }
 
+    protected function _processSystemGetObject($oAlert)
+    {
+        if(empty($oAlert->aExtras['type']))
+            return;
+
+        switch($oAlert->aExtras['type']) {
+            case 'menu':
+                if(!($oAlert->aExtras['object'] instanceof BxBaseModGeneralMenuViewActions))
+                    break;
+
+                $oAlert->aExtras['object']->setShowAsButton(false);
+                break;
+        }
+    }
+
     protected function _processProfileUnit($oAlert)
     {
         $sModule = $oAlert->aExtras['module'];

modules/boonex/artificer/data/template/mod_text/css/forms.css

@@ -1,7 +1,3 @@
-/*--
-import url(../../../general/template/css/forms.css);
---*/
-
 /*-- Entry Form: Attachments custom elements --*/
 .bx-base-text-attachment-item {
     margin-top: 0;

modules/boonex/artificer/data/template/mod_text/css/main.css

@@ -0,0 +1,6 @@
+/*-- Entry: Actions Menu --*/
+.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item {
+    width: 100%;
+    border-color: transparent;
+    border-radius: 0;
+}

modules/boonex/artificer/data/template/mod_text/menu_custom_actions.html

@@ -0,0 +1,6 @@
+<ul id="__html_id__" class="bx-menu-custom bx-menu-custom-hor bx-menu-hor-inline<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex justify-left items-stretch space-y-0 space-x-3">
+    <bx_repeat:menu_items>
+        <li class="bx-menu-item bx-menu-item-__name____class__ group inline-flex items-center px-4 py-2 first:ml-0 border border-gray-300 dark:border-gray-700 shadow-sm hover:shadow-md text-sm font-medium rounded-md text-gray-700 dark:text-gray-300 dark:hover:text-white hover:text-gray-800 bg-white dark:bg-gray-800 dark:hover:bg-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">__item__</li>
+    </bx_repeat:menu_items>
+</ul>
+__js_code__

modules/boonex/artificer/data/template/mod_text/menu_custom_item_actions.html

@@ -0,0 +1,4 @@
+<span class="__class_wrp__">
+    <a class="__class_link__ flex flex-row sm:items-center" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><span class="bx-mi-icon flex items-center justify-center h-5 w-5"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img class="h-5 w-5" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image></span><bx_if:title><span class="bx-mi-text ml-2 first:ml-0 whitespace-nowrap">__title__</span></bx_if:title></a>
+    <bx_if:addon>__addon__</bx_if:addon>
+</span>

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

@@ -0,0 +1,9 @@
+__display_switcher__
+<bx_if:is_divider_1>
+    <div class="bx-def-hr my-4"></div>
+</bx_if:is_divider_1>
+__browse_switcher__
+<bx_if:is_divider_2>
+    <div class="bx-def-hr my-4"></div>
+</bx_if:is_divider_2>
+__filter_switcher__

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

@@ -1,4 +0,0 @@
-<a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn mr-4 cmts-uploader-button">
-    <i class="sys-icon __button_title__"></i>
-</a>
-<bx_include_auto:uploader_button_simple_js.html />

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

@@ -21,8 +21,9 @@ import url(../../../../../../../template/css/menu.css);
 }
 
 /*--- Interactive Menu ---*/
-li.bx-menu-inter-hidden {
-    display: none;
+.bx-menu-inter li.bx-menu-inter-hidden,
+.bx-menu-inter-vert li.bx-menu-inter-hidden {
+    display: none !important;
 }
 
 /*--- Custom Menu with More Auto ---*/

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

@@ -1 +1 @@
-<div class="bx-db-menu-popup p-4">__content__</div>  
+<div class="bx-db-menu-popup py-2">__content__</div>  

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

@@ -0,0 +1,21 @@
+<ul id="bx-menu-inter-__id__" class="bx-menu-inter-vert bx-menu-object-__object__">
+    <bx_repeat:menu_items>
+        <li id="__name__-act" class="bx-menu-inter-act __class_wrp_act__ group flex items-center bg-white dark:bg-gray-900 text-gray-900 dark:text-white text-sm font-normal shadow-sm">
+            <div class="__class__ px-4 py-2" title="__title_attr__">__title__</div>
+        </li>
+        <li id="__name__-pas" class="bx-menu-inter-pas __class_wrp_pas__ group flex items-center text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal">
+            <a id="__name__" class="__class__" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
+                <div class="px-4 py-2">__title__</div>
+            </a>
+        </li>
+    </bx_repeat:menu_items>
+</ul>
+<script language="javascript">
+    $(document).ready(function() {
+    	$('#bx-menu-inter-__id__').find('a').bind('click', function() {
+            var sId = $(this).attr('id');
+            var sClassHidden = 'bx-menu-inter-hidden';
+            $(this).parent().siblings('.bx-menu-inter-act:not(.' + sClassHidden + ')').addClass(sClassHidden).siblings('.bx-menu-inter-pas.' + sClassHidden).removeClass(sClassHidden).siblings('#' + sId + '-pas:not(.' + sClassHidden + ')').addClass(sClassHidden).siblings('#' + sId + '-act.' + sClassHidden).removeClass(sClassHidden);
+    	});
+    });
+</script>

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

@@ -1,11 +1,11 @@
 <ul class="bx-menu-ver bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item __name__ __class_add__ group text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-600 hover:text-gray-900 flex items-center px-2 py-2 text-sm font-normal rounded">
+        <li class="bx-menu-item __name__ __class_add__ group text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-600 hover:text-gray-900 flex items-center px-4 py-2 text-sm font-normal rounded">
             <a class="__name__" href="__link__" onclick="__onclick__"__attrs__>
                 <bx_if:icon><i class="sys-icon __icon__ mr-3 h-5 w-5"></i></bx_if:icon>
-				<bx_if:image><img class="mr-3 h-5 w-5" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
-				<bx_if:icon-html>__icon__</bx_if:icon-html>
-				<span>__title__</span>
+                <bx_if:image><img class="mr-3 h-5 w-5" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
+                <bx_if:icon-html>__icon__</bx_if:icon-html>
+                <span>__title__</span>
             </a>
         </li>
     </bx_repeat:menu_items>

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

@@ -16,6 +16,23 @@ class BxTemplMenuAccountNotifications extends BxBaseMenuAccountNotifications
     {
         parent::__construct ($aObject, $oTemplate);
     }
+
+    protected function _getMenuItem ($a)
+    {
+        $a = parent::_getMenuItem ($a);
+        if($a === false)
+            return $a;
+
+        $a['class_add_a'] = '';
+        switch ($a['name']) {
+            case 'add-content':
+                if(isset($a['onclick']))
+                    $a['onclick'] = str_replace('bx_menu_slide_inline', "$('.bx-popup-applied:visible').dolPopupHide(); bx_menu_popup_inline", $a['onclick']);
+                break;
+        }
+
+        return $a;
+    }
 }
 
 /** @} */

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

@@ -1,2 +1,2 @@
-<bx_if:show_text><span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></bx_if:show_text><bx_if:show_link><a class="__class__ group flex items-center p-1 border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></bx_if:show_link>
+<bx_if:show_text><span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></bx_if:show_text><bx_if:show_link><a class="__class__ group flex items-center border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></bx_if:show_link>
 __script__

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

@@ -4,7 +4,7 @@
             <div class="sys-action-element-holder __style_prefix__-element-holder">__do_view__</div>
         </bx_if:show_do_view>
         <bx_if:show_counter>
-            <div class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-sec-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</div>
+            <div class="sys-action-counter-holder __style_prefix__-counter-holder ml-2 first:ml-0"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</div>
         </bx_if:show_counter>
     </div>
     __script__

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

@@ -1,3 +1,3 @@
 <span id="__html_id__" class="sys-action __style_prefix__ __class__ flex items-center whitespace-nowrap" bx_view_data_count="__count__">
-    <span class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center"><bx_if:show_do_view><span class="sys-action-element-holder __style_prefix__-element-holder">__do_view__</span></bx_if:show_do_view><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
+    <span class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center"><bx_if:show_do_view><span class="sys-action-element-holder __style_prefix__-element-holder">__do_view__</span></bx_if:show_do_view><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder ml-2 first:ml-0"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
 </span>

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

@@ -1,2 +1,2 @@
-<bx_if:show_text><span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></bx_if:show_text><bx_if:show_link><a class="__class__ group flex items-center p-1 border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 box-border" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></bx_if:show_link>
+<bx_if:show_text><span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></bx_if:show_text><bx_if:show_link><a class="__class__ group flex items-center border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 box-border" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></bx_if:show_link>
 __script__

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

@@ -4,7 +4,7 @@
             <div class="sys-action-element-holder __style_prefix__-element-holder">__do_vote__</div>
         </bx_if:show_do_vote>
         <bx_if:show_counter>
-            <div class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-sec-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</div>
+            <div class="sys-action-counter-holder __style_prefix__-counter-holder ml-2 first:ml-0"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</div>
         </bx_if:show_counter>
     </div>
     <bx_if:show_legend>__legend__</bx_if:show_legend>

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

@@ -1,3 +1,3 @@
 <span id="__html_id__" class="sys-action __style_prefix__ __class__ flex items-center whitespace-nowrap"<bx_if:show_vote_data> bx_vote_data_rate="__rate__" bx_vote_data_count="__count__"</bx_if:show_vote_data>>
-    <span class="sys-action-cnt __style_prefix__-cnt __style_prefix__-do flex items-center"><bx_if:show_do_vote><span class="sys-action-element-holder __style_prefix__-element-holder group flex items-center p-1 px-2 space-x-1">__do_vote__</span></bx_if:show_do_vote><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
+    <span class="sys-action-cnt __style_prefix__-cnt __style_prefix__-do flex items-center"><bx_if:show_do_vote><span class="sys-action-element-holder __style_prefix__-element-holder group flex items-center p-1 px-2 space-x-1">__do_vote__</span></bx_if:show_do_vote><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder ml-2 first:ml-0"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
 </span>

modules/boonex/artificer/install/sql/enable.sql

@@ -23,6 +23,7 @@ INSERT INTO `sys_alerts_handlers` (`name`, `class`, `file`, `service_call`) VALU
 SET @iHandler := LAST_INSERT_ID();
 
 INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
+('system', 'get_object', @iHandler),
 ('profile', 'unit', @iHandler);
 
 

modules/boonex/artificer/js/tailwind.config.js

@@ -1,5 +1,8 @@
 module.exports = {
-  purge: [],
+  purge: [
+      './template/*.html',
+      './data/template/**/*.html',
+  ],
   darkMode: 'media', // false or 'media' or 'class'
   theme: {
     fontFamily: {

modules/boonex/artificer/template/css/tailwind.css

@@ -120,9 +120,9 @@
     }
 
     .bx-popup .bx-menu-ver > li.bx-def-color-bg-active {
-        @apply group bg-white ring-1 ring-gray-200 dark:ring-gray-700 dark:bg-gray-900 shadow-sm text-gray-900 dark:text-white rounded;
+        @apply group bg-white ring-1 ring-gray-200 dark:ring-gray-700 dark:bg-gray-900 shadow-sm text-gray-900 dark:text-white;
     }
-
+    
     /* Main menu */
     .bx-toolbar-item.bx-ti-menu .bx-menu-main .bx-menu-item.bx-menu-tab-active {
         @apply opacity-100 bg-gray-50 dark:bg-gray-700 ring-1 ring-gray-200 dark:ring-gray-600 shadow text-gray-900 dark:text-white;