Merge branch 'master' of github.com:boonex/dolphin

inc/classes/BxDolPrivacy.php

@@ -215,7 +215,7 @@ class BxDolPrivacy extends BxDol implements iBxDolFactoryObject
             if($iProfileIdLogged == $iProfileIdOwner)
                 return array();
 
-            if ($iProfileIdOwner && $this->checkConnections($iProfileIdOwner, bx_get_logged_profile_id()))
+            if ($iProfileIdOwner && $this->checkFriends($iProfileIdOwner, bx_get_logged_profile_id()))
                 $mixedPrivacyGroups = array(BX_DOL_PG_ALL, BX_DOL_PG_MEMBERS, BX_DOL_PG_FRIENDS);
             else
                 $mixedPrivacyGroups = array(BX_DOL_PG_ALL, BX_DOL_PG_MEMBERS);

modules/boonex/albums/install/langs/en.xml

@@ -42,12 +42,12 @@
 	<string name="_bx_albums_page_title_sys_create_entry"><![CDATA[New Album]]></string>
 	<string name="_bx_albums_page_title_create_entry"><![CDATA[New Album]]></string>
 	<string name="_bx_albums_page_block_title_create_entry"><![CDATA[New Album]]></string>
-	<string name="_bx_albums_page_title_sys_edit_entry"><![CDATA[Edit Album]]></string>
-	<string name="_bx_albums_page_title_edit_entry"><![CDATA[Edit Album]]></string>
-	<string name="_bx_albums_page_block_title_edit_entry"><![CDATA[Edit Album]]></string>
-    <string name="_bx_albums_page_title_sys_delete_entry"><![CDATA[Delete Album]]></string>
-    <string name="_bx_albums_page_title_delete_entry"><![CDATA[Delete Album]]></string>
-    <string name="_bx_albums_page_block_title_delete_entry"><![CDATA[Delete Album]]></string>
+	<string name="_bx_albums_page_title_sys_edit_entry"><![CDATA[Edit]]></string>
+	<string name="_bx_albums_page_title_edit_entry"><![CDATA[Edit]]></string>
+	<string name="_bx_albums_page_block_title_edit_entry"><![CDATA[Edit]]></string>
+    <string name="_bx_albums_page_title_sys_delete_entry"><![CDATA[Delete]]></string>
+    <string name="_bx_albums_page_title_delete_entry"><![CDATA[Delete]]></string>
+    <string name="_bx_albums_page_block_title_delete_entry"><![CDATA[Delete]]></string>
 	<string name="_bx_albums_page_title_sys_view_entry"><![CDATA[View Album]]></string>
 	<string name="_bx_albums_page_title_view_entry"><![CDATA[{title}]]></string>
 	<string name="_bx_albums_page_title_sys_view_media"><![CDATA[View Image]]></string>
@@ -59,32 +59,32 @@
 	<string name="_bx_albums_page_title_browse"><![CDATA[Albums]]></string>
 	<string name="_bx_albums_page_title_search_results"><![CDATA[Albums matching "{0}"]]></string>
 	<string name="_bx_albums_page_title_browse_by_author"><![CDATA[{display_name}'s Albums]]></string>
-    <string name="_bx_albums_page_title_browse_recent"><![CDATA[Recent Albums]]></string>
-    <string name="_bx_albums_page_title_browse_popular"><![CDATA[Popular Albums]]></string>
-    <string name="_bx_albums_page_title_browse_popular_media"><![CDATA[Popular Images]]></string>
+    <string name="_bx_albums_page_title_browse_recent"><![CDATA[Latest]]></string>
+    <string name="_bx_albums_page_title_browse_popular"><![CDATA[Popular]]></string>
+    <string name="_bx_albums_page_title_browse_popular_media"><![CDATA[Top Images]]></string>
     <string name="_bx_albums_page_title_browse_recent_media"><![CDATA[Recent Images]]></string>
     <string name="_bx_albums_page_title_browse_media_in_album"><![CDATA[Images]]></string>
     <string name="_bx_albums_page_title_browse_updated"><![CDATA[Updated Albums]]></string>
     <string name="_bx_albums_page_title_sys_home"><![CDATA[Albums Home]]></string>
     <string name="_bx_albums_page_title_home"><![CDATA[Albums]]></string>
-    <string name="_bx_albums_page_block_title_recent_entries"><![CDATA[Recent Albums]]></string>
+    <string name="_bx_albums_page_block_title_recent_entries"><![CDATA[Latest]]></string>
     <string name="_bx_albums_page_block_title_entry_social_sharing"><![CDATA[Share]]></string>
     <string name="_bx_albums_page_block_title_entry_author"><![CDATA[Author]]></string>
     <string name="_bx_albums_page_block_title_entry_actions"><![CDATA[Actions]]></string>
     <string name="_bx_albums_page_block_title_entry_comments"><![CDATA[Comments]]></string>
     <string name="_bx_albums_page_block_title_entry_comments_link"><![CDATA[Comments to <a href="{entry_link}">{title}</a>]]></string>
     <string name="_bx_albums_page_block_title_entry_location"><![CDATA[Location]]></string>
-    <string name="_bx_albums_page_title_sys_entries_popular"><![CDATA[Popular Albums]]></string>
-    <string name="_bx_albums_page_title_entries_popular"><![CDATA[Popular Albums]]></string>
+    <string name="_bx_albums_page_title_sys_entries_popular"><![CDATA[Popular]]></string>
+    <string name="_bx_albums_page_title_entries_popular"><![CDATA[Popular]]></string>
     <string name="_bx_albums_page_title_sys_entries_updated"><![CDATA[Updated Albums]]></string>
     <string name="_bx_albums_page_title_entries_updated"><![CDATA[Updated Albums]]></string>
-    <string name="_bx_albums_page_title_sys_entries_popular_media"><![CDATA[Popular Images]]></string>
-    <string name="_bx_albums_page_title_entries_popular_media"><![CDATA[Popular Images]]></string>
-    <string name="_bx_albums_page_block_title_popular_entries"><![CDATA[Popular Albums]]></string>
-    <string name="_bx_albums_page_block_title_popular_media"><![CDATA[Popular Images]]></string>
+    <string name="_bx_albums_page_title_sys_entries_popular_media"><![CDATA[Top Images]]></string>
+    <string name="_bx_albums_page_title_entries_popular_media"><![CDATA[Top Images]]></string>
+    <string name="_bx_albums_page_block_title_popular_entries"><![CDATA[Popular]]></string>
+    <string name="_bx_albums_page_block_title_popular_media"><![CDATA[Top Images]]></string>
     <string name="_bx_albums_page_block_title_recent_media"><![CDATA[Recent Images]]></string>
     <string name="_bx_albums_page_block_title_updated_entries"><![CDATA[Updated Albums]]></string>
-    <string name="_bx_albums_page_title_sys_view_entry_comments"><![CDATA[Album Comments]]></string>
+    <string name="_bx_albums_page_title_sys_view_entry_comments"><![CDATA[Comments]]></string>
     <string name="_bx_albums_page_title_view_entry_comments"><![CDATA[Comments to {title}]]></string>
     <string name="_bx_albums_page_title_sys_entries_of_author"><![CDATA[Albums of author]]></string>
     <string name="_bx_albums_page_title_entries_of_author"><![CDATA[{display_name}'s albums]]></string>
@@ -95,10 +95,10 @@
     <string name="_bx_albums_page_block_title_browse_cmts_media"><![CDATA[Images Comments]]></string>
 	<string name="_bx_albums_page_title_sys_manage"><![CDATA[Manage Own Albums]]></string>
 	<string name="_bx_albums_page_title_sys_manage_administration"><![CDATA[Manage All Albums]]></string>
-	<string name="_bx_albums_page_title_manage"><![CDATA[Manage Albums]]></string>
+	<string name="_bx_albums_page_title_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_albums_page_block_title_system_manage"><![CDATA[Manage Own Albums]]></string>
 	<string name="_bx_albums_page_block_title_system_manage_administration"><![CDATA[Manage All Albums]]></string>
-	<string name="_bx_albums_page_block_title_manage"><![CDATA[Manage Albums]]></string>
+	<string name="_bx_albums_page_block_title_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_albums"><![CDATA[Popular Albums Hashtags]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media"><![CDATA[Popular Media Hashtags]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media_camera"><![CDATA[Popular Cameras]]></string>
@@ -109,28 +109,28 @@
     <string name="_bx_albums_menu_set_title_submenu"><![CDATA[Albums Submenu]]></string>
     <string name="_bx_albums_menu_item_title_system_create_entry"><![CDATA[New Album]]></string>
     <string name="_bx_albums_menu_item_title_create_entry"><![CDATA[New Album]]></string>
-    <string name="_bx_albums_menu_item_title_system_edit_entry"><![CDATA[Edit Album]]></string>
-    <string name="_bx_albums_menu_item_title_edit_entry"><![CDATA[Edit Album]]></string>
-    <string name="_bx_albums_menu_item_title_system_delete_entry"><![CDATA[Delete Album]]></string>
-    <string name="_bx_albums_menu_item_title_delete_entry"><![CDATA[Delete Album]]></string>
+    <string name="_bx_albums_menu_item_title_system_edit_entry"><![CDATA[Edit]]></string>
+    <string name="_bx_albums_menu_item_title_edit_entry"><![CDATA[Edit]]></string>
+    <string name="_bx_albums_menu_item_title_system_delete_entry"><![CDATA[Delete]]></string>
+    <string name="_bx_albums_menu_item_title_delete_entry"><![CDATA[Delete]]></string>
     <string name="_bx_albums_menu_item_title_system_view_entry"><![CDATA[View Album]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_home"><![CDATA[Albums]]></string>
     <string name="_bx_albums_menu_item_title_entries_home"><![CDATA[Albums]]></string>
-    <string name="_bx_albums_menu_item_title_system_entries_recent"><![CDATA[Recent Albums]]></string>
-    <string name="_bx_albums_menu_item_title_entries_recent"><![CDATA[Recent Albums]]></string>
-    <string name="_bx_albums_menu_item_title_system_entries_manage"><![CDATA[Manage Albums]]></string>
-    <string name="_bx_albums_menu_item_title_entries_manage"><![CDATA[Manage Albums]]></string>
-    <string name="_bx_albums_menu_item_title_system_entries_popular"><![CDATA[Popular Albums]]></string>
-    <string name="_bx_albums_menu_item_title_entries_popular"><![CDATA[Popular Albums]]></string>
+    <string name="_bx_albums_menu_item_title_system_entries_recent"><![CDATA[Latest]]></string>
+    <string name="_bx_albums_menu_item_title_entries_recent"><![CDATA[Latest]]></string>
+    <string name="_bx_albums_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_albums_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_albums_menu_item_title_system_entries_popular"><![CDATA[Popular]]></string>
+    <string name="_bx_albums_menu_item_title_entries_popular"><![CDATA[Popular]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_updated"><![CDATA[Updated Albums]]></string>
     <string name="_bx_albums_menu_item_title_entries_updated"><![CDATA[Updated Albums]]></string>
-    <string name="_bx_albums_menu_item_title_system_entries_popular_media"><![CDATA[Popular Images]]></string>
-    <string name="_bx_albums_menu_item_title_entries_popular_media"><![CDATA[Popular Images]]></string>
+    <string name="_bx_albums_menu_item_title_system_entries_popular_media"><![CDATA[Top Images]]></string>
+    <string name="_bx_albums_menu_item_title_entries_popular_media"><![CDATA[Top Images]]></string>
     <string name="_bx_albums_menu_title_view_entry_submenu"><![CDATA[View Album Submenu]]></string>
     <string name="_bx_albums_menu_set_title_view_entry_submenu"><![CDATA[View Album Submenu]]></string>
     <string name="_bx_albums_menu_item_title_view_entry_submenu_entry"><![CDATA[Album]]></string>
-    <string name="_bx_albums_menu_item_title_view_entry_submenu_comments"><![CDATA[Album Comments]]></string>
-    <string name="_bx_albums_menu_item_title_system_view_entry_comments"><![CDATA[Album Comments]]></string>
+    <string name="_bx_albums_menu_item_title_view_entry_submenu_comments"><![CDATA[Comments]]></string>
+    <string name="_bx_albums_menu_item_title_system_view_entry_comments"><![CDATA[Comments]]></string>
     <string name="_bx_albums_menu_item_title_system_view_entries_author"><![CDATA[Albums]]></string>
     <string name="_bx_albums_menu_item_title_view_entries_author"><![CDATA[Albums]]></string>
     <string name="_bx_albums_menu_title_entries_my"><![CDATA[My Albums Action Menu]]></string>

modules/boonex/convos/install/sql/enable.sql

@@ -64,7 +64,6 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 
 -- MENU: module sub-menu
-
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_convos_submenu', '_bx_cnv_menu_title_submenu', 'bx_convos_submenu', 'bx_convos', 8, 0, 1, '', '');
 
@@ -73,25 +72,24 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 
 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_convos_submenu', 'bx_convos', 'convos-folder-inbox', '_bx_cnv_menu_item_title_system_folder_inbox', '_bx_cnv_menu_item_title_folder_inbox', 'modules/?r=convos/folder/1', '', '', '', '', 2147483647, 1, 1, 1),
-('bx_convos_submenu', 'bx_convos', 'convos-folder-more', '_bx_cnv_menu_item_title_system_folder_more', '_bx_cnv_menu_item_title_folder_more', 'javascript:void(0);', 'bx_menu_popup(''bx_convos_menu_folders_more'', this);', '', '', '', 2147483647, 1, 1, 2);
-
+('bx_convos_submenu', 'bx_convos', 'convos-drafts', '_bx_cnv_menu_item_title_system_folder_drafts', '_bx_cnv_menu_item_title_folder_drafts', 'modules/?r=convos/folder/2', '', '', '', '', 2147483647, 1, 1, 2),
+('bx_convos_submenu', 'bx_convos', 'convos-spam', '_bx_cnv_menu_item_title_system_folder_spam', '_bx_cnv_menu_item_title_folder_spam', 'modules/?r=convos/folder/3', '', '', '', '', 2147483647, 1, 1, 3),
+('bx_convos_submenu', 'bx_convos', 'convos-trash', '_bx_cnv_menu_item_title_system_folder_trash', '_bx_cnv_menu_item_title_folder_trash', 'modules/?r=convos/folder/4', '', '', '', '', 2147483647, 1, 1, 4);
+-- ('bx_convos_submenu', 'bx_convos', 'convos-folder-more', '_bx_cnv_menu_item_title_system_folder_more', '_bx_cnv_menu_item_title_folder_more', 'javascript:void(0);', 'bx_menu_popup(''bx_convos_menu_folders_more'', this);', '', '', '', 2147483647, 1, 1, 5)
 
+-- TODO: Remove it completely if 'more' menu item isn't needed.
 -- MENU: more folders
+-- INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
+-- ('bx_convos_menu_folders_more', '_bx_cnv_menu_title_folders_more', 'bx_convos_menu_folders_more', 'bx_convos', 4, 0, 1, '', '');
 
-INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_convos_menu_folders_more', '_bx_cnv_menu_title_folders_more', 'bx_convos_menu_folders_more', 'bx_convos', 4, 0, 1, '', '');
+-- INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
+-- ('bx_convos_menu_folders_more', 'bx_convos', '_bx_cnv_menu_set_title_folders_more', 0);
 
-INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
-('bx_convos_menu_folders_more', 'bx_convos', '_bx_cnv_menu_set_title_folders_more', 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_convos_menu_folders_more', 'bx_convos', 'convos-drafts', '_bx_cnv_menu_item_title_system_folder_drafts', '_bx_cnv_menu_item_title_folder_drafts', 'modules/?r=convos/folder/2', '', '', '', '', 2147483647, 1, 1, 1),
-('bx_convos_menu_folders_more', 'bx_convos', 'convos-spam', '_bx_cnv_menu_item_title_system_folder_spam', '_bx_cnv_menu_item_title_folder_spam', 'modules/?r=convos/folder/3', '', '', '', '', 2147483647, 1, 1, 2),
-('bx_convos_menu_folders_more', 'bx_convos', 'convos-trash', '_bx_cnv_menu_item_title_system_folder_trash', '_bx_cnv_menu_item_title_folder_trash', 'modules/?r=convos/folder/4', '', '', '', '', 2147483647, 1, 1, 3);
+-- 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_convos_menu_folders_more', 'bx_convos', 'convos-drafts', '_bx_cnv_menu_item_title_system_folder_drafts', '_bx_cnv_menu_item_title_folder_drafts', 'modules/?r=convos/folder/2', '', '', '', '', 2147483647, 1, 1, 1);
 
 
 -- MENU: notifications
-
 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_account_notifications', 'bx_convos', 'notifications-convos', '_bx_cnv_menu_item_title_system_convos', '_bx_cnv_menu_item_title_convos', 'modules/?r=convos/folder/1', '', '', 'comments col-red1', 'a:2:{s:6:"module";s:9:"bx_convos";s:6:"method";s:23:"get_unread_messages_num";}', '', 2147483646, 1, 0, 2);
 

modules/boonex/groups/install/langs/en.xml

@@ -61,8 +61,8 @@
 	<string name="_bx_groups_page_title_sys_view_profile"><![CDATA[View Group]]></string>
 	<string name="_bx_groups_page_title_view_profile"><![CDATA[{display_name}]]></string>
 	<string name="_bx_groups_page_title_browse"><![CDATA[Groups]]></string>
-	<string name="_bx_groups_page_title_browse_active"><![CDATA[Recently Active Groups]]></string>
-	<string name="_bx_groups_page_title_browse_recent"><![CDATA[Recently Added Groups]]></string>
+	<string name="_bx_groups_page_title_browse_active"><![CDATA[Active]]></string>
+	<string name="_bx_groups_page_title_browse_recent"><![CDATA[New]]></string>
 	<string name="_bx_groups_page_title_browse_connections"><![CDATA[{0} connections]]></string>
 	<string name="_bx_groups_page_title_browse_connections_mutual"><![CDATA[{0} and {1} mutual connections]]></string>
 	<string name="_bx_groups_page_title_sys_profile_friends"><![CDATA[Friends]]></string>
@@ -71,13 +71,13 @@
 	<string name="_bx_groups_page_title_group_fans"><![CDATA[Members]]></string>
 	<string name="_bx_groups_page_title_sys_profile_info"><![CDATA[Group Info]]></string>
 	<string name="_bx_groups_page_title_profile_info"><![CDATA[Info about {display_name}]]></string>
-	<string name="_bx_groups_page_title_sys_recent"><![CDATA[Recently Added Groups]]></string>
-	<string name="_bx_groups_page_title_recent"><![CDATA[Recently Added Groups]]></string>
-	<string name="_bx_groups_page_title_sys_manage"><![CDATA[Manage Own Groups]]></string>
-	<string name="_bx_groups_page_title_sys_manage_administration"><![CDATA[Manage All Groups]]></string>
-	<string name="_bx_groups_page_title_manage"><![CDATA[Manage Groups]]></string>
-	<string name="_bx_groups_page_title_sys_active"><![CDATA[Recently Active People]]></string>
-	<string name="_bx_groups_page_title_active"><![CDATA[Recently Active People]]></string>
+	<string name="_bx_groups_page_title_sys_recent"><![CDATA[New]]></string>
+	<string name="_bx_groups_page_title_recent"><![CDATA[New]]></string>
+	<string name="_bx_groups_page_title_sys_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_groups_page_title_sys_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_groups_page_title_manage"><![CDATA[Manage]]></string>
+	<string name="_bx_groups_page_title_sys_active"><![CDATA[Active]]></string>
+	<string name="_bx_groups_page_title_active"><![CDATA[Active]]></string>
 
 	<string name="_bx_groups_page_block_title_sys_joined_entries"><![CDATA[Joined Groups]]></string>
 	<string name="_bx_groups_page_block_title_joined_entries"><![CDATA[Joined Groups]]></string>
@@ -95,11 +95,11 @@
     <string name="_bx_groups_page_block_title_fans"><![CDATA[Members]]></string>
 	<string name="_bx_groups_page_block_title_system_fans"><![CDATA[Members]]></string>
 	<string name="_bx_groups_page_block_title_profile_actions"><![CDATA[Actions]]></string>
-	<string name="_bx_groups_page_block_title_latest_profiles"><![CDATA[Recently Added Groups]]></string>
-	<string name="_bx_groups_page_block_title_system_manage"><![CDATA[Manage Own Groups]]></string>
-	<string name="_bx_groups_page_block_title_system_manage_administration"><![CDATA[Manage All Groups]]></string>
-	<string name="_bx_groups_page_block_title_manage"><![CDATA[Manage Groups]]></string>
-    <string name="_bx_groups_page_block_title_active_profiles"><![CDATA[Recently Active Groups]]></string>
+	<string name="_bx_groups_page_block_title_latest_profiles"><![CDATA[New]]></string>
+	<string name="_bx_groups_page_block_title_system_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_groups_page_block_title_system_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_groups_page_block_title_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_groups_page_block_title_active_profiles"><![CDATA[Active]]></string>
     <string name="_bx_groups_page_block_title_entry_social_sharing"><![CDATA[Share]]></string>
 
     <string name="_bx_groups_page_block_title_categories"><![CDATA[Group categories]]></string>
@@ -129,8 +129,8 @@
     <string name="_bx_groups_menu_item_title_delete_account"><![CDATA[Delete Account]]></string>
     <string name="_bx_groups_menu_item_title_system_profile_type"><![CDATA[Group]]></string>
     <string name="_bx_groups_menu_item_title_profile_type"><![CDATA[Group]]></string>
-    <string name="_bx_groups_menu_item_title_system_create_profile"><![CDATA[Create Group]]></string>
-    <string name="_bx_groups_menu_item_title_create_profile"><![CDATA[Create Group]]></string>
+    <string name="_bx_groups_menu_item_title_system_create_profile"><![CDATA[New Group]]></string>
+    <string name="_bx_groups_menu_item_title_create_profile"><![CDATA[New Group]]></string>
     <string name="_bx_groups_menu_item_title_system_view_profile_friends"><![CDATA[Friends]]></string>
     <string name="_bx_groups_menu_item_title_view_profile_friends"><![CDATA[Friends]]></string>
     <string name="_bx_groups_menu_item_title_system_view_joined_groups"><![CDATA[Groups]]></string>
@@ -172,18 +172,18 @@
     <string name="_bx_groups_menu_item_title_friend_requests"><![CDATA[{addon} friend requests]]></string>
     <string name="_bx_groups_menu_item_title_system_manage_my_groups"><![CDATA[My groups]]></string>
     <string name="_bx_groups_menu_item_title_manage_my_groups"><![CDATA[{addon} groups]]></string>
-    <string name="_bx_groups_menu_item_title_system_entries_recent"><![CDATA[Recent Groups]]></string>
-    <string name="_bx_groups_menu_item_title_entries_recent"><![CDATA[Recent Groups]]></string>
-    <string name="_bx_groups_menu_item_title_system_entries_manage"><![CDATA[Manage Groups]]></string>
-    <string name="_bx_groups_menu_item_title_entries_manage"><![CDATA[Manage Groups]]></string>
+    <string name="_bx_groups_menu_item_title_system_entries_recent"><![CDATA[New]]></string>
+    <string name="_bx_groups_menu_item_title_entries_recent"><![CDATA[New]]></string>
+    <string name="_bx_groups_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_groups_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_groups_menu_item_title_system_entries_home"><![CDATA[Groups]]></string>
     <string name="_bx_groups_menu_item_title_entries_home"><![CDATA[Groups]]></string>
     <string name="_bx_groups_menu_item_title_system_admt_groups"><![CDATA[Groups]]></string>
 	<string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Groups - {addon} unapproved]]></string>
 	<string name="_bx_groups_menu_item_title_manage_my"><![CDATA[My Groups]]></string>
 	<string name="_bx_groups_menu_item_title_manage_all"><![CDATA[All Groups]]></string>
-	<string name="_bx_groups_menu_item_title_system_entries_active"><![CDATA[Active Groups]]></string>
-	<string name="_bx_groups_menu_item_title_entries_active"><![CDATA[Active Groups]]></string>
+	<string name="_bx_groups_menu_item_title_system_entries_active"><![CDATA[Active]]></string>
+	<string name="_bx_groups_menu_item_title_entries_active"><![CDATA[Active]]></string>
 
 	<string name="_bx_groups_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
 	<string name="_bx_groups_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>

modules/boonex/organizations/install/langs/en.xml

@@ -53,21 +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_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_active"><![CDATA[Active]]></string>
+	<string name="_bx_orgs_page_title_browse_recent"><![CDATA[New]]></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_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_title_sys_recent"><![CDATA[New]]></string>
+	<string name="_bx_orgs_page_title_recent"><![CDATA[New]]></string>
+	<string name="_bx_orgs_page_title_sys_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_orgs_page_title_sys_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_orgs_page_title_manage"><![CDATA[Manage]]></string>
+	<string name="_bx_orgs_page_title_sys_active"><![CDATA[Active]]></string>
+	<string name="_bx_orgs_page_title_active"><![CDATA[Active]]></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>
@@ -83,11 +83,11 @@
 	<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[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_latest_profiles"><![CDATA[New]]></string>
+	<string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Active]]></string>
 
     <string name="_bx_orgs_page_block_title_categories"><![CDATA[Organization categories]]></string>
 
@@ -144,18 +144,18 @@
     <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_recent"><![CDATA[Recent Organizations]]></string>
-    <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[Recent Organizations]]></string>
-    <string name="_bx_orgs_menu_item_title_system_entries_manage"><![CDATA[Manage Organizations]]></string>
-    <string name="_bx_orgs_menu_item_title_entries_manage"><![CDATA[Manage Organizations]]></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>
+    <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>
     <string name="_bx_orgs_menu_item_title_entries_home"><![CDATA[Orgs]]></string>
     <string name="_bx_orgs_menu_item_title_system_admt_organizations"><![CDATA[Organizations]]></string>
 	<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 Organizations]]></string>
-	<string name="_bx_orgs_menu_item_title_entries_active"><![CDATA[Active 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>

modules/boonex/persons/install/langs/en.xml

@@ -50,21 +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_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_active"><![CDATA[Active]]></string>
+	<string name="_bx_persons_page_title_browse_recent"><![CDATA[New]]></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_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_title_sys_recent"><![CDATA[New]]></string>
+	<string name="_bx_persons_page_title_recent"><![CDATA[New]]></string>
+	<string name="_bx_persons_page_title_sys_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_persons_page_title_sys_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_persons_page_title_manage"><![CDATA[Manage]]></string>
+	<string name="_bx_persons_page_title_sys_active"><![CDATA[Active]]></string>
+	<string name="_bx_persons_page_title_active"><![CDATA[Active]]></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>
@@ -80,11 +80,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[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_page_block_title_latest_profiles"><![CDATA[New]]></string>
+	<string name="_bx_persons_page_block_title_system_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_persons_page_block_title_system_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_persons_page_block_title_manage"><![CDATA[Manage]]></string>
+	<string name="_bx_persons_page_block_title_active_profiles"><![CDATA[Active]]></string>
 
     <string name="_bx_persons_menu_title_submenu"><![CDATA[Persons Submenu]]></string>
     <string name="_bx_persons_menu_set_title_submenu"><![CDATA[Persons Submenu]]></string>
@@ -139,18 +139,18 @@
     <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_recent"><![CDATA[Recent People]]></string>
-    <string name="_bx_persons_menu_item_title_entries_recent"><![CDATA[Recent People]]></string>
-    <string name="_bx_persons_menu_item_title_system_entries_manage"><![CDATA[Manage People]]></string>
-    <string name="_bx_persons_menu_item_title_entries_manage"><![CDATA[Manage People]]></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>
+    <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>
     <string name="_bx_persons_menu_item_title_entries_home"><![CDATA[People]]></string>
 	<string name="_bx_persons_menu_item_title_system_admt_persons"><![CDATA[Profiles]]></string>
 	<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 People]]></string>
-	<string name="_bx_persons_menu_item_title_entries_active"><![CDATA[Active People]]></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>

modules/boonex/posts/install/langs/en.xml

@@ -45,26 +45,26 @@
 	<string name="_bx_posts_page_title_sys_create_entry"><![CDATA[New Post]]></string>
 	<string name="_bx_posts_page_title_create_entry"><![CDATA[New Post]]></string>
 	<string name="_bx_posts_page_block_title_create_entry"><![CDATA[New Post]]></string>
-	<string name="_bx_posts_page_title_sys_edit_entry"><![CDATA[Edit Post]]></string>
-	<string name="_bx_posts_page_title_edit_entry"><![CDATA[Edit Post]]></string>
-	<string name="_bx_posts_page_block_title_edit_entry"><![CDATA[Edit Post]]></string>
-    <string name="_bx_posts_page_title_sys_delete_entry"><![CDATA[Delete Post]]></string>
-    <string name="_bx_posts_page_title_delete_entry"><![CDATA[Delete Post]]></string>
-    <string name="_bx_posts_page_block_title_delete_entry"><![CDATA[Delete Post]]></string>
+	<string name="_bx_posts_page_title_sys_edit_entry"><![CDATA[Edit]]></string>
+	<string name="_bx_posts_page_title_edit_entry"><![CDATA[Edit]]></string>
+	<string name="_bx_posts_page_block_title_edit_entry"><![CDATA[Edit]]></string>
+    <string name="_bx_posts_page_title_sys_delete_entry"><![CDATA[Delete]]></string>
+    <string name="_bx_posts_page_title_delete_entry"><![CDATA[Delete]]></string>
+    <string name="_bx_posts_page_block_title_delete_entry"><![CDATA[Delete]]></string>
 	<string name="_bx_posts_page_title_sys_view_entry"><![CDATA[View Post]]></string>
 	<string name="_bx_posts_page_title_view_entry"><![CDATA[{title}]]></string>
 	<string name="_bx_posts_page_block_title_entry_text"><![CDATA[Post Text]]></string>
 	<string name="_bx_posts_page_title_browse"><![CDATA[Posts]]></string>
 	<string name="_bx_posts_page_title_search_results"><![CDATA[Posts matching "{0}"]]></string>
 	<string name="_bx_posts_page_title_browse_by_author"><![CDATA[Posts of {display_name}]]></string>
-    <string name="_bx_posts_page_title_browse_recent"><![CDATA[Recent Posts]]></string>
-    <string name="_bx_posts_page_title_browse_popular"><![CDATA[Popular Posts]]></string>
+    <string name="_bx_posts_page_title_browse_recent"><![CDATA[Latest]]></string>
+    <string name="_bx_posts_page_title_browse_popular"><![CDATA[Popular]]></string>
     <string name="_bx_posts_page_title_browse_updated"><![CDATA[Updated Posts]]></string>
     <string name="_bx_posts_page_title_sys_home"><![CDATA[Posts Home]]></string>
     <string name="_bx_posts_page_title_home"><![CDATA[Posts]]></string>
-    <string name="_bx_posts_page_block_title_recent_entries"><![CDATA[Recent Posts (Gallery View)]]></string>
-    <string name="_bx_posts_page_block_title_recent_entries_view_extended"><![CDATA[Recent Posts]]></string>
-    <string name="_bx_posts_page_block_title_recent_entries_view_full"><![CDATA[Recent Posts (Full View)]]></string>
+    <string name="_bx_posts_page_block_title_recent_entries"><![CDATA[Latest (Gallery View)]]></string>
+    <string name="_bx_posts_page_block_title_recent_entries_view_extended"><![CDATA[Latest]]></string>
+    <string name="_bx_posts_page_block_title_recent_entries_view_full"><![CDATA[Latest (Full View)]]></string>
     <string name="_bx_posts_page_block_title_entry_social_sharing"><![CDATA[Share]]></string>
     <string name="_bx_posts_page_block_title_entry_author"><![CDATA[Author]]></string>
     <string name="_bx_posts_page_block_title_entry_actions"><![CDATA[Actions]]></string>
@@ -73,13 +73,13 @@
     <string name="_bx_posts_page_block_title_entry_location"><![CDATA[Location]]></string>
     <string name="_bx_posts_page_block_title_entry_attachments"><![CDATA[Attachments]]></string>
     <string name="_bx_posts_page_block_title_entry_all_actions"><![CDATA[All Actions]]></string>
-    <string name="_bx_posts_page_title_sys_entries_popular"><![CDATA[Popular Posts]]></string>
-    <string name="_bx_posts_page_title_entries_popular"><![CDATA[Popular Posts]]></string>
+    <string name="_bx_posts_page_title_sys_entries_popular"><![CDATA[Popular]]></string>
+    <string name="_bx_posts_page_title_entries_popular"><![CDATA[Popular]]></string>
     <string name="_bx_posts_page_title_sys_entries_updated"><![CDATA[Updated Posts]]></string>
     <string name="_bx_posts_page_title_entries_updated"><![CDATA[Updated Posts]]></string>
-    <string name="_bx_posts_page_block_title_popular_entries"><![CDATA[Popular Posts]]></string>
-    <string name="_bx_posts_page_block_title_popular_entries_view_extended"><![CDATA[Popular Posts (Extended View)]]></string>
-    <string name="_bx_posts_page_block_title_popular_entries_view_full"><![CDATA[Popular Posts (Full View)]]></string>
+    <string name="_bx_posts_page_block_title_popular_entries"><![CDATA[Popular]]></string>
+    <string name="_bx_posts_page_block_title_popular_entries_view_extended"><![CDATA[Popular (Extended View)]]></string>
+    <string name="_bx_posts_page_block_title_popular_entries_view_full"><![CDATA[Popular (Full View)]]></string>
     <string name="_bx_posts_page_block_title_updated_entries"><![CDATA[Updated Posts]]></string>
     <string name="_bx_posts_page_title_sys_view_entry_comments"><![CDATA[Post Comments]]></string>
     <string name="_bx_posts_page_title_view_entry_comments"><![CDATA[Comments to {title}]]></string>
@@ -89,12 +89,12 @@
     <string name="_bx_posts_page_block_title_sys_entries_of_author"><![CDATA[Posts of author]]></string>   
     <string name="_bx_posts_page_block_title_entries_actions"><![CDATA[Posts actions]]></string>
     <string name="_bx_posts_page_block_title_browse_cmts"><![CDATA[Posts' Comments]]></string>
-	<string name="_bx_posts_page_title_sys_manage"><![CDATA[Manage Own Posts]]></string>
-	<string name="_bx_posts_page_title_sys_manage_administration"><![CDATA[Manage All Posts]]></string>
-	<string name="_bx_posts_page_title_manage"><![CDATA[Manage Posts]]></string>
-	<string name="_bx_posts_page_block_title_system_manage"><![CDATA[Manage Own Posts]]></string>
-	<string name="_bx_posts_page_block_title_system_manage_administration"><![CDATA[Manage All Posts]]></string>
-	<string name="_bx_posts_page_block_title_manage"><![CDATA[Manage Posts]]></string>    
+	<string name="_bx_posts_page_title_sys_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_posts_page_title_sys_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_posts_page_title_manage"><![CDATA[Manage]]></string>
+	<string name="_bx_posts_page_block_title_system_manage"><![CDATA[Manage Own]]></string>
+	<string name="_bx_posts_page_block_title_system_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_posts_page_block_title_manage"><![CDATA[Manage]]></string>    
 	<string name="_bx_posts_page_block_title_popular_keywords"><![CDATA[Popular Hashtags]]></string>
 	<string name="_bx_posts_page_block_title_cats"><![CDATA[Posts Categories]]></string>
 
@@ -104,19 +104,19 @@
     <string name="_bx_posts_menu_set_title_submenu"><![CDATA[Posts Submenu]]></string>
     <string name="_bx_posts_menu_item_title_system_create_entry"><![CDATA[New Post]]></string>
     <string name="_bx_posts_menu_item_title_create_entry"><![CDATA[New Post]]></string>
-    <string name="_bx_posts_menu_item_title_system_edit_entry"><![CDATA[Edit Post]]></string>
-    <string name="_bx_posts_menu_item_title_edit_entry"><![CDATA[Edit Post]]></string>
-    <string name="_bx_posts_menu_item_title_system_delete_entry"><![CDATA[Delete Post]]></string>
-    <string name="_bx_posts_menu_item_title_delete_entry"><![CDATA[Delete Post]]></string>
+    <string name="_bx_posts_menu_item_title_system_edit_entry"><![CDATA[Edit]]></string>
+    <string name="_bx_posts_menu_item_title_edit_entry"><![CDATA[Edit]]></string>
+    <string name="_bx_posts_menu_item_title_system_delete_entry"><![CDATA[Delete]]></string>
+    <string name="_bx_posts_menu_item_title_delete_entry"><![CDATA[Delete]]></string>
     <string name="_bx_posts_menu_item_title_system_view_entry"><![CDATA[View Post]]></string>
     <string name="_bx_posts_menu_item_title_system_entries_home"><![CDATA[Posts]]></string>
     <string name="_bx_posts_menu_item_title_entries_home"><![CDATA[Posts]]></string>
-    <string name="_bx_posts_menu_item_title_system_entries_public"><![CDATA[Recent Posts]]></string>
-    <string name="_bx_posts_menu_item_title_entries_public"><![CDATA[Recent Posts]]></string>
-    <string name="_bx_posts_menu_item_title_system_entries_manage"><![CDATA[Manage Posts]]></string>
-    <string name="_bx_posts_menu_item_title_entries_manage"><![CDATA[Manage Posts]]></string>
-    <string name="_bx_posts_menu_item_title_system_entries_popular"><![CDATA[Popular Posts]]></string>
-    <string name="_bx_posts_menu_item_title_entries_popular"><![CDATA[Popular Posts]]></string>
+    <string name="_bx_posts_menu_item_title_system_entries_public"><![CDATA[Latest]]></string>
+    <string name="_bx_posts_menu_item_title_entries_public"><![CDATA[Latest]]></string>
+    <string name="_bx_posts_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_posts_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_posts_menu_item_title_system_entries_popular"><![CDATA[Popular]]></string>
+    <string name="_bx_posts_menu_item_title_entries_popular"><![CDATA[Popular]]></string>
     <string name="_bx_posts_menu_title_view_entry_submenu"><![CDATA[View Post Submenu]]></string>
     <string name="_bx_posts_menu_set_title_view_entry_submenu"><![CDATA[View Post Submenu]]></string>
     <string name="_bx_posts_menu_item_title_view_entry_submenu_entry"><![CDATA[Post]]></string>

modules/boonex/russian/data/langs/bx_timeline/ru.xml

@@ -49,6 +49,7 @@
 	<string name="_bx_timeline_acl_action_delete"><![CDATA[Удалить]]></string>
 	<string name="_bx_timeline_acl_action_vote"><![CDATA[Голосовать]]></string>
 	<string name="_bx_timeline_acl_action_share"><![CDATA[Поделиться]]></string>
+	<string name="_bx_timeline_acl_action_pin"><![CDATA[Прикреплять]]></string>
 
 	<string name="_bx_timeline_page_title_sys_view"><![CDATA[Лента]]></string>
 	<string name="_bx_timeline_page_title_view"><![CDATA[Лента]]></string>
@@ -74,6 +75,10 @@
 
     <string name="_bx_timeline_menu_title_item_manage"><![CDATA[Управлять Элементом]]></string>
     <string name="_bx_timeline_menu_set_title_item_manage"><![CDATA[Управлять Элементом]]></string>
+    <string name="_bx_timeline_menu_item_title_system_item_pin"><![CDATA[Прикалывать]]></string>
+    <string name="_bx_timeline_menu_item_title_item_pin"><![CDATA[Прикалывать]]></string>
+    <string name="_bx_timeline_menu_item_title_system_item_unpin"><![CDATA[Откалывать]]></string>
+    <string name="_bx_timeline_menu_item_title_item_unpin"><![CDATA[Откалывать]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_timeline_menu_item_title_item_delete"><![CDATA[Удалить]]></string>
 
@@ -115,6 +120,7 @@
 	<string name="_bx_timeline_txt_or_jump_to"><![CDATA[... или перейти к:]]></string>
 	<string name="_bx_timeline_txt_jump_to_n_year"><![CDATA[Перейти к {0} году]]></string>
 	<string name="_bx_timeline_txt_jump_to_recent"><![CDATA[Перейти к недавним сообщениям]]></string>
+	<string name="_bx_timeline_txt_pinned"><![CDATA[Приколотое событие]]></string>
 
 	<string name="_bx_timeline_txt_rss_caption"><![CDATA[Лента {0}]]></string>
 	<string name="_bx_timeline_txt_user_added_sample"><![CDATA[{0} добавил {1}]]></string>

modules/boonex/timeline/classes/BxTimelineDb.php

@@ -333,6 +333,8 @@ class BxTimelineDb extends BxBaseModNotificationsDb
         }
 
 		$sSelectClause .= "YEAR(FROM_UNIXTIME(`{$this->_sTable}`.`date`)) AS `year`, ";
+		if($aParams['browse'] == 'list')
+			$sOrderClause = "ORDER BY `{$this->_sTable}`.`pinned` DESC, `{$this->_sTable}`.`date` DESC";
 
         return array($sMethod, $sSelectClause, $sJoinClause, $sWhereClause, $sOrderClause, $sLimitClause);
     }

modules/boonex/timeline/classes/BxTimelineMenuItemManage.php

@@ -74,6 +74,16 @@ class BxTimelineMenuItemManage extends BxTemplMenu
         $sCheckFuncName = '';
         $aCheckFuncParams = array();
         switch ($a['name']) {
+        	case 'item-pin':
+                $sCheckFuncName = 'isAllowedPin';
+				$aCheckFuncParams = array($aEvent);
+                break;
+
+			case 'item-unpin':
+                $sCheckFuncName = 'isAllowedUnpin';
+				$aCheckFuncParams = array($aEvent);
+                break;
+
             case 'item-delete':
                 $sCheckFuncName = 'isAllowedDelete';
 				$aCheckFuncParams = array($aEvent);

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -71,6 +71,28 @@ class BxTimelineModule extends BxBaseModNotificationsModule
         echoJson($aResult);
     }
 
+	function actionPin()
+    {
+        $this->_iOwnerId = bx_process_input(bx_get('owner_id'), BX_DATA_INT);
+
+        $iId = bx_process_input(bx_get('id'), BX_DATA_INT);
+        $aEvent = $this->_oDb->getEvents(array('browse' => 'id', 'value' => $iId));
+
+        $mixedAllowed = $this->{'isAllowed' . ((int)$aEvent['pinned'] == 0 ? 'Pin' : 'Unpin')}($aEvent, true);
+        if($mixedAllowed !== true)
+            return echoJson(array('code' => 1, 'msg' => strip_tags($mixedAllowed)));
+
+		$aEvent['pinned'] = (int)$aEvent['pinned'] == 0 ? time() : 0;
+        if(!$this->_oDb->updateEvent(array('pinned' => $aEvent['pinned']), array('id' => $iId)))
+        	return echoJson(array('code' => 2));
+
+        $aResult = array('code' => 0, 'id' => $iId);
+		if($aEvent['pinned'] != 0)
+			$aResult['content'] = $this->_oTemplate->getPost($aEvent, array('type' => 'owner', 'owner_id' => $this->_iOwnerId, 'dynamic_mode' => true));
+
+		echoJson($aResult);
+    }
+
     function actionDelete()
     {
         $this->_iOwnerId = bx_process_input(bx_get('owner_id'), BX_DATA_INT);
@@ -854,6 +876,22 @@ class BxTimelineModule extends BxBaseModNotificationsModule
         return $aCheckResult[CHECK_ACTION_RESULT] !== CHECK_ACTION_RESULT_ALLOWED ? $aCheckResult[CHECK_ACTION_MESSAGE] : true;
     }
 
+	public function isAllowedPin($aEvent, $bPerform = false)
+    {
+    	if((int)$aEvent['pinned'] != 0)
+    		return false;
+
+        return $this->_isAllowedPin($aEvent, $bPerform);
+    }
+
+	public function isAllowedUnpin($aEvent, $bPerform = false)
+    {
+    	if((int)$aEvent['pinned'] == 0)
+    		return false;
+
+        return $this->_isAllowedPin($aEvent, $bPerform);
+    }
+
     public function isAllowedMore($aEvent, $bPerform = false)
     {
     	$oMoreMenu = $this->getManageMenuObject();
@@ -986,6 +1024,25 @@ class BxTimelineModule extends BxBaseModNotificationsModule
         return array($sSystem, $iObjectId, $iCount);
     }
 
+	protected function _isAllowedPin($aEvent, $bPerform = false)
+    {
+        if(isAdmin())
+            return true;
+
+        $iUserId = (int)$this->getUserId();
+        if($iUserId == 0)
+            return false;
+
+		if((int)$aEvent['owner_id'] == $iUserId)
+           return true;
+
+        $aCheckResult = checkActionModule($iUserId, 'pin', $this->getName(), $bPerform);
+        if ($oProfileOwner = BxDolProfile::getInstance($aEvent['owner_id']))
+            bx_alert($oProfileOwner->getModule(), $this->_oConfig->getUri() . '_pin', $oProfileOwner->id(), $iUserId, array('check_result' => &$aCheckResult));
+
+        return $aCheckResult[CHECK_ACTION_RESULT] !== CHECK_ACTION_RESULT_ALLOWED ? $aCheckResult[CHECK_ACTION_MESSAGE] : true;
+    }
+
 	protected function _deleteLinks($iId)
     {
 	    $aLinks = $this->_oDb->getLinks($iId);

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -518,6 +518,12 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             ),
             'item_view_url' => $this->_oConfig->getItemViewUrl($aEvent),
             'item_date' => bx_time_js($aEvent['date']),
+            'bx_if:show_pinned' => array(
+            	'condition' => (int)$aEvent['pinned'] != 0,
+            	'content' => array(
+            		'style_prefix' => $sStylePrefix,
+            	)
+            ),
             'content' => is_string($aEvent['content']) ? $aEvent['content'] : $this->_getContent($sType, $aEvent, $aBrowseParams),
             'bx_if:show_location' => array(
             	'condition' => !empty($sLocation),

modules/boonex/timeline/install/langs/en.xml

@@ -49,6 +49,7 @@
 	<string name="_bx_timeline_acl_action_delete"><![CDATA[Delete]]></string>
 	<string name="_bx_timeline_acl_action_vote"><![CDATA[Vote]]></string>
 	<string name="_bx_timeline_acl_action_share"><![CDATA[Repost]]></string>
+	<string name="_bx_timeline_acl_action_pin"><![CDATA[Pin]]></string>
 
 	<string name="_bx_timeline_page_title_sys_view"><![CDATA[Timeline]]></string>
 	<string name="_bx_timeline_page_title_view"><![CDATA[Timeline]]></string>
@@ -74,6 +75,10 @@
 
     <string name="_bx_timeline_menu_title_item_manage"><![CDATA[Manage Item]]></string>
     <string name="_bx_timeline_menu_set_title_item_manage"><![CDATA[Manage Item]]></string>
+	<string name="_bx_timeline_menu_item_title_system_item_pin"><![CDATA[Pin]]></string>
+    <string name="_bx_timeline_menu_item_title_item_pin"><![CDATA[Pin]]></string>
+    <string name="_bx_timeline_menu_item_title_system_item_unpin"><![CDATA[Unpin]]></string>
+    <string name="_bx_timeline_menu_item_title_item_unpin"><![CDATA[Unpin]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_delete"><![CDATA[Delete]]></string>
     <string name="_bx_timeline_menu_item_title_item_delete"><![CDATA[Delete]]></string>
 
@@ -115,6 +120,7 @@
 	<string name="_bx_timeline_txt_or_jump_to"><![CDATA[... or jump to:]]></string>
 	<string name="_bx_timeline_txt_jump_to_n_year"><![CDATA[Jump to {0} year]]></string>
 	<string name="_bx_timeline_txt_jump_to_recent"><![CDATA[Jump to recent posts]]></string>
+	<string name="_bx_timeline_txt_pinned"><![CDATA[Pinned post]]></string>
 
 	<string name="_bx_timeline_txt_rss_caption"><![CDATA[{0}'s timeline]]></string>
 	<string name="_bx_timeline_txt_user_added_sample"><![CDATA[{0} added {1}]]></string>

modules/boonex/timeline/install/sql/enable.sql

@@ -35,7 +35,9 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_timeline_menu_item_manage', 'bx_timeline', '_bx_timeline_menu_set_title_item_manage', 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_timeline_menu_item_manage', 'bx_timeline', 'item-delete', '_bx_timeline_menu_item_title_system_item_delete', '_bx_timeline_menu_item_title_item_delete', 'javascript:void(0)', 'javascript:{js_object_view}.deletePost(this, {content_id})', '_self', 'remove', '', 2147483647, 1, 0, 0);
+('bx_timeline_menu_item_manage', 'bx_timeline', 'item-pin', '_bx_timeline_menu_item_title_system_item_pin', '_bx_timeline_menu_item_title_item_pin', 'javascript:void(0)', 'javascript:{js_object_view}.pinPost(this, {content_id})', '_self', 'thumb-tack', '', 2147483647, 1, 0, 0),
+('bx_timeline_menu_item_manage', 'bx_timeline', 'item-unpin', '_bx_timeline_menu_item_title_system_item_unpin', '_bx_timeline_menu_item_title_item_unpin', 'javascript:void(0)', 'javascript:{js_object_view}.unpinPost(this, {content_id})', '_self', 'thumb-tack', '', 2147483647, 1, 0, 1),
+('bx_timeline_menu_item_manage', 'bx_timeline', 'item-delete', '_bx_timeline_menu_item_title_system_item_delete', '_bx_timeline_menu_item_title_item_delete', 'javascript:void(0)', 'javascript:{js_object_view}.deletePost(this, {content_id})', '_self', 'remove', '', 2147483647, 1, 0, 2);
 
 -- MENU: Item Actions (Comment, Plus)
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
@@ -117,6 +119,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_timeline', 'share', NULL, '_bx_timeline_acl_action_share', '', 1, 3);
 SET @iIdActionShare = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_timeline', 'pin', NULL, '_bx_timeline_acl_action_pin', '', 1, 3);
+SET @iIdActionPin = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -149,7 +155,11 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iStandard, @iIdActionShare),
 (@iModerator, @iIdActionShare),
 (@iAdministrator, @iIdActionShare),
-(@iPremium, @iIdActionShare);
+(@iPremium, @iIdActionShare),
+
+-- pin
+(@iModerator, @iIdActionPin),
+(@iAdministrator, @iIdActionPin);
 
 
 -- ALERTS

modules/boonex/timeline/install/sql/install.sql

@@ -19,7 +19,8 @@ CREATE TABLE IF NOT EXISTS `bx_timeline_events` (
   `date` int(11) NOT NULL default '0',
   `active` tinyint(4) NOT NULL default '1',
   `hidden` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`id`),
+  `pinned` int(11) NOT NULL default '0',
+  PRIMARY KEY (`id`),
   KEY `owner_id` (`owner_id`)
 );
 

modules/boonex/timeline/js/main.js

@@ -57,6 +57,17 @@ BxTimelineMain.prototype.prependMasonry = function(oItems) {
 		oHolder.masonry('prepended', oItems);
 };
 
+BxTimelineMain.prototype.removeMasonry = function(oItems, onRemove) {
+	var $this = this;
+	var oItems = $(oItems);
+
+	var oHolder = $(this.sIdView + ' .' + this.sClassItems);
+	if(typeof onRemove === 'function')
+		oHolder.masonry('once', 'removeComplete', onRemove);
+
+	oHolder.masonry('remove', oItems).masonry('layout');
+};
+
 BxTimelineMain.prototype.reloadMasonry = function() {
 	$(this.sIdView + ' .' + this.sClassItems).masonry('reloadItems').masonry('layout');
 };

modules/boonex/timeline/js/view.js

@@ -45,6 +45,14 @@ BxTimelineView.prototype.changeTimeline = function(oLink, iYear) {
 	this._getPosts(oLink, 'timeline');
 };
 
+BxTimelineView.prototype.pinPost = function(oLink, iId) {
+	this._pinPost(oLink, iId, 1);
+};
+
+BxTimelineView.prototype.unpinPost = function(oLink, iId) {
+	this._pinPost(oLink, iId, 0);
+};
+
 BxTimelineView.prototype.deletePost = function(oLink, iId) {
     var $this = this;
     var oView = $(this.sIdView);
@@ -62,7 +70,7 @@ BxTimelineView.prototype.deletePost = function(oLink, iId) {
         	if(oData && oData.msg != undefined)
                 alert(oData.msg);
 
-            if(oData && oData.code == 0)
+            if(oData && oData.code == 0) {
             	$(oLink).parents('.bx-popup-applied:first:visible').dolPopupHide();
 
                 $($this.sIdItem + oData.id).bx_anim('hide', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
@@ -76,7 +84,8 @@ BxTimelineView.prototype.deletePost = function(oLink, iId) {
                     $this.destroyMasonry();
                     oView.find('.bx-tl-load-more').hide();
                     oView.find('.bx-tl-empty').show();
-                });                        
+                });
+            }
         },
         'json'
     );
@@ -123,6 +132,44 @@ BxTimelineView.prototype.commentItem = function(oLink, sSystem, iId) {
     );
 };
 
+BxTimelineView.prototype._pinPost = function(oLink, iId, iWay) {
+    var $this = this;
+    var oView = $(this.sIdView);
+    var oData = this._getDefaultData();
+    oData['id'] = iId;
+
+    this.loadingInBlock(oView, true);
+
+    $.post(
+        this._sActionsUrl + 'pin/',
+        oData,
+        function(oData) {
+        	$this.loadingInBlock(oView, false);
+
+        	if(oData && oData.msg != undefined)
+                alert(oData.msg);
+
+            if(oData && oData.code == 0) {
+            	$(oLink).parents('.bx-popup-applied:first:visible').dolPopupHide({
+            		onHide: function(oPopup) {
+            			$(oPopup).remove();
+            		}
+            	});
+
+            	$this.removeMasonry(($this.sIdItem + oData.id), function() {
+            		if(iWay == 0) {
+                		$this._oRequestParams.start = 0;
+    	                $this._getPosts(oView, 'pin');
+                	}
+            		else
+            			$this.prependMasonry($(oData.content).bxTime());
+            	});
+            }
+        },
+        'json'
+    );
+};
+
 BxTimelineView.prototype._getPosts = function(oElement, sAction) {
     var $this = this;
     var oView = $(this.sIdView);

modules/boonex/timeline/template/css/view.css

@@ -59,6 +59,9 @@ div.bx-tl-item-info {
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
+div.bx-tl-item-info .bx-tl-pinned .sys-icon {
+	cursor: default;
+}
 
 /*+++ Item Text +++*/
 div.bx-tl-item-text {}
@@ -87,7 +90,6 @@ div.bx-tl-il-thumbnail img {
 	max-height: 100px;
 }
 
-
 /*+++ Item Shared +++*/
 div.bx-tl-shared div.bx-tl-item-text {
 	padding-left: 5px;
@@ -107,6 +109,7 @@ div.bx-tl-shared div.bx-tl-content {
 	color: #999999;
 }
 
+
 /*--- Empty Style ---*/
 div.bx-tl-empty div.bx-msg-box-container {
 	margin-top: 0px;

modules/boonex/timeline/template/item.html

@@ -20,6 +20,11 @@
 					</div>
 					<div class="__style_prefix__-item-info bx-def-font-small">
 						<a class="__style_prefix__-date" href="__item_view_url__">__item_date__</a>
+						<bx_if:show_pinned>
+							<span class="__style_prefix__-pinned bx-def-margin-thd-left">
+								<i class="sys-icon thumb-tack bx-def-margin-thd-left" title="<bx_text_attribute:_bx_timeline_txt_pinned />"></i>
+							</span>
+						</bx_if:show_pinned>
 					</div>
 				</div>
 			</div>

template/grid.html

@@ -2,7 +2,7 @@
 <div id="__id_wrap__">
 
     <bx_if:display_header>
-        <div class="bx-grid-header bx-def-margin-top bx-clearfix">
+        <div class="bx-grid-header bx-clearfix">
 
             <bx_if:filter>
                 <div style="float:left;">