Ticket #3399 - Popups and Menu Popups, etc.

inc/js/classes/BxDolMenuMoreAuto.js

@@ -101,7 +101,8 @@ BxDolMenuMoreAuto.prototype.more = function(oElement)
         pointer: {
             el: oElement
         }, 
-        moveToDocRoot: false
+        moveToDocRoot: false,
+        cssClass: 'bx-popup-menu'
     });
 }
 

inc/js/functions.js

@@ -410,7 +410,7 @@ function bx_menu_popup (o, e, options, vars) {
  */
 function bx_menu_popup_inline (jSel, e, options) {
     var options = options || {};
-    var o = $.extend({}, $.fn.dolPopupDefaultOptions, options, {pointer:{el:$(e)}});
+    var o = $.extend({}, $.fn.dolPopupDefaultOptions, options, {pointer:{el:$(e)}, cssClass: 'bx-popup-menu'});
     if ($(jSel + ':visible').length) 
         $(jSel).dolPopupHide(); 
     else 

inc/js/jquery.dolPopup.js

@@ -143,6 +143,9 @@
             if (false != o.pointer)
                 $el.addClass('bx-popup-with-pointer'); // to make all popups with pointer not responsive add: .removeClass('bx-popup-responsive')
 
+            if (o.cssClass && o.cssClass != '' && !$el.hasClass(o.cssClass))
+                $el.addClass(o.cssClass);
+
             // default style for correct positioning
             $el.css({
                 display: 'block',
@@ -442,6 +445,10 @@
                 if (!$.isWindow(e[0]))
                     bx_menu_on(e, true);
 
+                if (options.cssClass && options.cssClass != '' && !$('#' + sPopupId).hasClass(options.cssClass)) {
+                    $('#' + sPopupId).addClass(options.cssClass);
+                }
+
                 var oPopupOptions = $.extend({}, options, {
                     pointer: oPointerOptions,
                     onHide: function (oPopup) {

modules/boonex/artificer/data/template/bx_acl/pm_actions.html

@@ -0,0 +1,3 @@
+<p class="acl-dbd-membership-actions mt-2 text-center">
+    <a class="bx-btn bx-btn-small" href="__url_upgrade__"><bx_text:_bx_acl_txt_upgrade /></a>
+</p>

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

@@ -0,0 +1,7 @@
+<div id="__html_id__" class="bx-acl-membeship text-center">
+    <div class="bx-acl-m-title text-2xl">__level__</div>
+    <div class="bx-acl-m-thumbnail mt-2">__thumbnail__</div>
+    <bx_if:show_private_info>
+        <div class="bx-acl-m-info mt-2 text-xs"><bx_text:_sys_acl_start /> <b>__date_start__</b> <bx_text:_sys_acl_expire /> <b>__date_expire__</b><bx_if:show_state><br /><bx_text:_sys_acl_state /> <b>__state__</b></bx_if:show_state></div>
+    </bx_if:show_private_info>
+</div>

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

@@ -200,6 +200,9 @@ import url(../../../../../../../template/css/common.css);
     left: 0;
     -webkit-backface-visibility: hidden;
 }
-.bx-popup-menu .bx-popup-content-indent{
+.bx-popup-menu .bx-popup-close-wrapper {
+    display: none;
+}
+.bx-popup-menu .bx-popup-content-indent {
     padding: 0px !important;
 }

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

@@ -2,9 +2,6 @@
     <div class="bx-popup-gap mx-4 my-px md:m-px">
         <div class="bx-popup bx-popup-trans relative rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 shadow-xl overflow-hidden">
             <div class="bx-popup-content relative">
-                <div class="absolute block md:hidden top-4 right-4">
-                    <a href="javascript:void(0);" onclick="$('.bx-popup-applied:visible').dolPopupHide();"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
-                </div>
                 <div class="bx-menu-account-popup bx-menu-object-__object__ pt-4">
                     <div class="bx-menu-account-popup-profile bx-clearfix px-4">__active_profile__</div>
                     <hr class="bx-def-hr" />

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

@@ -3,8 +3,8 @@
         <div class="bx-popup bx-popup-box bx-popup-width relative rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 shadow-xl">
             <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="bx-popup-close-wrapper bx-def-media-desktop-hide bx-def-media-tablet-hide relative p-4">
-                    <a href="javascript:void(0);" class="bx-popup-element-close"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
+                <div class="bx-popup-close-wrapper bx-def-media-desktop-hide bx-def-media-tablet-hide relative">
+                    <a href="javascript:void(0);" class="bx-popup-element-close inline-block w-6 h-6 text-base text-center"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
                 </div>
             </div>
             <div class="bx-popup-content px-4 pb-4">__content__</div>

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

@@ -1,8 +1,8 @@
 <div  id="__id__" class="bx-popup-wrapper bx-popup-responsive bx-popup-trans-wrapper box-border __wrapper_class__" style="__wrapper_style__" role="alert">
     <div class="bx-popup-gap mx-4 my-px md:m-px">
         <div class="bx-popup bx-popup-trans relative rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 shadow-xl">
-            <div class="bx-popup-close-wrapper bx-def-media-desktop-hide bx-def-media-tablet-hide relative pt-2 px-4 text-right">
-                <a href="javascript:void(0);" class="bx-popup-element-close"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
+            <div class="bx-popup-close-wrapper bx-def-media-desktop-hide bx-def-media-tablet-hide relative pt-2 px-2 text-right">
+                <a href="javascript:void(0);" class="bx-popup-element-close inline-block w-6 h-6 text-base text-center"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
             </div>
             <div class="bx-popup-content overflow-hidden">__content__</div>
             <!-- Footer is needed for Safari in iOS -->

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

@@ -89,7 +89,7 @@
         @apply rounded-lg;
     }
 
-    .bx-popup-responsive {
+    .bx-popup-responsive:not(.bx-popup-menu) {
         @apply w-full md:w-auto;
     }
 

modules/boonex/notifications/install/sql/enable.sql

@@ -57,7 +57,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: member toolbar
 SET @iMenuToolbarMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_toolbar_member' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `markers`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_toolbar_member', @sName, 'notifications-preview', '_bx_ntfs_menu_item_title_system_preview', '_bx_ntfs_menu_item_title_preview', 'javascript:void(0)', 'bx_menu_slide(''bx_notifications_preview'', this, ''site'', {id:{value:''bx_notifications_preview'', force:1}});', '', 'bell col-green3', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:28:"get_unread_notifications_num";}', '', 'bx_notifications_preview', 1, 2147483646, 1, 1, 0);
+('sys_toolbar_member', @sName, 'notifications-preview', '_bx_ntfs_menu_item_title_system_preview', '_bx_ntfs_menu_item_title_preview', 'javascript:void(0)', 'bx_menu_slide(''bx_notifications_preview'', this, ''site'', {id:{value:''bx_notifications_preview'', force:1}, cssClass: ''''});', '', 'bell col-green3', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:28:"get_unread_notifications_num";}', '', 'bx_notifications_preview', 1, 2147483646, 1, 1, 0);
 
 -- MENU: Notifications
 SET @iMIOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_account_notifications' AND `order` < 9999);