Merge branch 'master' of https://github.com/unaio/una

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -422,45 +422,44 @@ class BxBaseModGeneralModule extends BxDolModule
 
         return $aTextFields;
     }
-    
+
     public function serviceManageTools($sType = 'common')
     {
         $oGrid = BxDolGrid::getObjectInstance($this->_oConfig->getGridObject($sType));
         if(!$oGrid)
             return '';
 
-		$CNF = &$this->_oConfig->CNF;
-
-		$sMenu = '';
-		if(BxDolAcl::getInstance()->isMemberLevelInSet(192)) {
-			$oPermalink = BxDolPermalinks::getInstance();
-
-			$aMenuItems = array();
-			if(!empty($CNF['OBJECT_GRID_COMMON']) && !empty($CNF['T']['menu_item_manage_my']))
-				$aMenuItems[] = array('id' => 'manage-common', 'name' => 'manage-common', 'class' => '', 'link' => $oPermalink->permalink($CNF['URL_MANAGE_COMMON']), 'target' => '_self', 'title' => _t($CNF['T']['menu_item_manage_my']), 'active' => 1);
-			if(!empty($CNF['OBJECT_GRID_ADMINISTRATION']) && !empty($CNF['T']['menu_item_manage_all']))
-				$aMenuItems[] = array('id' => 'manage-administration', 'name' => 'manage-administration', 'class' => '', 'link' => $oPermalink->permalink($CNF['URL_MANAGE_ADMINISTRATION']), 'target' => '_self', 'title' => _t($CNF['T']['menu_item_manage_all']), 'active' => 1);
-
-			if(count($aMenuItems) > 1) {
-	            $oMenu = new BxTemplMenu(array(
-	            	'template' => 'menu_vertical.html', 
-	            	'menu_items' => $aMenuItems
-	            ), $this->_oTemplate);
-	            $oMenu->setSelected($this->_aModule['name'], 'manage-' . $sType);
-	            $sMenu = $oMenu->getCode();
-			}
-		}
+        $CNF = &$this->_oConfig->CNF;
 
-		if(!empty($CNF['OBJECT_MENU_SUBMENU']) && isset($CNF['URI_MANAGE_COMMON'])) {
-			BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_SUBMENU'])->setSelected($this->_aModule['name'], $CNF['URI_MANAGE_COMMON']);
-		}
+        $mixedMenu = '';
+        if(BxDolAcl::getInstance()->isMemberLevelInSet(192)) {
+            $oPermalink = BxDolPermalinks::getInstance();
+
+            $aMenuItems = array();
+            if(!empty($CNF['OBJECT_GRID_COMMON']) && !empty($CNF['T']['menu_item_manage_my']))
+                $aMenuItems[] = array('id' => 'manage-common', 'name' => 'manage-common', 'class' => '', 'link' => $oPermalink->permalink($CNF['URL_MANAGE_COMMON']), 'target' => '_self', 'title' => _t($CNF['T']['menu_item_manage_my']), 'active' => 1);
+            if(!empty($CNF['OBJECT_GRID_ADMINISTRATION']) && !empty($CNF['T']['menu_item_manage_all']))
+                $aMenuItems[] = array('id' => 'manage-administration', 'name' => 'manage-administration', 'class' => '', 'link' => $oPermalink->permalink($CNF['URL_MANAGE_ADMINISTRATION']), 'target' => '_self', 'title' => _t($CNF['T']['menu_item_manage_all']), 'active' => 1);
+
+            if(count($aMenuItems) > 1) {
+                $mixedMenu = new BxTemplMenu(array(
+                    'template' => 'menu_block_submenu_ver.html', 
+                    'menu_items' => $aMenuItems
+                ), $this->_oTemplate);
+                $mixedMenu->setSelected($this->_aModule['name'], 'manage-' . $sType);
+            }
+        }
+
+        if(!empty($CNF['OBJECT_MENU_SUBMENU']) && isset($CNF['URI_MANAGE_COMMON'])) {
+            BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_SUBMENU'])->setSelected($this->_aModule['name'], $CNF['URI_MANAGE_COMMON']);
+        }
 
         $this->_oTemplate->addCss(array('manage_tools.css'));
         $this->_oTemplate->addJs(array('manage_tools.js'));
         $this->_oTemplate->addJsTranslation(array('_sys_grid_search'));
         return array(
-        	'content' => $this->_oTemplate->getJsCode('manage_tools', array('sObjNameGrid' => $this->_oConfig->getGridObject($sType))) . $oGrid->getCode(),
-        	'menu' => $sMenu
+            'content' => $this->_oTemplate->getJsCode('manage_tools', array('sObjNameGrid' => $this->_oConfig->getGridObject($sType))) . $oGrid->getCode(),
+            'menu' => $mixedMenu
         );
     }
 
@@ -468,7 +467,7 @@ class BxBaseModGeneralModule extends BxDolModule
     {
     	return 0;
     }
-    
+
     public function serviceGetMenuAddonManageToolsProfileStats()
     {
     	return 0;

modules/boonex/artificer/classes/BxArtificerModule.php

@@ -18,6 +18,13 @@ class BxArtificerModule extends BxBaseModTemplateModule
         parent::__construct($aModule);
     }
 
+    public function serviceGetSafeServices()
+    {
+        return array_merge(parent::serviceGetSafeServices(), [
+            'GetSplashMarker' => '',
+        ]);
+    }
+
     public function serviceIncludeCssJs()
     {
         if(BxDolTemplate::getInstance()->getCode() != $this->_oConfig->getUri())
@@ -25,6 +32,43 @@ class BxArtificerModule extends BxBaseModTemplateModule
 
         return $this->_oTemplate->getIncludeCssJs();
     }
+
+    public function serviceGetSplashMarker($sName)
+    {
+        $sResult = '';
+
+        switch($sName) {
+            case 'members':
+                $sResult = '0';
+                if($aMembers = BxDolAccountQuery::getInstance()->getAccounts(['type' => 'confirmed']))
+                    $sResult = count($aMembers);
+                break;
+
+            case 'posts':
+                $iPosts = 0;
+                $aModules = bx_srv('system', 'get_modules_by_type', ['content']);
+                foreach($aModules as $aModule)
+                    if(BxDolRequest::serviceExists($aModule['name'], 'get_all'))
+                        $iPosts += bx_srv($aModule['name'], 'get_all', [['type' => 'all', 'count' => true]]);
+                
+                $sResult = $iPosts;
+                break;
+
+            case 'comments':
+                $sResult = (int)BxDolCmtsQuery::getInfoBy(['type' => 'all', 'count' => true]);
+                break;
+
+            case 'login_agreement':
+                $oPermalink = BxDolPermalinks::getInstance();
+                $sLinkTerms = BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=terms');
+                $sLinkPrivacy = BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=privacy');
+
+                $sResult = _t('_bx_artificer_txt_splash_login_agreement', $sLinkTerms, $sLinkPrivacy);
+                break;
+        }
+
+        return $sResult;
+    }
 }
 
 /** @} */

modules/boonex/artificer/data/template/bx_timeline/menu_custom_hor.html

@@ -1,6 +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-between items-start">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item bx-menu-item-__name____class__">__item__</li>
+        <li class="bx-menu-item bx-menu-item-__name____class__ group border border-transparent 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">__item__</li>
     </bx_repeat:menu_items>
 </ul>
 __js_code__

modules/boonex/artificer/data/template/bx_timeline/menu_custom_item_hor.html

@@ -1,4 +1,4 @@
 <span class="__class_wrp__">
-    <a class="__class_link__ group flex items-center p-1 px-2 border border-transparent rounded-full space-x-1 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" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><span class="flex items-center"><bx_if:icon><span class="bx-menu-item-icon text-center"><i class="sys-icon __icon__"></i></span></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span class="bx-menu-item-title bx-def-margin-sec-left-auto">__title__</span></bx_if:title></span></a>
+    <a class="__class_link__ flex items-center p-1 px-2 space-x-1" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><span class="flex items-center"><bx_if:icon><span class="bx-menu-item-icon text-center"><i class="sys-icon __icon__"></i></span></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span class="bx-menu-item-title bx-def-margin-sec-left-auto">__title__</span></bx_if:title></span></a>
     <bx_if:addon>__addon__</bx_if:addon>
 </span>

modules/boonex/artificer/data/template/bx_timeline/menu_custom_ver.html

@@ -0,0 +1,5 @@
+<ul class="bx-menu-custom bx-menu-custom-ver bx-menu-object-__object__ flex flex-col">
+    <bx_repeat:menu_items>
+        <li class="bx-menu-item bx-menu-item-__name____class__  group border border-transparent 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">__item__</li>
+    </bx_repeat:menu_items>
+</ul>

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

@@ -100,9 +100,8 @@ import url(../../../../../../../template/css/common.css);
     text-decoration:none;
 }
 
-.bx-db-menu-tab-btn a.bx-btn {
-    display: inline-block;
-    float: none;
+.bx-db-menu-tab-btn ul > li {
+    display: flex;
 }
 
 .bx-db-menu .sys-icon-a {

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

@@ -142,7 +142,7 @@ import url(../../../../../../../template/css/forms.css);
     height: 100%;
 
     margin: 0;
-    padding: 0.2rem 0.4rem;
+    padding: 0;
 
     border: 0;
     background-color: transparent;

modules/boonex/artificer/data/template/system/css/media-phone.css

@@ -1,5 +1,9 @@
 @import url(../../../../../../../template/css/media-phone.css);
 
+html.bx-media-phone {
+    font-size:100%;
+}
+
 
 /* --- General ---*/
 .bx-media-phone #bx-toolbar-content .bx-toolbar-item.bx-ti-logo {

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

@@ -1 +1,18 @@
-<bx_include_auto:menu_main.html />
+<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">
+    <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__>
+            <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_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>
+            </div>
+            <div class="bx-menu-floating-blocks-title ml-1">__title__</div>
+        </a>__popup__
+    </li></bx_repeat:menu_items>
+</ul>
+<script language="javascript">
+    $(document).ready(function () {
+        // add default class to active menu items
+        $('.bx-menu-floating-blocks > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
+    });
+</script>
+__js_code__

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

@@ -0,0 +1,7 @@
+<ul class="bx-menu-hor bx-menu-object-__object__ flex flex-row">
+    <bx_repeat:menu_items>
+        <li class="bx-def-margin-right-auto __class_add__">
+            <a href="__link__" onclick="__onclick__"__attrs__><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><bx_if:title><span>__title__</span></bx_if:title></a>
+        </li>
+    </bx_repeat:menu_items>
+</ul>

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

@@ -0,0 +1,15 @@
+<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">
+            <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><span>__title__</span>
+            </a>
+        </li>
+    </bx_repeat:menu_items>
+</ul>
+<script language="javascript">
+    $(document).ready(function () {
+        // 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');
+    });
+</script>

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

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="__lang__">
+<head>
+    <bx_injection:injection_head_begin />
+
+    <meta http-equiv="Content-Type" content="text/html; charset=__page_charset__" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+    <title>__page_header__</title>
+    <base href="<bx_url_root />" />
+
+    __meta_info__
+    __page_robots__
+
+    <bx_include_css_styles />
+    <bx_include_css_system />
+    <bx_include_css />
+
+    __dol_images__
+    __dol_lang__
+    __dol_options__
+
+    <bx_include_js_system />
+    <bx_include_js />
+
+    <bx_include_auto:_header_js.html />
+    <bx_include_auto:_header_js_spinner.html />
+    <bx_include_auto:_header_js_custom.html />
+
+    __extra_js__
+
+    __system_injection_head__
+    <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" dir="__lang_direction__" <bx_injection:injection_body /> >
+    __system_injection_header__
+    <bx_injection:injection_header />
+    __page_main_code__
+    __system_injection_footer__
+    <bx_injection:injection_footer />
+</body>
+</html>

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

@@ -0,0 +1,7 @@
+<div id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom bx-def-valign-center bx-clearfix" bx_report_data_count="__count__">
+    <div class="sys-action-element-holder __style_prefix__-element-holder">__do_report__</div>
+    <bx_if:show_counter>
+        <div class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-sec-left bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</div>
+    </bx_if:show_counter>
+    __script__
+</div>

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

@@ -0,0 +1,3 @@
+<span id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom bx-def-valign-center" bx_report_data_count="__count__">
+    <span class="sys-action-element-holder __style_prefix__-element-holder group flex items-center p-1 px-2 space-x-1">__do_report__</span><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter>__script__
+</span>

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

@@ -16,38 +16,6 @@ class BxTemplPageHome extends BxBasePageHome
     {
         parent::__construct($aObject, $oTemplate);
     }
-
-    protected function _getBlockRaw($aBlock)
-    {
-        $sResult = parent::_getBlockRaw($aBlock);
-
-        if(strpos($aBlock['title'], 'splash') !== false) {
-            $oPermalink = BxDolPermalinks::getInstance();
-            $sLinkTerms = BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=terms');
-            $sLinkPrivacy = BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=privacy');
-
-            $iMembers = 0;
-            if($aMembers = BxDolAccountQuery::getInstance()->getAccounts(['type' => 'confirmed']))
-                $iMembers = count($aMembers);
-
-            $iPosts = 0;
-            $aModules = bx_srv('system', 'get_modules_by_type', ['content']);
-            foreach($aModules as $aModule)
-                if(BxDolRequest::serviceExists($aModule['name'], 'get_all'))
-                    $iPosts += bx_srv($aModule['name'], 'get_all', [['type' => 'all', 'count' => true]]);
-
-            $iComments = BxDolCmtsQuery::getInfoBy(['type' => 'all', 'count' => true]);
-
-            $sResult = BxDolTemplate::getInstance()->parseHtmlByContent($sResult, array(
-                'members' => $iMembers,
-                'posts' => $iPosts,
-                'comments' => $iComments,
-                'login_agreement' => _t('_bx_artificer_txt_splash_login_agreement', $sLinkTerms, $sLinkPrivacy)
-            ));
-        }
-
-        return $sResult;
-    }
 }
 
 /** @} */

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 border border-transparent rounded-full space-x-1 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">__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 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>

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

@@ -53,6 +53,14 @@
     .bx-menu-custom-hor.bx-menu-object-sys_create_post li.bx-menu-tab-active a {
         @apply rounded ring-1 ring-gray-200 dark:ring-gray-800;
     }
+    
+    .bx-popup .bx-menu-ver > li:hover {
+        @apply group hover:text-gray-900 dark:hover:text-gray-100;
+    }
+
+    .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;
+    }
 
     /* Timeline */
     .bx-menu-custom-hor.bx-menu-object-bx_timeline_menu_view li.bx-menu-tab-active a {

modules/boonex/organizations/template/unit.html

@@ -1 +1 @@
-<bx_include_base:../modules/base/profile/template/unit.html />
+<bx_include_auto_mod_profile:unit_with_cover.html />

modules/boonex/organizations/template/unit_live_search.html

@@ -1 +1 @@
-<bx_include_base:../modules/base/profile/template/unit_live_search.html />
+<bx_include_auto_mod_profile:unit_live_search.html />

modules/boonex/organizations/template/unit_with_cover.html

@@ -1 +1 @@
-<bx_include_base:../modules/base/profile/template/unit_with_cover.html />
+<bx_include_auto_mod_profile:unit_with_cover.html />

modules/boonex/organizations/template/unit_with_cover_showcase.html

@@ -1 +1 @@
-<bx_include_base:../modules/base/profile/template/unit_with_cover_showcase.html />
+<bx_include_auto_mod_profile:unit_with_cover_showcase.html />

splash.php

@@ -36,8 +36,8 @@ function getPageMainCode()
     	'login_form' => $sLoginForm,
         'login_form_in_box' => DesignBoxContent(_t('_sys_txt_splash_login'), $sLoginForm, BX_DB_PADDING_DEF)
     ));
-        
-    return $s;
+
+    return bx_process_macros($s);
 }
 
 check_logged();

template/scripts/BxBasePageHome.php

@@ -56,8 +56,6 @@ class BxBasePageHome extends BxTemplPage
             if(!isLogged()) {
                 $sJoinForm = BxDolService::call('system', 'create_account_form', array(), 'TemplServiceAccount');
                 $sLoginForm = BxDolService::call('system', 'login_form', array(), 'TemplServiceLogin');
-                $sLoginFormOnly = BxDolService::call('system', 'login_form', array('no_join_text no_auth_buttons'), 'TemplServiceLogin');
-                $sLoginSocial = BxDolService::call('system', 'member_auth_code', array(), 'TemplServiceLogin');
             }
 
             $oTemplate = BxDolTemplate::getInstance();
@@ -69,9 +67,6 @@ class BxBasePageHome extends BxTemplPage
                 'login_link' => BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=login'),
                 'login_form' => $sLoginForm,
                 'login_form_in_box' => !empty($sLoginForm) ? DesignBoxContent(_t('_sys_txt_splash_login'), $sLoginForm, BX_DB_PADDING_DEF) : '',
-                'login_form_only' => $sLoginFormOnly,
-                'login_form_only_in_box' => !empty($sLoginFormOnly) ? DesignBoxContent(_t('_sys_txt_splash_login'), $sLoginFormOnly, BX_DB_PADDING_DEF) : '',
-                'login_social' => $sLoginSocial,
             ));
         }