Răsfoiți Sursa

Ticket #4365 - Connections page: Move link in Profile Stats menu.

AntonLV 3 ani în urmă
părinte
comite
cf2fbc6315

+ 2 - 2
install/sql/system.sql

@@ -4785,7 +4785,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- profile stats
 -- profile stats
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
 ('sys_profile_stats', 'system', 'profile-stats-profile', '_sys_menu_item_title_system_profile', '_sys_menu_item_title_profile', '{member_url}', '', '', 'user', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:27:"get_menu_addon_profile_edit";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', '', 2147483646, 1, 0, 0),
 ('sys_profile_stats', 'system', 'profile-stats-profile', '_sys_menu_item_title_system_profile', '_sys_menu_item_title_profile', '{member_url}', '', '', 'user', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:27:"get_menu_addon_profile_edit";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', '', 2147483646, 1, 0, 0),
-('sys_profile_stats', 'system', 'friend-suggestions', '_sys_menu_item_title_system_connections', '_sys_menu_item_title_connections', 'page.php?i=friend-suggestions', '', '', 'users', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:34:"get_menu_addon_profile_connections";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', '', 2147483646, 1, 1, 1);
+('sys_profile_stats', 'system', 'friend-suggestions', '_sys_menu_item_title_system_connections', '_sys_menu_item_title_connections', 'page.php?i=friend-suggestions', '', '', 'users', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:31:"get_unconfirmed_connections_num";s:6:"params";a:1:{i:0;s:20:"sys_profiles_friends";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 1, 1);
 
 
 -- wiki menu
 -- wiki menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `visibility_custom`, `active`, `copyable`, `editable`, `order`) VALUES 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `visibility_custom`, `active`, `copyable`, `editable`, `order`) VALUES 
@@ -4804,7 +4804,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `visibility_custom`, `active`, `copyable`, `order`) VALUES
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `visibility_custom`, `active`, `copyable`, `order`) VALUES
 ('sys_con_submenu', 'system', 'friends', '', '_sys_menu_item_title_con_friends', 'page.php?i=friends', '', '', '', '', '', 2147483647, '', 1, 1, 1),
 ('sys_con_submenu', 'system', 'friends', '', '_sys_menu_item_title_con_friends', 'page.php?i=friends', '', '', '', '', '', 2147483647, '', 1, 1, 1),
 ('sys_con_submenu', 'system', 'friend-suggestions', '', '_sys_menu_item_title_recom_friends', 'page.php?i=friend-suggestions', '', '', '', '', '', 2147483647, '', 1, 1, 2),
 ('sys_con_submenu', 'system', 'friend-suggestions', '', '_sys_menu_item_title_recom_friends', 'page.php?i=friend-suggestions', '', '', '', '', '', 2147483647, '', 1, 1, 2),
-('sys_con_submenu', 'system', 'friend-requests', '', '_sys_menu_item_title_con_friend_requests', 'page.php?i=friend-requests', '', '', '', '', '', 2147483647, '', 1, 1, 3),
+('sys_con_submenu', 'system', 'friend-requests', '', '_sys_menu_item_title_con_friend_requests', 'page.php?i=friend-requests', '', '', '', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:31:"get_unconfirmed_connections_num";s:6:"params";a:1:{i:0;s:20:"sys_profiles_friends";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483647, '', 1, 1, 3),
 ('sys_con_submenu', 'system', 'sent-friend-requests', '', '_sys_menu_item_title_con_friend_requested', 'page.php?i=sent-friend-requests', '', '', '', '', '', 2147483647, '', 1, 1, 4),
 ('sys_con_submenu', 'system', 'sent-friend-requests', '', '_sys_menu_item_title_con_friend_requested', 'page.php?i=sent-friend-requests', '', '', '', '', '', 2147483647, '', 1, 1, 4),
 ('sys_con_submenu', 'system', 'follow-suggestions', '', '_sys_menu_item_title_recom_subscriptions', 'page.php?i=follow-suggestions', '', '', '', '', '', 2147483647, '', 1, 1, 5),
 ('sys_con_submenu', 'system', 'follow-suggestions', '', '_sys_menu_item_title_recom_subscriptions', 'page.php?i=follow-suggestions', '', '', '', '', '', 2147483647, '', 1, 1, 5),
 ('sys_con_submenu', 'system', 'followers', '', '_sys_menu_item_title_con_followers', 'page.php?i=followers', '', '', '', '', '', 2147483647, '', 1, 1, 6),
 ('sys_con_submenu', 'system', 'followers', '', '_sys_menu_item_title_con_followers', 'page.php?i=followers', '', '', '', '', '', 2147483647, '', 1, 1, 6),

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

@@ -1,7 +1,15 @@
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ inline-flex items-stretch w-max">
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ inline-flex items-stretch w-max">
     <bx_repeat:menu_items>
     <bx_repeat:menu_items>
         <li class="bx-menu-item bx-menu-item-__name__ __class_add__ flex">
         <li class="bx-menu-item bx-menu-item-__name__ __class_add__ flex">
-            <a class="group block relative py-4 px-4 text-gray-500 hover:bg-gray-100 dark:hover:bg-gray-700 hover:text-gray-700 dark:hover:text-gray-200 whitespace-nowrap text-sm font-medium text-center hover:bg-transparent focus:z-10 box-sizing" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>__title__<span class="bx-mi-underline absolute inset-x-0 bottom-0 h-0.5 group-hover:bg-gray-500 rounded-md"></span></a>
+            <a class="group block relative py-4 px-4 text-gray-500 hover:bg-gray-100 dark:hover:bg-gray-700 hover:text-gray-700 dark:hover:text-gray-200 whitespace-nowrap text-sm font-medium text-center hover:bg-transparent focus:z-10 box-sizing" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+                <span class="bx-menu-item-title">__title__</span>
+                <bx_if:addon>
+                    <span class="bx-menu-addon bx-stl-mia ml-1">
+                        <span class="bx-menu-addon-cnt">__addon__</span>
+                    </span>
+                </bx_if:addon>
+                <span class="bx-mi-underline absolute inset-x-0 bottom-0 h-0.5 group-hover:bg-gray-500 rounded-md"></span>
+            </a>
         </li>
         </li>
     </bx_repeat:menu_items>
     </bx_repeat:menu_items>
 </ul>
 </ul>

+ 14 - 5
modules/boonex/lucid/data/template/system/menu_main_submenu.html

@@ -2,11 +2,20 @@
 	<div class="bx-menu-main-submenu-group">
 	<div class="bx-menu-main-submenu-group">
 		<ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
 		<ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
 		    <bx_repeat:menu_items>
 		    <bx_repeat:menu_items>
-		        <li class="bx-def-padding-sec-right bx-def-padding-sec-left __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>
-					<bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
-					<bx_if:image><img src="__icon_url__" /></bx_if:image>
-					<bx_if:icon-html>__icon__</bx_if:icon-html>
-					<span>__title__</span></a><div class="bx-mms-item-hr"></div></li>
+		        <li class="bx-def-padding-sec-right bx-def-padding-sec-left __class_add__">
+                            <a href="__link__" onclick="__onclick__"__attrs__>
+                                <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
+                                <bx_if:image><img src="__icon_url__" /></bx_if:image>
+                                <bx_if:icon-html>__icon__</bx_if:icon-html>
+                                <span class="bx-menu-item-title">__title__</span>
+                                <bx_if:addon>
+                                    <span class="bx-menu-addon">
+                                        <span class="bx-menu-addon-cnt bx-def-label menu py-0.5">__addon__</span>
+                                    </span>
+                                </bx_if:addon>
+                            </a>
+                            <div class="bx-mms-item-hr"></div>
+                        </li>
 		    </bx_repeat:menu_items>
 		    </bx_repeat:menu_items>
 		</ul>
 		</ul>
 		<div class="bx-menu-main-submenu-hr"></div>
 		<div class="bx-menu-main-submenu-hr"></div>

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


+ 10 - 1
template/menu_main_submenu.html

@@ -1,5 +1,14 @@
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
     <bx_repeat:menu_items>
-        <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>__title__</a></li>
+        <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__">
+            <a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+                <span class="bx-menu-item-title">__title__</span>
+                <bx_if:addon>
+                    <span class="bx-menu-addon">
+                        <span class="bx-menu-addon-cnt bx-def-label menu py-1">__addon__</span>
+                    </span>
+                </bx_if:addon>
+            </a>
+        </li>
     </bx_repeat:menu_items>
     </bx_repeat:menu_items>
 </ul>
 </ul>

+ 10 - 0
template/scripts/BxBaseMenuSubmenu.php

@@ -52,6 +52,16 @@ class BxBaseMenuSubmenu extends BxTemplMenu
         $this->_iContentId = $iContentId;
         $this->_iContentId = $iContentId;
     }
     }
 
 
+    public function getDisplayAddons()
+    {
+        return $this->_oObjectSubmenu->getDisplayAddons();
+    }   
+
+    public function setDisplayAddons($b)
+    {
+        return $this->_oObjectSubmenu->setDisplayAddons($b);
+    }
+
     /**
     /**
      * Get current menu in submenu
      * Get current menu in submenu
      * @return menu object name
      * @return menu object name

+ 2 - 1
template/scripts/BxBasePageConnections.php

@@ -16,7 +16,7 @@ class BxBasePageConnections extends BxTemplPage
         $iProfileId = bx_get_logged_profile_id();
         $iProfileId = bx_get_logged_profile_id();
         if(!$iProfileId)
         if(!$iProfileId)
             return;
             return;
-        
+
         if(($oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu')) !== false) {
         if(($oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu')) !== false) {
             $sMenuSubmenu = 'sys_con_submenu';
             $sMenuSubmenu = 'sys_con_submenu';
             $oMenuSubmenu->setObjectSubmenu($sMenuSubmenu, [
             $oMenuSubmenu->setObjectSubmenu($sMenuSubmenu, [
@@ -24,6 +24,7 @@ class BxBasePageConnections extends BxTemplPage
                 'link' => '', 
                 'link' => '', 
                 'icon' => ''
                 'icon' => ''
             ]);
             ]);
+            $oMenuSubmenu->setDisplayAddons(true);
         }
         }
 
 
         $this->addMarkers([
         $this->addMarkers([

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff