AntonLV 9 лет назад
Родитель
Сommit
242a57ca4e

+ 7 - 7
modules/boonex/organizations/install/langs/en.xml

@@ -102,10 +102,10 @@
 	<string name="_bx_orgs_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
 	<string name="_bx_orgs_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Our Subscriptions]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Our Subscriptions]]></string>
-    <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Our Subscribers]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Our Subscribers]]></string>
+	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Subscriptions]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Subscriptions]]></string>
+    <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Subscribers]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Subscribers]]></string>
 	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Featured Organizations]]></string>
 	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[New Organizations]]></string>
@@ -174,10 +174,10 @@
     <string name="_bx_orgs_menu_item_title_manage_my_organizations"><![CDATA[{addon} organizations]]></string>
     <string name="_bx_orgs_menu_item_title_system_favorites"><![CDATA[Favorite Organizations]]></string>
     <string name="_bx_orgs_menu_item_title_favorites"><![CDATA[{addon} favorite organizations]]></string>
-    <string name="_bx_orgs_menu_item_title_system_subscriptions"><![CDATA[Our subscriptions]]></string>
+    <string name="_bx_orgs_menu_item_title_system_subscriptions"><![CDATA[Subscriptions]]></string>
     <string name="_bx_orgs_menu_item_title_subscriptions"><![CDATA[{addon} subscriptions]]></string>
-    <string name="_bx_orgs_menu_item_title_system_subscribed_me"><![CDATA[Subscribed Us]]></string>
-    <string name="_bx_orgs_menu_item_title_subscribed_me"><![CDATA[{addon} subscribed us]]></string>
+    <string name="_bx_orgs_menu_item_title_system_subscribed_me"><![CDATA[Subscribers]]></string>
+    <string name="_bx_orgs_menu_item_title_subscribed_me"><![CDATA[{addon} subscribers]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_recent"><![CDATA[New]]></string>
     <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[New]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>

+ 2 - 2
modules/boonex/organizations/install/sql/enable.sql

@@ -244,8 +244,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_profile_stats', 'bx_organizations', 'profile-stats-friend-requests', '_bx_orgs_menu_item_title_system_friend_requests', '_bx_orgs_menu_item_title_friend_requests', 'page.php?i=organization-profile-friends&profile_id={member_id}', '', '', 'briefcase col-red2', '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, 0, @iNotifMenuOrder + 1),
 ('sys_profile_stats', 'bx_organizations', 'profile-stats-manage-organizations', '_bx_orgs_menu_item_title_system_manage_my_organizations', '_bx_orgs_menu_item_title_manage_my_organizations', 'page.php?i=organizations-manage', '', '_self', 'briefcase col-red2', 'a:2:{s:6:"module";s:16:"bx_organizations";s:6:"method";s:41:"get_menu_addon_manage_tools_profile_stats";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 2),
 ('sys_profile_stats', 'bx_organizations', 'profile-stats-favorite-organizations', '_bx_orgs_menu_item_title_system_favorites', '_bx_orgs_menu_item_title_favorites', 'page.php?i=organization-profile-favorites&profile_id={member_id}', '', '', 'star col-red2', 'a:2:{s:6:"module";s:16:"bx_organizations";s:6:"method";s:38:"get_menu_addon_favorites_profile_stats";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 3),
-('sys_profile_stats', 'bx_organizations', 'profile-stats-subscriptions', '_bx_orgs_menu_item_title_system_subscriptions', '_bx_orgs_menu_item_title_subscriptions', 'page.php?i=organization-profile-subscriptions&profile_id={member_id}', '', '_self', 'briefcase col-red2', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:25:"get_connected_content_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 4),
-('sys_profile_stats', 'bx_organizations', 'profile-stats-subscribed-me', '_bx_orgs_menu_item_title_system_subscribed_me', '_bx_orgs_menu_item_title_subscribed_me', 'page.php?i=organization-profile-subscribed-me&profile_id={member_id}', '', '_self', 'briefcase col-red2', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:28:"get_connected_initiators_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 5);
+('sys_profile_stats', 'bx_organizations', 'profile-stats-subscriptions', '_bx_orgs_menu_item_title_system_subscriptions', '_bx_orgs_menu_item_title_subscriptions', 'page.php?i=organization-profile-subscriptions&profile_id={member_id}#subscriptions', '', '_self', 'rss col-red2', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:25:"get_connected_content_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 4),
+('sys_profile_stats', 'bx_organizations', 'profile-stats-subscribed-me', '_bx_orgs_menu_item_title_system_subscribed_me', '_bx_orgs_menu_item_title_subscribed_me', 'page.php?i=organization-profile-subscribed-me&profile_id={member_id}#subscribers', '', '_self', 'rss col-red2', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:28:"get_connected_initiators_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 5);
 
 -- MENU: manage tools submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 

+ 7 - 7
modules/boonex/persons/install/langs/en.xml

@@ -100,10 +100,10 @@
 	<string name="_bx_persons_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[My Subscriptions]]></string>
-	<string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[My Subscriptions]]></string>
-	<string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[My Subscribers]]></string>
-    <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[My Subscribers]]></string>
+	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[Subscriptions]]></string>
+	<string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[Subscriptions]]></string>
+	<string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[Subscribers]]></string>
+    <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[Subscribers]]></string>
 	<string name="_bx_persons_page_block_title_featured_profiles"><![CDATA[Featured People]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[New People]]></string>
@@ -170,10 +170,10 @@
     <string name="_bx_persons_menu_item_title_manage_my_profiles"><![CDATA[{addon} profiles]]></string>
     <string name="_bx_persons_menu_item_title_system_favorites"><![CDATA[Favorite Persons]]></string>
     <string name="_bx_persons_menu_item_title_favorites"><![CDATA[{addon} favorite persons]]></string>    
-    <string name="_bx_persons_menu_item_title_system_subscriptions"><![CDATA[My subscriptions]]></string>
+    <string name="_bx_persons_menu_item_title_system_subscriptions"><![CDATA[Subscriptions]]></string>
     <string name="_bx_persons_menu_item_title_subscriptions"><![CDATA[{addon} subscriptions]]></string>
-    <string name="_bx_persons_menu_item_title_system_subscribed_me"><![CDATA[Subscribed Me]]></string>
-    <string name="_bx_persons_menu_item_title_subscribed_me"><![CDATA[{addon} subscribed me]]></string>
+    <string name="_bx_persons_menu_item_title_system_subscribed_me"><![CDATA[Subscribers]]></string>
+    <string name="_bx_persons_menu_item_title_subscribed_me"><![CDATA[{addon} subscribers]]></string>
     <string name="_bx_persons_menu_item_title_system_entries_recent"><![CDATA[New]]></string>
     <string name="_bx_persons_menu_item_title_entries_recent"><![CDATA[New]]></string>
     <string name="_bx_persons_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>

+ 2 - 2
modules/boonex/persons/install/sql/enable.sql

@@ -232,8 +232,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_profile_stats', 'bx_persons', 'profile-stats-friend-requests', '_bx_persons_menu_item_title_system_friend_requests', '_bx_persons_menu_item_title_friend_requests', 'page.php?i=persons-profile-friends&profile_id={member_id}', '', '', 'group col-blue3', '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, 0, @iNotifMenuOrder + 1),
 ('sys_profile_stats', 'bx_persons', 'profile-stats-manage-profiles', '_bx_persons_menu_item_title_system_manage_my_profiles', '_bx_persons_menu_item_title_manage_my_profiles', 'page.php?i=persons-manage', '', '_self', 'group col-blue3', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:41:"get_menu_addon_manage_tools_profile_stats";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 2),
 ('sys_profile_stats', 'bx_persons', 'profile-stats-favorite-persons', '_bx_persons_menu_item_title_system_favorites', '_bx_persons_menu_item_title_favorites', 'page.php?i=persons-profile-favorites&profile_id={member_id}', '', '', 'star col-blue3', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:38:"get_menu_addon_favorites_profile_stats";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 3),
-('sys_profile_stats', 'bx_persons', 'profile-stats-subscriptions', '_bx_persons_menu_item_title_system_subscriptions', '_bx_persons_menu_item_title_subscriptions', 'page.php?i=persons-profile-subscriptions&profile_id={member_id}', '', '_self', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:25:"get_connected_content_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 4),
-('sys_profile_stats', 'bx_persons', 'profile-stats-subscribed-me', '_bx_persons_menu_item_title_system_subscribed_me', '_bx_persons_menu_item_title_subscribed_me', 'page.php?i=persons-profile-subscriptions&profile_id={member_id}', '', '_self', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:28:"get_connected_initiators_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 5);
+('sys_profile_stats', 'bx_persons', 'profile-stats-subscriptions', '_bx_persons_menu_item_title_system_subscriptions', '_bx_persons_menu_item_title_subscriptions', 'page.php?i=persons-profile-subscriptions&profile_id={member_id}#subscriptions', '', '_self', 'rss col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:25:"get_connected_content_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 4),
+('sys_profile_stats', 'bx_persons', 'profile-stats-subscribed-me', '_bx_persons_menu_item_title_system_subscribed_me', '_bx_persons_menu_item_title_subscribed_me', 'page.php?i=persons-profile-subscriptions&profile_id={member_id}#subscribers', '', '_self', 'rss col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:28:"get_connected_initiators_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 5);
 
 -- MENU: manage tools submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 

+ 6 - 6
modules/boonex/russian/data/langs/bx_organizations/ru.xml

@@ -102,10 +102,10 @@
 	<string name="_bx_orgs_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - Друзья]]></string>
 	<string name="_bx_orgs_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Наши подписки]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Наши подписки]]></string>
-    <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Наши подписчики]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Наши подписчики]]></string>
+	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Подписки]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Подписки]]></string>
+    <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Подписчики]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Подписчики]]></string>
 	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Действия]]></string>
 	<string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Продвинутые организации]]></string>
 	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Последние добавленные организации]]></string>
@@ -174,9 +174,9 @@
     <string name="_bx_orgs_menu_item_title_manage_my_organizations"><![CDATA[{addon} организаций]]></string>
     <string name="_bx_orgs_menu_item_title_system_favorites"><![CDATA[Избранные организации]]></string>
     <string name="_bx_orgs_menu_item_title_favorites"><![CDATA[{addon} избранные организации]]></string>
-    <string name="_bx_orgs_menu_item_title_system_subscriptions"><![CDATA[Наши подписки]]></string>
+    <string name="_bx_orgs_menu_item_title_system_subscriptions"><![CDATA[Подписки]]></string>
     <string name="_bx_orgs_menu_item_title_subscriptions"><![CDATA[{addon} подписки]]></string>
-    <string name="_bx_orgs_menu_item_title_system_subscribed_me"><![CDATA[Наши подписчики]]></string>
+    <string name="_bx_orgs_menu_item_title_system_subscribed_me"><![CDATA[Подписчики]]></string>
     <string name="_bx_orgs_menu_item_title_subscribed_me"><![CDATA[{addon} подписчика]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_recent"><![CDATA[Новые Организации]]></string>
     <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[Новые Организации]]></string>

+ 6 - 6
modules/boonex/russian/data/langs/bx_persons/ru.xml

@@ -100,10 +100,10 @@
 	<string name="_bx_persons_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - Друзья]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[Мои подписки]]></string>
-    <string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[Мои подписки]]></string>
-    <string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[Мои подписчики]]></string>
-    <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[Мои подписчики]]></string>
+	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[Подписки]]></string>
+    <string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[Подписки]]></string>
+    <string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[Подписчики]]></string>
+    <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[Подписчики]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Действия]]></string>
 	<string name="_bx_persons_page_block_title_featured_profiles"><![CDATA[Продвинутые Пользователи]]></string>
 	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[Последние Присоединившиеся Пользователи]]></string>
@@ -170,9 +170,9 @@
     <string name="_bx_persons_menu_item_title_manage_my_profiles"><![CDATA[{addon} профили]]></string>
     <string name="_bx_persons_menu_item_title_system_favorites"><![CDATA[Избранные персоны]]></string>
     <string name="_bx_persons_menu_item_title_favorites"><![CDATA[{addon} избранные персоны]]></string>
-    <string name="_bx_persons_menu_item_title_system_subscriptions"><![CDATA[Мои подписки]]></string>
+    <string name="_bx_persons_menu_item_title_system_subscriptions"><![CDATA[Подписки]]></string>
     <string name="_bx_persons_menu_item_title_subscriptions"><![CDATA[{addon} подписки]]></string>
-    <string name="_bx_persons_menu_item_title_system_subscribed_me"><![CDATA[Мои подписчики]]></string>
+    <string name="_bx_persons_menu_item_title_system_subscribed_me"><![CDATA[Подписчики]]></string>
     <string name="_bx_persons_menu_item_title_subscribed_me"><![CDATA[{addon} подписчика]]></string>    
     <string name="_bx_persons_menu_item_title_system_entries_public"><![CDATA[Публичные]]></string>
     <string name="_bx_persons_menu_item_title_entries_recent"><![CDATA[Новые профили]]></string>

+ 2 - 0
template/connections_list.html

@@ -0,0 +1,2 @@
+<a class="bx-anchor-invisible" name="__name__"></a>
+__content__

+ 8 - 2
template/scripts/BxBaseServiceConnections.php

@@ -121,7 +121,10 @@ class BxBaseServiceConnections extends BxDol
         if (!$oGrid)
             return false;
 
-        return $oGrid->getCode();
+        return BxDolTemplate::getInstance()->parseHtmlByName('connections_list.html', array(
+            'name' => 'subscriptions',
+            'content' => $oGrid->getCode()
+        ));
     }
 
 	/**
@@ -144,7 +147,10 @@ class BxBaseServiceConnections extends BxDol
         if (!$oGrid)
             return false;
 
-        return $oGrid->getCode();
+        return BxDolTemplate::getInstance()->parseHtmlByName('connections_list.html', array(
+            'name' => 'subscribers',
+            'content' => $oGrid->getCode()
+        ));
     }
 
     /*