Quellcode durchsuchen

Ticket #3399 - Different Menus.

AntonLV vor 5 Jahren
Ursprung
Commit
fcef372550

+ 1 - 1
modules/boonex/artificer/data/template/mod_profile/menu_custom_item_actions.html

@@ -1,4 +1,4 @@
 <span class="__class_wrp__">
 <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 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>
+    <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>
     <bx_if:addon>__addon__</bx_if:addon>
 </span>
 </span>

+ 6 - 0
modules/boonex/artificer/data/template/system/css/menu.css

@@ -14,6 +14,12 @@ import url(../../../../../../../template/css/menu.css);
     margin-top: 0px;
     margin-top: 0px;
 }
 }
 
 
+/* --- Horizontal, Custom Horizontal Menus --- */
+.bx-menu-custom .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item,
+.bx-menu-custom .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item a {
+    border-radius: 0;
+}
+
 /*--- Interactive Menu ---*/
 /*--- Interactive Menu ---*/
 li.bx-menu-inter-hidden {
 li.bx-menu-inter-hidden {
     display: none;
     display: none;

+ 2 - 2
modules/boonex/artificer/data/template/system/menu_add_content.html

@@ -1,6 +1,6 @@
-<ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap">
+<ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap py-2">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ rounded __class_add__">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ rounded __class_add__">
-        <a href="__link__" onclick="__onclick__" class="group 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 flex items-center p-2 text-sm font-normal rounded"__attrs__>
+        <a href="__link__" onclick="__onclick__" class="group flex items-center p-2 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"__attrs__>
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300 mr-2 h-5 w-5">
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300 mr-2 h-5 w-5">
                 <bx_include_auto:menu_icon.html />
                 <bx_include_auto:menu_icon.html />
             </div>
             </div>

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_floating_blocks_wide.html

@@ -4,7 +4,7 @@
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center h-5 w-5 mr-2">
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center h-5 w-5 mr-2">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <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>
                 <bx_if:image><img class="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>
+                <bx_if:icon-html>__icon__</bx_if:icon-html>
             </div>
             </div>
             <div class="bx-menu-floating-blocks-title bx-def-font-middle">__title__</div>
             <div class="bx-menu-floating-blocks-title bx-def-font-middle">__title__</div>
         </a>
         </a>

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_main_popup.html

@@ -1,3 +1,3 @@
 <div id="__id__" class="__class__ bx-def-z-index-nav bx-popup bx-popup-trans relative rounded ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 shadow-md" style="__style__">
 <div id="__id__" class="__class__ bx-def-z-index-nav bx-popup bx-popup-trans relative rounded ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 shadow-md" style="__style__">
-    <div class="bx-popup-content w-56 p-4 box-border overflow-hidden">__content__</div>
+    <div class="bx-popup-content w-56 box-border overflow-hidden">__content__</div>
 </div>
 </div>

+ 5 - 5
modules/boonex/artificer/data/template/system/menu_profile_stats.html

@@ -1,12 +1,12 @@
 <ul class="bx-menu-profile-stats bx-menu-ver bx-menu-object-__object__">
 <ul class="bx-menu-profile-stats bx-menu-ver bx-menu-object-__object__">
     <bx_repeat:menu_items>
     <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-800 hover:text-gray-900 text-sm font-medium 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-800 hover:text-gray-900 text-sm font-medium rounded">
-            <div class="bx-menu-item-cnt flex items-center px-2 py-2">
-                <a href="__link__" onclick="__onclick__"__attrs__>
-                    <span class="mr-3 h-5 w-5">
+            <div class="bx-menu-item-cnt flex items-center justify-between p-2">
+                <a class="flex flex-1 items-center" href="__link__" onclick="__onclick__"__attrs__>
+                    <span class="flex items-center justify-center h-5 w-5 mr-2">
                         <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                         <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>
                         <bx_if:image><img class="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>
+                        <bx_if:icon-html>__icon__</bx_if:icon-html>
                     </span>
                     </span>
                     <span class="truncate">__title__</span>
                     <span class="truncate">__title__</span>
                 </a>
                 </a>
@@ -24,4 +24,4 @@
         // add default class to active menu items
         // add default class to active menu items
         $('.bx-menu-ver > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
         $('.bx-menu-ver > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
     });
     });
-</script>
+</script>

+ 2 - 2
modules/boonex/artificer/data/template/system/profile_avatar.html

@@ -6,12 +6,12 @@
                 <div class="bx-pa-info-cnt pl-4 box-border">
                 <div class="bx-pa-info-cnt pl-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">__profile_title__</div>
                     <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 class="bx-pai-line text-green-600 dark:text-green-400 text-xs truncate uppercase tracking-wider font-normal">
-                        <div><!--<i class="sys-icon __profile_acl_icon__ pr-2"></i>--><span>__profile_acl_title__</span></div>
+                        <div><!--<bx_include_auto:menu_icon.html />--><span>__profile_acl_title__</span></div>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
             <div class="bx-pa-actions">
             <div class="bx-pa-actions">
-                <div class="bx-pa-action ml-2"><i class="sys-icon arrows-alt-v flex-shrink-0 h-5 w-5 text-gray-400 group-hover:text-gray-500"></i></div>
+                <div class="bx-pa-action flex items-center justify-center h-5 w-5 ml-2"><i class="sys-icon arrows-alt-v flex-shrink-0 text-gray-400 group-hover:text-gray-500"></i></div>
             </div>
             </div>
         </div>
         </div>
     </a>
     </a>

+ 1 - 1
modules/boonex/artificer/data/template/system/profile_stats.html

@@ -9,7 +9,7 @@
                     <div class="bx-ps-user-info-cnt pl-4 box-border">
                     <div class="bx-ps-user-info-cnt pl-4 box-border">
                         <div class="bx-ps-user-line"><a class="text-gray-600 dark:text-gray-300 text-sm group-hover:text-gray-800 dark:group-hover:text-white font-semibold truncate" href="__profile_url__" title="__profile_title_attr__">__profile_title__</a></div>
                         <div class="bx-ps-user-line"><a class="text-gray-600 dark:text-gray-300 text-sm group-hover:text-gray-800 dark:group-hover:text-white font-semibold truncate" href="__profile_url__" title="__profile_title_attr__">__profile_title__</a></div>
                         <div class="bx-ps-user-line mt-1">
                         <div class="bx-ps-user-line mt-1">
-                            <div><i class="sys-icon __profile_acl_icon__"></i><span class="pl-2">__profile_acl_title__</span></div>
+                            <div><bx_include_auto:menu_icon.html /><span class="pl-2">__profile_acl_title__</span></div>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>

+ 1 - 1
modules/boonex/artificer/data/template/system/scripts/BxTemplMenu.php

@@ -37,7 +37,7 @@ class BxTemplMenu extends BxBaseMenu
         if($aResult === false)
         if($aResult === false)
             return $aResult;
             return $aResult;
 
 
-        if((int)$a['primary'] != 0) {
+        if(!empty($a['primary'])) {
             if(!isset($aResult['class_add']))
             if(!isset($aResult['class_add']))
                 $aResult['class_add'] = '';
                 $aResult['class_add'] = '';
 
 

+ 1 - 1
modules/boonex/artificer/data/template/system/scripts/BxTemplMenuCustom.php

@@ -23,7 +23,7 @@ class BxTemplMenuCustom extends BxBaseMenuCustom
         if($aResult === false)
         if($aResult === false)
             return $aResult;
             return $aResult;
 
 
-        if((int)$a['primary'] != 0) {
+        if(!empty($a['primary'])) {
             if(!isset($aResult['class']))
             if(!isset($aResult['class']))
                 $aResult['class'] = '';
                 $aResult['class'] = '';