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

modules/boonex/channels/classes/BxCnlModule.php

@@ -298,6 +298,11 @@ class BxCnlModule extends BxBaseModGroupsModule
         return '';
     }
     
+    public function serviceBrowseByLevel ($iLevelId = 0, $bDisplayEmptyMsg = false)
+    {
+        return $this->_serviceBrowse ('level', array('level' => $iLevelId), BX_DB_PADDING_DEF, $bDisplayEmptyMsg);
+    }
+    
     public function serviceBrowseAuthor($iProfileId = 0, $aParams = array())
     {
         $CNF = &$this->_oConfig->CNF;

modules/boonex/channels/classes/BxCnlSearchResult.php

@@ -136,6 +136,20 @@ class BxCnlSearchResult extends BxBaseModGroupsSearchResult
                 $this->aCurrent['sorting'] = 'top';
                 $this->sBrowseUrl = 'page.php?i=channels-top';
                 break;
+           
+            case 'level':
+                $this->aCurrent['join']['level'] = array(
+                    'type' => 'INNER',
+                    'table' => 'sys_labels',
+                    'mainTable' => 'bx_cnl_data',
+                    'mainField' => 'channel_name',
+                    'onField' => 'value',
+                    'joinFields' => array('value'),
+                );
+                $this->aCurrent['restriction']['level'] = array('value' => $aParams['level'], 'field' => 'level', 'operator' => '=', 'table' => 'sys_labels');
+                $this->aCurrent['sorting'] = 'level';
+                $this->sBrowseUrl = 'page.php?i=channels-toplevel';
+                break;
 
             case '': // search results
                 $this->sBrowseUrl = BX_DOL_SEARCH_KEYWORD_PAGE;
@@ -164,6 +178,8 @@ class BxCnlSearchResult extends BxBaseModGroupsSearchResult
             return array();
         case 'top':
             return array('order' => ' ORDER BY `bx_cnl_data`.`views` DESC ');
+        case 'level':
+            return array('order' => ' ORDER BY `bx_cnl_data`.`channel_name` DESC ');
         case 'last':
         default:
             return array('order' => ' ORDER BY `bx_cnl_data`.`added` DESC ');

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

@@ -77,6 +77,8 @@
 	<string name="_bx_channels_page_title_top"><![CDATA[Top Channels]]></string>
 	<string name="_bx_channels_page_title_sys_entries_search"><![CDATA[Search]]></string>
 	<string name="_bx_channels_page_title_entries_search"><![CDATA[Search]]></string>
+  <string name="_bx_channels_page_title_sys_entries_toplevel"><![CDATA[Top level]]></string>
+  <string name="_bx_channels_page_title_entries_toplevel"><![CDATA[Top level]]></string>
         <string name="_bx_channels_page_title_sys_entries_of_author"><![CDATA[Сhannels of author]]></string>
         <string name="_bx_channels_page_title_entries_of_author"><![CDATA[Сhannels by {display_name}]]></string>
 
@@ -113,6 +115,7 @@
         <string name="_bx_channels_page_block_title_entry_parent"><![CDATA[Parent Channel]]></string>
         <string name="_bx_channels_page_block_title_entry_childs"><![CDATA[Child Channels]]></string>
 	<string name="_bx_channels_page_block_title_search_form"><![CDATA[Search Form]]></string>
+  <string name="_bx_channels_page_block_title_toplevel"><![CDATA[Top level]]></string>
         <string name="_bx_channels_page_block_title_entries_my"><![CDATA[My Followed Channels]]></string>
         <string name="_bx_channels_page_trigger_block_title_entries_my"><![CDATA[My Followed Channels]]></string>
         <string name="_bx_channels_page_block_title_search_results"><![CDATA[Search Results]]></string>
@@ -187,6 +190,8 @@
 	<string name="_bx_channels_menu_item_title_entries_recent"><![CDATA[New]]></string>
 	<string name="_bx_channels_menu_item_title_system_entries_search"><![CDATA[Search]]></string>
 	<string name="_bx_channels_menu_item_title_entries_search"><![CDATA[Search]]></string>
+  <string name="_bx_channels_menu_item_title_system_entries_toplevel"><![CDATA[Top level]]></string>
+  <string name="_bx_channels_menu_item_title_entries_toplevel"><![CDATA[Top level]]></string>
         <string name="_bx_channels_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_channels_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_channels_menu_item_title_system_entries_home"><![CDATA[Channels]]></string>

modules/boonex/channels/install/sql/disable.sql

@@ -8,7 +8,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 
 -- PAGES
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_channels';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_channels' OR `object` IN('bx_channels_create_profile', 'bx_channels_delete_profile', 'bx_channels_edit_profile', 'bx_channels_edit_profile_cover', 'bx_channels_view_profile', 'bx_channels_view_profile_closed', 'bx_channels_profile_info', 'bx_channels_profile_comments', 'bx_channels_author', 'bx_channels_home', 'bx_channels_top', 'bx_channels_search', 'bx_channels_manage', 'bx_channels_administration');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_channels' OR `object` IN('bx_channels_create_profile', 'bx_channels_delete_profile', 'bx_channels_edit_profile', 'bx_channels_edit_profile_cover', 'bx_channels_view_profile', 'bx_channels_view_profile_closed', 'bx_channels_profile_info', 'bx_channels_profile_comments', 'bx_channels_author', 'bx_channels_home', 'bx_channels_top', 'bx_channels_search', 'bx_channels_toplevel', 'bx_channels_manage', 'bx_channels_administration');
 
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_channels';

modules/boonex/channels/install/sql/enable.sql

@@ -111,6 +111,13 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
 ('bx_channels_top', 1, 'bx_channels', '_bx_channels_page_block_title_top_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:11:\"bx_channels\";s:6:\"method\";s:19:\"browse_top_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 0, 1, 0);
 
+-- PAGE: top level entries
+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_channels_toplevel', '_bx_channels_page_title_sys_entries_toplevel', '_bx_channels_page_title_entries_toplevel', 'bx_channels', 5, 2147483647, 1, 'channels-toplevel', 'page.php?i=toplevel', '', '', '', 0, 1, 0, 'BxCnlPageBrowse', 'modules/boonex/channels/classes/BxCnlPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_channels_toplevel', 1, 'bx_channels', '_bx_channels_page_block_title_toplevel', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:11:\"bx_channels\";s:6:\"method\";s:15:\"browse_by_level\";s:6:"params";a:2:{i:0;i:0;i:1;b:1;}}', 0, 1, 1, 1);
+
 -- PAGE: search for entries
 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_channels_search', '_bx_channels_page_title_sys_entries_search', '_bx_channels_page_title_entries_search', 'bx_channels', 5, 2147483647, 1, 'channels-search', 'page.php?i=channels-search', '', '', '', 0, 1, 0, 'BxCnlPageBrowse', 'modules/boonex/channels/classes/BxCnlPageBrowse.php');
@@ -240,8 +247,8 @@ 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_channels_submenu', 'bx_channels', 'channels-home', '_bx_channels_menu_item_title_system_entries_recent', '_bx_channels_menu_item_title_entries_recent', 'page.php?i=channels-home', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_channels_submenu', 'bx_channels', 'channels-top', '_bx_channels_menu_item_title_system_entries_top', '_bx_channels_menu_item_title_entries_top', 'page.php?i=channels-top', '', '', '', '', 2147483647, 1, 1, 2),
-('bx_channels_submenu', 'bx_channels', 'channels-search', '_bx_channels_menu_item_title_system_entries_search', '_bx_channels_menu_item_title_entries_search', 'page.php?i=channels-search', '', '', '', '', 2147483647, 1, 1, 3);
-
+('bx_channels_submenu', 'bx_channels', 'channels-toplevel', '_bx_channels_menu_item_title_system_entries_toplevel', '_bx_channels_menu_item_title_entries_toplevel', 'page.php?i=channels-toplevel', '', '', '', '', 2147483647, 1, 1, 3),
+('bx_channels_submenu', 'bx_channels', 'channels-search', '_bx_channels_menu_item_title_system_entries_search', '_bx_channels_menu_item_title_entries_search', 'page.php?i=channels-search', '', '', '', '', 2147483647, 1, 1, 4);
 -- MENU: custom menu for snippet meta info
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_channels_snippet_meta', '_sys_menu_title_snippet_meta', 'bx_channels_snippet_meta', 'bx_channels', 15, 0, 1, 'BxCnlMenuSnippetMeta', 'modules/boonex/channels/classes/BxCnlMenuSnippetMeta.php');

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

@@ -78,6 +78,8 @@
     <string name="_bx_channels_page_title_sys_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_channels_page_title_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_channels_page_title_sys_entries_of_author"><![CDATA[Каналы автора]]></string>
+    <string name="_bx_channels_page_title_sys_entries_toplevel"><![CDATA[Верхний уровень]]></string>
+    <string name="_bx_channels_page_title_entries_toplevel"><![CDATA[Верхний уровень]]></string>
     <string name="_bx_channels_page_title_entries_of_author"><![CDATA[{display_name} - Каналы]]></string>
 
     <string name="_bx_channels_page_block_title_sys_entries_actions"><![CDATA[Каналы - Действия]]></string>
@@ -113,6 +115,7 @@
     <string name="_bx_channels_page_block_title_entry_parent"><![CDATA[Родительский канал]]></string>
     <string name="_bx_channels_page_block_title_entry_childs"><![CDATA[Дочерние каналы]]></string>
     <string name="_bx_channels_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_channels_page_block_title_toplevel"><![CDATA[Верхний уровень]]></string>
     <string name="_bx_channels_page_block_title_entries_my"><![CDATA[Мои просматриваемые каналы]]></string>
     <string name="_bx_channels_page_trigger_block_title_entries_my"><![CDATA[Мои просматриваемые каналы]]></string>
     <string name="_bx_channels_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
@@ -187,6 +190,8 @@
     <string name="_bx_channels_menu_item_title_entries_recent"><![CDATA[Новые]]></string>
     <string name="_bx_channels_menu_item_title_system_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_channels_menu_item_title_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_channels_menu_item_title_system_entries_toplevel"><![CDATA[Верхний уровень]]></string>
+    <string name="_bx_channels_menu_item_title_entries_toplevel"><![CDATA[Верхний уровень]]></string>
     <string name="_bx_channels_menu_item_title_system_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_channels_menu_item_title_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_channels_menu_item_title_system_entries_home"><![CDATA[Каналы]]></string>