Просмотр исходного кода

#103 - new block titles and new "active profiles" page for Orgs and Persons modules

Alex Trofimov 11 лет назад
Родитель
Сommit
1632ba2f97

+ 5 - 0
modules/base/profile/classes/BxBaseModProfileModule.php

@@ -150,6 +150,11 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolPro
         return $this->_serviceBrowse ('recent', false, BX_DB_PADDING_DEF, $bDisplayEmptyMsg);
     }
 
+    public function serviceBrowseActiveProfiles ($bDisplayEmptyMsg = false)
+    {
+        return $this->_serviceBrowse ('active', false, BX_DB_PADDING_DEF, $bDisplayEmptyMsg);
+    }
+
     public function serviceBrowseConnections ($iProfileId, $sObjectConnections = 'sys_profiles_friends', $sConnectionsType = 'content', $iMutual = false, $iDesignBox = BX_DB_PADDING_DEF, $iProfileId2 = 0)
     {
         return $this->_serviceBrowse (

+ 18 - 5
modules/boonex/organizations/classes/BxOrgsSearchResult.php

@@ -38,6 +38,13 @@ class BxOrgsSearchResult extends BxBaseModProfileSearchResult
                     'onField' => 'id',
                     'joinFields' => array('id', 'org_name', 'picture', 'added'),
                 ),
+                'account' => array(
+                    'type' => 'INNER',
+                    'table' => 'sys_accounts',
+                    'mainField' => 'account_id',
+                    'onField' => 'id',
+                    'joinFields' => array(),
+                ),
             ),
             'paginate' => array('perPage' => 20, 'start' => 0),
             'sorting' => 'none',
@@ -80,9 +87,17 @@ class BxOrgsSearchResult extends BxBaseModProfileSearchResult
             case 'recent':
                 $this->aCurrent['rss']['link'] = 'modules/?r=orgs/rss/' . $sMode;
                 $this->aCurrent['title'] = _t('_bx_orgs_page_title_browse_recent');
+                $this->aCurrent['sorting'] = 'last';
                 $this->sBrowseUrl = 'page.php?i=organizations-home';
                 break;
 
+            case 'active':
+                $this->aCurrent['rss']['link'] = 'modules/?r=orgs/rss/' . $sMode;
+                $this->aCurrent['title'] = _t('_bx_orgs_page_title_browse_active');
+                $this->aCurrent['sorting'] = 'active';
+                $this->sBrowseUrl = 'page.php?i=organizations-active';
+                break;
+
             case '': // search results
                 $this->sBrowseUrl = BX_DOL_SEARCH_KEYWORD_PAGE;
                 $this->aCurrent['title'] = _t('_bx_orgs');
@@ -101,12 +116,10 @@ class BxOrgsSearchResult extends BxBaseModProfileSearchResult
     {
         switch ($this->aCurrent['sorting']) {
         case 'none':
-            return array();
+            return array('order' => ' ORDER BY `sys_accounts`.`logged` DESC ');
         case 'last':
-        default:
-            $aSql = array();
-            $aSql['order'] = " ORDER BY `bx_organizations_data`.`added` DESC";
-            return $aSql;
+        default:                        
+            return array('order' => ' ORDER BY `bx_organizations_data`.`added` DESC ');
         }
     }
 

+ 13 - 6
modules/boonex/organizations/install/langs/en.xml

@@ -53,18 +53,21 @@
 	<string name="_bx_orgs_page_title_sys_view_profile"><![CDATA[View Organization's Profile]]></string>
 	<string name="_bx_orgs_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_orgs_page_title_browse"><![CDATA[Organizations]]></string>
-	<string name="_bx_orgs_page_title_browse_recent"><![CDATA[Organizations]]></string>
+	<string name="_bx_orgs_page_title_browse_active"><![CDATA[Recently Active Organizations]]></string>
+	<string name="_bx_orgs_page_title_browse_recent"><![CDATA[Recently Added Organizations]]></string>
 	<string name="_bx_orgs_page_title_browse_connections"><![CDATA[{0} connections]]></string>
 	<string name="_bx_orgs_page_title_browse_connections_mutual"><![CDATA[{0} and {1} mutual connections]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_info"><![CDATA[Profile Info]]></string>
 	<string name="_bx_orgs_page_title_profile_info"><![CDATA[Info about {display_name}]]></string>
-	<string name="_bx_orgs_page_title_sys_home"><![CDATA[Organizations Home]]></string>
-	<string name="_bx_orgs_page_title_home"><![CDATA[Organizations]]></string>
+	<string name="_bx_orgs_page_title_sys_recent"><![CDATA[Recently Added Organizations]]></string>
+	<string name="_bx_orgs_page_title_recent"><![CDATA[Recently Added Organizations]]></string>
 	<string name="_bx_orgs_page_title_sys_manage"><![CDATA[Manage Own Organizations]]></string>
 	<string name="_bx_orgs_page_title_sys_manage_administration"><![CDATA[Manage All Organizations]]></string>
 	<string name="_bx_orgs_page_title_manage"><![CDATA[Manage Organizations]]></string>
+	<string name="_bx_orgs_page_title_sys_active"><![CDATA[Recently Active People]]></string>
+	<string name="_bx_orgs_page_title_active"><![CDATA[Recently Active People]]></string>
 
 	<string name="_bx_orgs_page_block_title_create_profile"><![CDATA[Create Organization's Profile]]></string>
 	<string name="_bx_orgs_page_block_title_edit_profile"><![CDATA[Edit Profile]]></string>
@@ -78,10 +81,12 @@
 	<string name="_bx_orgs_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_block_title_profile_cover"><![CDATA[Profile Cover]]></string>
 	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Actions]]></string>
-	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Recent Organizations]]></string>
+	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Recently Added Organizations]]></string>
 	<string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Manage Own Organizations]]></string>
 	<string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Manage All Organizations]]></string>
 	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Manage Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Recently Active Organizations]]></string>
+
     <string name="_bx_orgs_page_block_title_categories"><![CDATA[Organization categories]]></string>
 
     <string name="_bx_orgs_menu_title_submenu"><![CDATA[Organizations Submenu]]></string>
@@ -134,8 +139,8 @@
     <string name="_bx_orgs_menu_item_title_friend_requests"><![CDATA[{addon} friend requests]]></string>
     <string name="_bx_orgs_menu_item_title_system_manage_my_organizations"><![CDATA[My organizations]]></string>
     <string name="_bx_orgs_menu_item_title_manage_my_organizations"><![CDATA[{addon} organizations]]></string>
-    <string name="_bx_orgs_menu_item_title_system_entries_public"><![CDATA[Public]]></string>
-    <string name="_bx_orgs_menu_item_title_entries_public"><![CDATA[Public]]></string>
+    <string name="_bx_orgs_menu_item_title_system_entries_recent"><![CDATA[Recent]]></string>
+    <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[Recent]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_orgs_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_home"><![CDATA[Orgs]]></string>
@@ -144,6 +149,8 @@
 	<string name="_bx_orgs_menu_item_title_admt_organizations"><![CDATA[Organizations - {addon} unapproved]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_my"><![CDATA[My Organizations]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_all"><![CDATA[All Organizations]]></string>
+	<string name="_bx_orgs_menu_item_title_system_entries_active"><![CDATA[Active]]></string>
+	<string name="_bx_orgs_menu_item_title_entries_active"><![CDATA[Active]]></string>
 
 	<string name="_bx_orgs_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
 	<string name="_bx_orgs_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>

+ 12 - 3
modules/boonex/organizations/install/sql/enable.sql

@@ -80,11 +80,19 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 -- PAGE: module home
 
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_organizations_home', '_bx_orgs_page_title_sys_home', '_bx_orgs_page_title_home', 'bx_organizations', 5, 2147483647, 1, 'organizations-home', 'page.php?i=organizations-home', '', '', '', 0, 1, 0, 'BxOrgsPageBrowse', 'modules/boonex/organizations/classes/BxOrgsPageBrowse.php');
+('bx_organizations_home', '_bx_orgs_page_title_sys_recent', '_bx_orgs_page_title_recent', 'bx_organizations', 5, 2147483647, 1, 'organizations-home', 'page.php?i=organizations-home', '', '', '', 0, 1, 0, 'BxOrgsPageBrowse', 'modules/boonex/organizations/classes/BxOrgsPageBrowse.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
 ('bx_organizations_home', 1, 'bx_organizations', '_bx_orgs_page_block_title_latest_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:22:\"browse_recent_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
 
+-- PAGE: active profiles
+
+INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
+('bx_organizations_active', '_bx_orgs_page_title_sys_active', '_bx_orgs_page_title_active', 'bx_organizations', 5, 2147483647, 1, 'organizations-active', 'page.php?i=organizations-active', '', '', '', 0, 1, 0, 'BxOrgsPageBrowse', 'modules/boonex/organizations/classes/BxOrgsPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
+('bx_organizations_active', 1, 'bx_organizations', '_bx_orgs_page_block_title_active_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
+
 -- PAGE: module manage own
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_organizations_manage', '_bx_orgs_page_title_sys_manage', '_bx_orgs_page_title_manage', 'bx_organizations', 5, 2147483647, 1, 'organizations-manage', 'page.php?i=organizations-manage', '', '', '', 0, 1, 0, 'BxOrgsPageBrowse', 'modules/boonex/organizations/classes/BxOrgsPageBrowse.php');
@@ -170,8 +178,9 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_organizations_submenu', 'bx_organizations', '_bx_orgs_menu_set_title_submenu', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_organizations_submenu', 'bx_organizations', 'organizations-home', '_bx_orgs_menu_item_title_system_entries_public', '_bx_orgs_menu_item_title_entries_public', 'page.php?i=organizations-home', '', '', '', '', 2147483647, 1, 1, 1),
-('bx_organizations_submenu', 'bx_organizations', 'organizations-manage', '_bx_orgs_menu_item_title_system_entries_manage', '_bx_orgs_menu_item_title_entries_manage', 'page.php?i=organizations-manage', '', '', '', '', 2147483646, 1, 1, 2);
+('bx_organizations_submenu', 'bx_organizations', 'organizations-home', '_bx_orgs_menu_item_title_system_entries_recent', '_bx_orgs_menu_item_title_entries_recent', 'page.php?i=organizations-home', '', '', '', '', 2147483647, 1, 1, 1),
+('bx_organizations_submenu', 'bx_organizations', 'organizations-active', '_bx_orgs_menu_item_title_system_entries_active', '_bx_orgs_menu_item_title_entries_active', 'page.php?i=organizations-active', '', '', '', '', 2147483647, 1, 1, 2),
+('bx_organizations_submenu', 'bx_organizations', 'organizations-manage', '_bx_orgs_menu_item_title_system_entries_manage', '_bx_orgs_menu_item_title_entries_manage', 'page.php?i=organizations-manage', '', '', '', '', 2147483646, 1, 1, 3);
 
 -- MENU: view submenu
 

+ 18 - 3
modules/boonex/persons/classes/BxPersonsSearchResult.php

@@ -38,6 +38,13 @@ class BxPersonsSearchResult extends BxBaseModProfileSearchResult
                     'onField' => 'id',
                     'joinFields' => array('id', 'fullname', 'picture', 'added'),
                 ),
+                'account' => array(
+                    'type' => 'INNER',
+                    'table' => 'sys_accounts',
+                    'mainField' => 'account_id',
+                    'onField' => 'id',
+                    'joinFields' => array(),
+                ),
             ),
             'paginate' => array('perPage' => 20, 'start' => 0),
             'sorting' => 'none',
@@ -80,9 +87,17 @@ class BxPersonsSearchResult extends BxBaseModProfileSearchResult
             case 'recent':
                 $this->aCurrent['rss']['link'] = 'modules/?r=persons/rss/' . $sMode;
                 $this->aCurrent['title'] = _t('_bx_persons_page_title_browse_recent');
+                $this->aCurrent['sorting'] = 'last';
                 $this->sBrowseUrl = 'page.php?i=persons-home';
                 break;
 
+            case 'active':
+                $this->aCurrent['rss']['link'] = 'modules/?r=persons/rss/' . $sMode;
+                $this->aCurrent['title'] = _t('_bx_persons_page_title_browse_active');
+                $this->aCurrent['sorting'] = 'active';
+                $this->sBrowseUrl = 'page.php?i=persons-active';
+                break;
+
             case '': // search results
                 $this->sBrowseUrl = BX_DOL_SEARCH_KEYWORD_PAGE;
                 $this->aCurrent['title'] = _t('_bx_persons');
@@ -102,11 +117,11 @@ class BxPersonsSearchResult extends BxBaseModProfileSearchResult
         switch ($this->aCurrent['sorting']) {
         case 'none':
             return array();
+        case 'active':
+            return array('order' => ' ORDER BY `sys_accounts`.`logged` DESC ');
         case 'last':
         default:
-            $aSql = array();
-            $aSql['order'] = " ORDER BY `bx_persons_data`.`added` DESC";
-            return $aSql;
+            return array('order' => ' ORDER BY `bx_persons_data`.`added` DESC ');
         }
     }
 

+ 12 - 6
modules/boonex/persons/install/langs/en.xml

@@ -50,18 +50,21 @@
 	<string name="_bx_persons_page_title_sys_view_profile"><![CDATA[View Person's Profile]]></string>
 	<string name="_bx_persons_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_persons_page_title_browse"><![CDATA[People]]></string>
-	<string name="_bx_persons_page_title_browse_recent"><![CDATA[People]]></string>
+	<string name="_bx_persons_page_title_browse_active"><![CDATA[Recently Active People]]></string>
+	<string name="_bx_persons_page_title_browse_recent"><![CDATA[Recently Joined People]]></string>
 	<string name="_bx_persons_page_title_browse_connections"><![CDATA[{0} connections]]></string>
 	<string name="_bx_persons_page_title_browse_connections_mutual"><![CDATA[{0} and {1} mutual connections]]></string>
 	<string name="_bx_persons_page_title_sys_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_title_sys_profile_info"><![CDATA[Profile Info]]></string>
 	<string name="_bx_persons_page_title_profile_info"><![CDATA[Info about {display_name}]]></string>
-	<string name="_bx_persons_page_title_sys_home"><![CDATA[Persons Home]]></string>
-	<string name="_bx_persons_page_title_home"><![CDATA[People]]></string>
+	<string name="_bx_persons_page_title_sys_recent"><![CDATA[Recently Joined People]]></string>
+	<string name="_bx_persons_page_title_recent"><![CDATA[Recently Joined People]]></string>
 	<string name="_bx_persons_page_title_sys_manage"><![CDATA[Manage Own Profiles]]></string>
 	<string name="_bx_persons_page_title_sys_manage_administration"><![CDATA[Manage All Profiles]]></string>
 	<string name="_bx_persons_page_title_manage"><![CDATA[Manage Profiles]]></string>
+	<string name="_bx_persons_page_title_sys_active"><![CDATA[Recently Active People]]></string>
+	<string name="_bx_persons_page_title_active"><![CDATA[Recently Active People]]></string>
 
 	<string name="_bx_persons_page_block_title_create_profile"><![CDATA[Create Person's Profile]]></string>
 	<string name="_bx_persons_page_block_title_edit_profile"><![CDATA[Edit Profile]]></string>
@@ -75,10 +78,11 @@
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_block_title_profile_cover"><![CDATA[Profile Cover]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Actions]]></string>
-	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[Recent People]]></string>
+	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[Recently Joined People]]></string>
 	<string name="_bx_persons_page_block_title_system_manage"><![CDATA[Manage Own Profiles]]></string>
 	<string name="_bx_persons_page_block_title_system_manage_administration"><![CDATA[Manage All Profiles]]></string>
 	<string name="_bx_persons_page_block_title_manage"><![CDATA[Manage Profiles]]></string>
+	<string name="_bx_persons_page_block_title_active_profiles"><![CDATA[Recently Active People]]></string>
 
     <string name="_bx_persons_menu_title_submenu"><![CDATA[Persons Submenu]]></string>
     <string name="_bx_persons_menu_set_title_submenu"><![CDATA[Persons Submenu]]></string>
@@ -130,8 +134,8 @@
     <string name="_bx_persons_menu_item_title_friend_requests"><![CDATA[{addon} friend requests]]></string>
     <string name="_bx_persons_menu_item_title_system_manage_my_profiles"><![CDATA[My profiles]]></string>
     <string name="_bx_persons_menu_item_title_manage_my_profiles"><![CDATA[{addon} profiles]]></string>    
-    <string name="_bx_persons_menu_item_title_system_entries_public"><![CDATA[Public]]></string>
-    <string name="_bx_persons_menu_item_title_entries_public"><![CDATA[Public]]></string>
+    <string name="_bx_persons_menu_item_title_system_entries_recent"><![CDATA[Recent]]></string>
+    <string name="_bx_persons_menu_item_title_entries_recent"><![CDATA[Recent]]></string>
     <string name="_bx_persons_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_persons_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_persons_menu_item_title_system_entries_home"><![CDATA[Persons]]></string>
@@ -140,6 +144,8 @@
 	<string name="_bx_persons_menu_item_title_admt_persons"><![CDATA[Profiles - {addon} unapproved]]></string>
 	<string name="_bx_persons_menu_item_title_manage_my"><![CDATA[My Profiles]]></string>
 	<string name="_bx_persons_menu_item_title_manage_all"><![CDATA[All Profiles]]></string>   
+	<string name="_bx_persons_menu_item_title_system_entries_active"><![CDATA[Active]]></string>
+	<string name="_bx_persons_menu_item_title_entries_active"><![CDATA[Active]]></string>
 
 	<string name="_bx_persons_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
 	<string name="_bx_persons_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>

+ 12 - 3
modules/boonex/persons/install/sql/enable.sql

@@ -80,11 +80,19 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 -- PAGE: module home
 
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_home', '_bx_persons_page_title_sys_home', '_bx_persons_page_title_home', 'bx_persons', 5, 2147483647, 1, 'persons-home', 'page.php?i=persons-home', '', '', '', 0, 1, 0, 'BxPersonsPageBrowse', 'modules/boonex/persons/classes/BxPersonsPageBrowse.php');
+('bx_persons_home', '_bx_persons_page_title_sys_recent', '_bx_persons_page_title_recent', 'bx_persons', 5, 2147483647, 1, 'persons-home', 'page.php?i=persons-home', '', '', '', 0, 1, 0, 'BxPersonsPageBrowse', 'modules/boonex/persons/classes/BxPersonsPageBrowse.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
 ('bx_persons_home', 1, 'bx_persons', '_bx_persons_page_block_title_latest_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:22:\"browse_recent_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
 
+-- PAGE: active profiles
+
+INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
+('bx_persons_active', '_bx_persons_page_title_sys_active', '_bx_persons_page_title_active', 'bx_persons', 5, 2147483647, 1, 'persons-active', 'page.php?i=persons-active', '', '', '', 0, 1, 0, 'BxPersonsPageBrowse', 'modules/boonex/persons/classes/BxPersonsPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
+('bx_persons_active', 1, 'bx_persons', '_bx_persons_page_block_title_active_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
+
 -- PAGE: module manage own
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_persons_manage', '_bx_persons_page_title_sys_manage', '_bx_persons_page_title_manage', 'bx_persons', 5, 2147483647, 1, 'persons-manage', 'page.php?i=persons-manage', '', '', '', 0, 1, 0, 'BxPersonsPageBrowse', 'modules/boonex/persons/classes/BxPersonsPageBrowse.php');
@@ -165,8 +173,9 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_persons_submenu', 'bx_persons', '_bx_persons_menu_set_title_submenu', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_persons_submenu', 'bx_persons', 'persons-home', '_bx_persons_menu_item_title_system_entries_public', '_bx_persons_menu_item_title_entries_public', 'page.php?i=persons-home', '', '', '', '', 2147483647, 1, 1, 1),
-('bx_persons_submenu', 'bx_persons', 'persons-manage', '_bx_persons_menu_item_title_system_entries_manage', '_bx_persons_menu_item_title_entries_manage', 'page.php?i=persons-manage', '', '', '', '', 2147483646, 1, 1, 2);
+('bx_persons_submenu', 'bx_persons', 'persons-home', '_bx_persons_menu_item_title_system_entries_recent', '_bx_persons_menu_item_title_entries_recent', 'page.php?i=persons-home', '', '', '', '', 2147483647, 1, 1, 1),
+('bx_persons_submenu', 'bx_persons', 'persons-active', '_bx_persons_menu_item_title_system_entries_active', '_bx_persons_menu_item_title_entries_active', 'page.php?i=persons-active', '', '', '', '', 2147483647, 1, 1, 2),
+('bx_persons_submenu', 'bx_persons', 'persons-manage', '_bx_persons_menu_item_title_system_entries_manage', '_bx_persons_menu_item_title_entries_manage', 'page.php?i=persons-manage', '', '', '', '', 2147483646, 1, 1, 3);
 
 -- MENU: view submenu
 

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

@@ -53,18 +53,21 @@
 	<string name="_bx_orgs_page_title_sys_view_profile"><![CDATA[Просмотреть профиль организации]]></string>
 	<string name="_bx_orgs_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_orgs_page_title_browse"><![CDATA[Организации]]></string>
-	<string name="_bx_orgs_page_title_browse_recent"><![CDATA[Организации]]></string>
+    <string name="_bx_orgs_page_title_browse_active"><![CDATA[Последние Активные Организации]]></string>
+	<string name="_bx_orgs_page_title_browse_recent"><![CDATA[Последние Добавленные Организации]]></string>
 	<string name="_bx_orgs_page_title_browse_connections"><![CDATA[{0} связей]]></string>
 	<string name="_bx_orgs_page_title_browse_connections_mutual"><![CDATA[{0} и {1} обоюдных связей]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_info"><![CDATA[Инфо профиля]]></string>
 	<string name="_bx_orgs_page_title_profile_info"><![CDATA[Инфо о {display_name}]]></string>
-	<string name="_bx_orgs_page_title_sys_home"><![CDATA[Организации - Домой]]></string>
-	<string name="_bx_orgs_page_title_home"><![CDATA[Организации]]></string>
+	<string name="_bx_orgs_page_title_sys_recent"><![CDATA[Последние Добавленные Организации]]></string>
+	<string name="_bx_orgs_page_title_recent"><![CDATA[Последние Добавленные Организации]]></string>
 	<string name="_bx_orgs_page_title_sys_manage"><![CDATA[Управление собственными организациями]]></string>
 	<string name="_bx_orgs_page_title_sys_manage_administration"><![CDATA[Управление всеми организациями]]></string>
 	<string name="_bx_orgs_page_title_manage"><![CDATA[Управление организациями]]></string>
+	<string name="_bx_orgs_page_title_sys_active"><![CDATA[Последние Активные Организации]]></string>
+	<string name="_bx_orgs_page_title_active"><![CDATA[Последние Активные Организации]]></string>
     <string name="_bx_orgs_page_block_title_categories"><![CDATA[Категории организаций]]></string>
 
 	<string name="_bx_orgs_page_block_title_create_profile"><![CDATA[Создать профиль организации]]></string>
@@ -79,10 +82,11 @@
 	<string name="_bx_orgs_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_block_title_profile_cover"><![CDATA[Обложка профиля]]></string>
 	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Действия]]></string>
-	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Недавние организации]]></string>
+	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Последние добавленные организации]]></string>
 	<string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Управление собственными организациями]]></string>
 	<string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Управление всеми организациями]]></string>
 	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Управление организациями]]></string>
+    <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Последние Активные Организации]]></string>
 
     <string name="_bx_orgs_menu_title_submenu"><![CDATA[Организации - Подменю]]></string>
     <string name="_bx_orgs_menu_set_title_submenu"><![CDATA[Организации - Подменю]]></string>
@@ -134,8 +138,8 @@
     <string name="_bx_orgs_menu_item_title_friend_requests"><![CDATA[{addon} запросов дружбы]]></string>
     <string name="_bx_orgs_menu_item_title_system_manage_my_organizations"><![CDATA[Мои организации]]></string>
     <string name="_bx_orgs_menu_item_title_manage_my_organizations"><![CDATA[{addon} организаций]]></string>
-    <string name="_bx_orgs_menu_item_title_system_entries_public"><![CDATA[Публичные]]></string>
-    <string name="_bx_orgs_menu_item_title_entries_public"><![CDATA[Публичные]]></string>
+    <string name="_bx_orgs_menu_item_title_system_entries_recent"><![CDATA[Новые]]></string>
+    <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[Новые]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_orgs_menu_item_title_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_home"><![CDATA[Организации]]></string>
@@ -144,6 +148,8 @@
 	<string name="_bx_orgs_menu_item_title_admt_organizations"><![CDATA[Организации - {addon} неодобрено]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_my"><![CDATA[Мои организации]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_all"><![CDATA[Все организации]]></string>
+	<string name="_bx_orgs_menu_item_title_system_entries_active"><![CDATA[Активные]]></string>
+	<string name="_bx_orgs_menu_item_title_entries_active"><![CDATA[Активные]]></string>
 
 	<string name="_bx_orgs_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
 	<string name="_bx_orgs_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>

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

@@ -50,18 +50,21 @@
 	<string name="_bx_persons_page_title_sys_view_profile"><![CDATA[Просмотреть персональный профиль]]></string>
 	<string name="_bx_persons_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_persons_page_title_browse"><![CDATA[Люди]]></string>
-	<string name="_bx_persons_page_title_browse_recent"><![CDATA[Люди]]></string>
+	<string name="_bx_persons_page_title_browse_active"><![CDATA[Последние Активные Пользователи]]></string>
+	<string name="_bx_persons_page_title_browse_recent"><![CDATA[Последние Присоединившиеся Пользователи]]></string>
 	<string name="_bx_persons_page_title_browse_connections"><![CDATA[{0} связей]]></string>
 	<string name="_bx_persons_page_title_browse_connections_mutual"><![CDATA[{0} и {1} обоюдных связей]]></string>
 	<string name="_bx_persons_page_title_sys_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_title_sys_profile_info"><![CDATA[Инфо профиля]]></string>
 	<string name="_bx_persons_page_title_profile_info"><![CDATA[Инфо о {display_name}]]></string>
-	<string name="_bx_persons_page_title_sys_home"><![CDATA[Персоны - Домой]]></string>
-	<string name="_bx_persons_page_title_home"><![CDATA[Люди]]></string>
+	<string name="_bx_persons_page_title_sys_recent"><![CDATA[Последние Присоединившиеся Пользователи]]></string>
+	<string name="_bx_persons_page_title_recent"><![CDATA[Последние Присоединившиеся Пользователи]]></string>
 	<string name="_bx_persons_page_title_sys_manage"><![CDATA[Управление собственными профилями]]></string>
 	<string name="_bx_persons_page_title_sys_manage_administration"><![CDATA[Управление всеми профилями]]></string>
 	<string name="_bx_persons_page_title_manage"><![CDATA[Управление профилями]]></string>
+	<string name="_bx_persons_page_title_sys_active"><![CDATA[Последние Активные Пользователи]]></string>
+	<string name="_bx_persons_page_title_active"><![CDATA[Последние Активные Пользователи]]></string>
 
 	<string name="_bx_persons_page_block_title_create_profile"><![CDATA[Создать персональный профиль]]></string>
 	<string name="_bx_persons_page_block_title_edit_profile"><![CDATA[Редактировать профиль]]></string>
@@ -75,10 +78,11 @@
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_block_title_profile_cover"><![CDATA[Обложка профиля]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Действия]]></string>
-	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[Недавние люди]]></string>
+	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[Последние Присоединившиеся Пользователи]]></string>
 	<string name="_bx_persons_page_block_title_system_manage"><![CDATA[Управление собственными профилями]]></string>
 	<string name="_bx_persons_page_block_title_system_manage_administration"><![CDATA[Управление всеми профилями]]></string>
 	<string name="_bx_persons_page_block_title_manage"><![CDATA[Управление профилями]]></string>
+    <string name="_bx_persons_page_block_title_active_profiles"><![CDATA[Последние Активные Пользователи]]></string>
 
     <string name="_bx_persons_menu_title_submenu"><![CDATA[Персоны - Подменю]]></string>
     <string name="_bx_persons_menu_set_title_submenu"><![CDATA[Персоны - Подменю]]></string>
@@ -131,8 +135,8 @@
     <string name="_bx_persons_menu_item_title_system_manage_my_profiles"><![CDATA[Мои профили]]></string>
     <string name="_bx_persons_menu_item_title_manage_my_profiles"><![CDATA[{addon} профили]]></string>    
     <string name="_bx_persons_menu_item_title_system_entries_public"><![CDATA[Публичные]]></string>
-    <string name="_bx_persons_menu_item_title_entries_public"><![CDATA[Публичные]]></string>
-    <string name="_bx_persons_menu_item_title_system_entries_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_persons_menu_item_title_entries_recent"><![CDATA[Новые]]></string>
+    <string name="_bx_persons_menu_item_title_system_entries_recent"><![CDATA[Новые]]></string>
     <string name="_bx_persons_menu_item_title_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_persons_menu_item_title_system_entries_home"><![CDATA[Персоны]]></string>
     <string name="_bx_persons_menu_item_title_entries_home"><![CDATA[Люди]]></string>
@@ -140,6 +144,8 @@
 	<string name="_bx_persons_menu_item_title_admt_persons"><![CDATA[Профили - {addon} неодобрено]]></string>
 	<string name="_bx_persons_menu_item_title_manage_my"><![CDATA[Мои профили]]></string>
 	<string name="_bx_persons_menu_item_title_manage_all"><![CDATA[Все профили]]></string>   
+	<string name="_bx_persons_menu_item_title_system_entries_active"><![CDATA[Активные]]></string>
+	<string name="_bx_persons_menu_item_title_entries_active"><![CDATA[Активные]]></string>
 
 	<string name="_bx_persons_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
 	<string name="_bx_persons_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>