Jelajahi Sumber

Ticket #3399 - Profile Cover, etc.

AntonLV 5 tahun lalu
induk
melakukan
c57646cd8e

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -1257,7 +1257,7 @@ class BxBaseModGeneralModule extends BxDolModule
                 $aMarkers['img_url'] = $sImageUrl;
         }
 
-        $oActions = BxDolMenu::getObjectInstance($sObjectMenu);
+        $oActions = BxDolMenu::getObjectInstance($sObjectMenu, $this->_oTemplate);
         if(!$oActions)
             return false;
 

+ 1 - 1
modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -428,7 +428,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         }
 
         $sActionsMenu = $oModule->serviceEntityAllActions();
-        if(!$sActionsMenu && ($oMenu = BxTemplMenu::getObjectInstance($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY'])) !== false)
+        if(!$sActionsMenu && ($oMenu = BxTemplMenu::getObjectInstance($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY'], $this)) !== false)
             $sActionsMenu = $oMenu->getCode();
 
         $sMetaMenu = '';

+ 1 - 2
modules/boonex/artificer/data/template/mod_general/css/main.css

@@ -14,8 +14,7 @@
 .bx-base-pofile-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom.bx-menu-custom-hor > li.bx-menu-item-nl {
     display: block;
 }
-.bx-base-general-unit-meta ul.bx-menu-custom li:first-child .bx-base-general-unit-meta-div,
-.bx-base-profile-cover-meta ul.bx-menu-custom li:first-child .sys-meta-div {
+.bx-base-general-unit-meta ul.bx-menu-custom li:first-child .bx-base-general-unit-meta-div {
     display: none;
 }
 

+ 8 - 6
modules/boonex/artificer/data/template/mod_profile/cover.html

@@ -13,7 +13,7 @@
                 </div>
             </div>
             <div class="bx-base-pofile-cover-info bx-def-page-width relative mx-auto px-6 lg:px-8">
-                <div class="bx-base-pofile-ci-cnt relative flex flex-col -mt-24 lg:-mt-16 lg:flex-row lg:items-end lg:space-x-6">
+                <div class="bx-base-pofile-ci-cnt relative flex flex-col -mt-24 lg:-mt-16 lg:flex-row lg:items-center lg:space-x-6">
                     <bx_if:show_avatar>
                         <div class="bx-base-pofile-cover-thumb flex justify-center lg:flex-none">
                             <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
@@ -32,12 +32,14 @@
                     <bx_if:show_avatar_placeholder>
                         <div class="bx-base-pofile-cover-thumb-placeholder h-24 lg:h-36"></div>
                     </bx_if:show_avatar_placeholder>
-                    <div class="bx-base-pofile-cover-user relative mt-6 flex flex-col lg:flex-row lg:flex-1 lg:items-center lg:justify-end lg:space-x-6 sm:pb-1">
-                        <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 lg:mt-6">
-                            <h1 class="bx-def-unit-info text-3xl font-bold leading-7 text-gray-900 text-center dark:text-gray-100 sm:leading-9 sm:truncate lg:text-left">__title__ </h1>
-                            <div class="bx-base-profile-cover-meta flex flex-row flex-wrap justify-center mt-8 -ml-1 sm:mt-1 lg:justify-start">__meta__</div>
+                    <div class="bx-base-pofile-cover-user relative flex flex-col lg:flex-row lg:flex-1 lg:items-start lg:justify-end lg:space-x-6 mt-6 sm:pb-1">
+                        <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 lg:mt-14 mb-2">
+                            <h1 class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center lg:text-left sm:truncate">__title__ </h1>
+                            <div class="bx-base-profile-cover-meta-holder lg:h-8">
+                                <div class="bx-base-profile-cover-meta lg:absolute flex flex-row flex-wrap justify-center mt-6 md:mt-2 -ml-1 lg:justify-start text-base font-medium">__meta__</div>
+                            </div>
                         </div>
-                        <div class="bx-base-pofile-cover-actions relative flex lg:flex-1 h-14 md:h-8 mt-8" onclick="event.stopPropagation();">__action_menu__</div>
+                        <div class="bx-base-pofile-cover-actions relative flex lg:flex-1 h-14 md:h-10 mt-6 lg:mt-14" onclick="event.stopPropagation();">__action_menu__</div>
                     </div>
                 </div>
             </div>

+ 14 - 13
modules/boonex/artificer/data/template/mod_profile/css/main.css

@@ -93,25 +93,26 @@ p.bx-base-pofile-unit-thumb.bx-def-ava-big-size {
 
 /*--- Profile Cover ---*/
 .bx-base-profile-cover-meta .bx-menu-custom.bx-menu-custom-hor {
+    -webkit-align-items: center;
+    align-items: center;
     -webkit-flex-wrap: wrap;
     flex-wrap: wrap;
 }
-.bx-base-pofile-cover-actions div.bx-base-general-entity-actions {
-    position: absolute;
-    width: 100%;
+.bx-base-profile-cover-meta .bx-menu-custom.bx-menu-custom-hor li {
+    margin-right: 1.25rem;
 }
-.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor.bx-menu-hor-inline {
-    -webkit-justify-content: flex-end;
-    justify-content: flex-end;
+.bx-base-profile-cover-meta .bx-menu-custom.bx-menu-custom-hor li .sys-meta-div {
+    display: none;
 }
-.bx-media-phone .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor.bx-menu-hor-inline,
-.bx-media-tablet .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor.bx-menu-hor-inline {
-    -webkit-justify-content: center;
-    justify-content: center;
+.bx-base-profile-cover-meta .bx-menu-custom.bx-menu-custom-hor li .bx-base-bages-container {
+    display: -webkit-flex;
+    display: flex;
+    -webkit-align-items: flex-start;
+    align-items: flex-start;
 }
-.bx-media-phone .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor.bx-menu-hor-inline {
-    -webkit-align-items: center;
-    align-items: center;
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions {
+    position: absolute;
+    width: 100%;
 }
 
 .bx-media-phone .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor.bx-menu-hor-inline .bx-btn,

+ 6 - 0
modules/boonex/artificer/data/template/mod_profile/menu_custom_hor_bx_persons_view_actions_all.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-center lg:justify-end sm:items-center md:items-start">
+    <bx_repeat:menu_items>
+        <li class="bx-menu-item bx-menu-item-__name____class__">__item__</li>
+    </bx_repeat:menu_items>
+</ul>
+__js_code__

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

@@ -33,7 +33,7 @@
     <bx_injection:injection_head />
     <bx_include_auto:_header_meta.html />
 </head>
-<body class="bg-gray-100 dark:bg-black text-gray-500 dark:text-gray-400 <bx_injection:injection_body_class />" dir="__lang_direction__" <bx_injection:injection_body /> >
+<body class="bg-gray-100 dark:bg-black text-gray-500 dark:text-gray-400 font-inter <bx_injection:injection_body_class />" dir="__lang_direction__" <bx_injection:injection_body /> >
     __system_injection_header__
     <bx_injection:injection_header />
     <noscript>

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

@@ -7,7 +7,7 @@
 </bx_if:logged_in>
 
 <div class="bx-menu-toolbar-padding relative bg-gradient-to-b from-gray-100 to-white dark:from-black dark:to-gray-900">
-    <div class="bx-cover-gap bx-def-page-width mx-auto px-3 md:px-4 lg:px-6 box-border">
+    <div class="bx-cover-gap bx-def-page-width mx-auto box-border">
         <div class="bx-cover-wrapper __class__ h-64 w-full lg:h-80 xl:rounded-b-lg" <bx_if:bg>style="background-image:url(__image_url__)"</bx_if:bg>>
             <div class="bx-cover p-4 box-border">
                 <div class="bx-cover-cnt">

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

@@ -39,6 +39,12 @@ li.bx-menu-inter-hidden {
     text-decoration:none;
 }
 
+/*--- Page Submenu ---*/
+.bx-menu-main-submenu {
+    -webkit-justify-content: center;
+    justify-content: center;
+}
+
 /*--- Toolbar Menu ---*/
 .bx-menu-toolbar .bx-menu-toolbar-item.bx-menu-item-account {
     padding: 0;

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

@@ -1,5 +1,5 @@
 <div id="bx-menu-main-bar-wrapper" class="bg-white dark:bg-gray-900 pt-5 border-b border-gray-200 dark:border-gray-800">
-    <div id="bx-menu-main-bar" class="bx-menu-main-bar __class__ bx-def-page-width mx-auto px-4 sm:px-6 lg:px-8 box-border">
+    <div id="bx-menu-main-bar" class="bx-menu-main-bar __class__ bx-def-page-width mx-auto px-4 sm:px-6 lg:px-8 border-t border-gray-200 dark:border-gray-800 box-border">
         <div class="bx-menu-main-bar-cnt relative -mb-px">
             <div class="absolute w-full">
                 <bx_injection:injection_top_menu_before />

+ 3 - 0
modules/boonex/artificer/js/tailwind.config.js

@@ -2,6 +2,9 @@ module.exports = {
   purge: [],
   darkMode: 'media', // false or 'media' or 'class'
   theme: {
+    fontFamily: {
+        'inter': ['Inter', 'ui-sans-serif', 'system-ui', '-apple-system', 'BlinkMacSystemFont', '"Segoe UI"', 'Roboto', '"Helvetica Neue"', 'Arial', '"Noto Sans"', 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"', '"Noto Color Emoji"'],
+    },
     extend: {
         animation: {
           goo: "goo 8s infinite",

File diff ditekan karena terlalu besar
+ 0 - 0
modules/boonex/artificer/template/css/tailwind.min.css


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini