Przeglądaj źródła

Ticket #2410 - Usage in Polls.

AntonLV 7 lat temu
rodzic
commit
0a4e4400e1

+ 1 - 0
modules/boonex/polls/classes/BxPollsConfig.php

@@ -65,6 +65,7 @@ class BxPollsConfig extends BxBaseModTextConfig
 
             'URL_HOME' => 'page.php?i=polls-home',
             'URL_POPULAR' => 'page.php?i=polls-popular',
+            'URL_TOP' => 'page.php?i=polls-top',
             'URL_UPDATED' => 'page.php?i=polls-updated',
             'URL_MANAGE_COMMON' => 'page.php?i=polls-manage',
             'URL_MANAGE_ADMINISTRATION' => 'page.php?i=polls-administration',

+ 7 - 22
modules/boonex/polls/classes/BxPollsSearchResult.php

@@ -97,6 +97,13 @@ class BxPollsSearchResult extends BxBaseModTextSearchResult
                 $this->aCurrent['sorting'] = 'popular';
                 break;
 
+            case 'top':
+                $this->sBrowseUrl = BxDolPermalinks::getInstance()->permalink($CNF['URL_TOP']);
+                $this->aCurrent['title'] = _t('_bx_polls_page_title_browse_top');
+                $this->aCurrent['rss']['link'] = 'modules/?r=posts/rss/' . $sMode;
+                $this->aCurrent['sorting'] = 'top';
+                break;
+
             case 'updated':
                 $this->sBrowseUrl = BxDolPermalinks::getInstance()->permalink($CNF['URL_UPDATED']);
                 $this->aCurrent['title'] = _t('_bx_polls_page_title_browse_updated');
@@ -135,28 +142,6 @@ class BxPollsSearchResult extends BxBaseModTextSearchResult
 
         return $this->oModule->_oTemplate->getJsCode('entry');
     }
-    
-    
-        
-    function getAlterOrder()
-    {
-        $aSql = array();
-        switch ($this->aCurrent['sorting']) {
-            case 'last':
-                $aSql['order'] = ' ORDER BY `bx_polls_entries`.`added` DESC';
-                break;
-            case 'featured':
-                $aSql['order'] = ' ORDER BY `bx_polls_entries`.`featured` DESC';
-                break;
-            case 'updated':
-                $aSql['order'] = ' ORDER BY `bx_polls_entries`.`changed` DESC';
-                break;
-            case 'popular':
-                $aSql['order'] = ' ORDER BY `bx_polls_entries`.`views` DESC';
-                break;
-        }
-        return $aSql;
-    }
 }
 
 /** @} */

+ 6 - 0
modules/boonex/polls/install/langs/en.xml

@@ -77,6 +77,7 @@
 	<string name="_bx_polls_page_title_browse_featured"><![CDATA[Featured Polls]]></string>
     <string name="_bx_polls_page_title_browse_recent"><![CDATA[Latest Polls]]></string>
     <string name="_bx_polls_page_title_browse_popular"><![CDATA[Popular Polls]]></string>
+    <string name="_bx_polls_page_title_browse_top"><![CDATA[Top]]></string>
     <string name="_bx_polls_page_title_browse_updated"><![CDATA[Updated Polls]]></string>
     <string name="_bx_polls_page_title_sys_home"><![CDATA[Polls Home]]></string>
     <string name="_bx_polls_page_title_home"><![CDATA[Polls]]></string>
@@ -93,10 +94,13 @@
     <string name="_bx_polls_page_block_title_entry_all_actions"><![CDATA[All Actions]]></string>
     <string name="_bx_polls_page_title_sys_entries_popular"><![CDATA[Popular Polls]]></string>
     <string name="_bx_polls_page_title_entries_popular"><![CDATA[Popular Polls]]></string>
+    <string name="_bx_polls_page_title_sys_entries_top"><![CDATA[Top Polls]]></string>
+    <string name="_bx_polls_page_title_entries_top"><![CDATA[Top Polls]]></string>
     <string name="_bx_polls_page_title_sys_entries_updated"><![CDATA[Updated Polls]]></string>
     <string name="_bx_polls_page_title_entries_updated"><![CDATA[Updated Polls]]></string>
     <string name="_bx_polls_page_block_title_popular_entries"><![CDATA[Popular Polls]]></string>
     <string name="_bx_polls_page_block_title_popular_entries_view_full"><![CDATA[Popular Polls (Full View)]]></string>
+    <string name="_bx_polls_page_block_title_top_entries"><![CDATA[Top Polls]]></string>
     <string name="_bx_polls_page_block_title_updated_entries"><![CDATA[Updated Polls]]></string>
     <string name="_bx_polls_page_title_sys_view_entry_comments"><![CDATA[Poll Comments]]></string>
     <string name="_bx_polls_page_title_view_entry_comments"><![CDATA[Comments to {title}]]></string>
@@ -158,6 +162,8 @@
     <string name="_bx_polls_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_polls_menu_item_title_system_entries_popular"><![CDATA[Popular]]></string>
     <string name="_bx_polls_menu_item_title_entries_popular"><![CDATA[Popular]]></string>
+    <string name="_bx_polls_menu_item_title_system_entries_top"><![CDATA[Top]]></string>
+    <string name="_bx_polls_menu_item_title_entries_top"><![CDATA[Top]]></string>
     <string name="_bx_polls_menu_title_view_entry_submenu"><![CDATA[View Poll Submenu]]></string>
     <string name="_bx_polls_menu_set_title_view_entry_submenu"><![CDATA[View Poll Submenu]]></string>
     <string name="_bx_polls_menu_item_title_view_entry_submenu_entry"><![CDATA[Poll]]></string>

+ 1 - 1
modules/boonex/polls/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_polls';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_polls' OR `object` IN('bx_polls_create_entry', 'bx_polls_edit_entry', 'bx_polls_delete_entry', 'bx_polls_view_entry', 'bx_polls_view_entry_comments', 'bx_polls_home', 'bx_polls_popular', 'bx_polls_updated', 'bx_polls_author', 'bx_polls_search', 'bx_polls_context', 'bx_polls_manage');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_polls' OR `object` IN('bx_polls_create_entry', 'bx_polls_edit_entry', 'bx_polls_delete_entry', 'bx_polls_view_entry', 'bx_polls_view_entry_comments', 'bx_polls_home', 'bx_polls_popular', 'bx_polls_top', 'bx_polls_updated', 'bx_polls_author', 'bx_polls_search', 'bx_polls_context', 'bx_polls_manage');
 
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_polls';

+ 11 - 2
modules/boonex/polls/install/sql/enable.sql

@@ -79,6 +79,14 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbo
 ('bx_polls_popular', 1, 'bx_polls', '_bx_polls_page_block_title_popular_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:14:"browse_popular";s:6:"params";a:3:{s:9:"unit_view";s:8:"extended";s:13:"empty_message";b:1;s:13:"ajax_paginate";b:0;}}', 0, 1, 1);
 
 
+-- PAGE: top 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_polls_top', '_bx_polls_page_title_sys_entries_top', '_bx_polls_page_title_entries_top', 'bx_polls', 5, 2147483647, 1, 'polls-top', 'page.php?i=polls-top', '', '', '', 0, 1, 0, 'BxPollsPageBrowse', 'modules/boonex/polls/classes/BxPollsPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
+('bx_polls_top', 1, 'bx_polls', '_bx_polls_page_block_title_top_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:10:"browse_top";s:6:"params";a:3:{s:9:"unit_view";s:8:"extended";s:13:"empty_message";b:1;s:13:"ajax_paginate";b:0;}}', 0, 1, 1);
+
+
 -- PAGE: recently updated 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_polls_updated', '_bx_polls_page_title_sys_entries_updated', '_bx_polls_page_title_entries_updated', 'bx_polls', 5, 2147483647, 1, 'polls-updated', 'page.php?i=polls-updated', '', '', '', 0, 1, 0, 'BxPollsPageBrowse', 'modules/boonex/polls/classes/BxPollsPageBrowse.php');
@@ -233,8 +241,9 @@ 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_polls_submenu', 'bx_polls', 'polls-home', '_bx_polls_menu_item_title_system_entries_public', '_bx_polls_menu_item_title_entries_public', 'page.php?i=polls-home', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_polls_submenu', 'bx_polls', 'polls-popular', '_bx_polls_menu_item_title_system_entries_popular', '_bx_polls_menu_item_title_entries_popular', 'page.php?i=polls-popular', '', '', '', '', 2147483647, 1, 1, 2),
-('bx_polls_submenu', 'bx_polls', 'polls-search', '_bx_polls_menu_item_title_system_entries_search', '_bx_polls_menu_item_title_entries_search', 'page.php?i=polls-search', '', '', '', '', 2147483647, 1, 1, 3),
-('bx_polls_submenu', 'bx_polls', 'polls-manage', '_bx_polls_menu_item_title_system_entries_manage', '_bx_polls_menu_item_title_entries_manage', 'page.php?i=polls-manage', '', '', '', '', 2147483646, 1, 1, 4);
+('bx_polls_submenu', 'bx_polls', 'polls-top', '_bx_polls_menu_item_title_system_entries_top', '_bx_polls_menu_item_title_entries_top', 'page.php?i=polls-top', '', '', '', '', 2147483647, 1, 1, 3),
+('bx_polls_submenu', 'bx_polls', 'polls-search', '_bx_polls_menu_item_title_system_entries_search', '_bx_polls_menu_item_title_entries_search', 'page.php?i=polls-search', '', '', '', '', 2147483647, 1, 1, 4),
+('bx_polls_submenu', 'bx_polls', 'polls-manage', '_bx_polls_menu_item_title_system_entries_manage', '_bx_polls_menu_item_title_entries_manage', 'page.php?i=polls-manage', '', '', '', '', 2147483646, 1, 1, 5);
 
 -- MENU: sub-menu for view entry
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 

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

@@ -77,6 +77,7 @@
 	<string name="_bx_polls_page_title_browse_featured"><![CDATA[Продвинутые голосования]]></string>
     <string name="_bx_polls_page_title_browse_recent"><![CDATA[Недавние голосования]]></string>
     <string name="_bx_polls_page_title_browse_popular"><![CDATA[Популярные голосования]]></string>
+    <string name="_bx_polls_page_title_browse_top"><![CDATA[Топ голосований]]></string>
     <string name="_bx_polls_page_title_browse_updated"><![CDATA[Обновлённые голосования]]></string>
     <string name="_bx_polls_page_title_sys_home"><![CDATA[Голосования - Домой]]></string>
     <string name="_bx_polls_page_title_home"><![CDATA[Голосования]]></string>
@@ -93,10 +94,13 @@
     <string name="_bx_polls_page_block_title_entry_all_actions"><![CDATA[Все действия]]></string>
     <string name="_bx_polls_page_title_sys_entries_popular"><![CDATA[Популярные голосования]]></string>
     <string name="_bx_polls_page_title_entries_popular"><![CDATA[Популярные голосования]]></string>
+    <string name="_bx_polls_page_title_sys_entries_top"><![CDATA[Топ голосований]]></string>
+    <string name="_bx_polls_page_title_entries_top"><![CDATA[Топ голосований]]></string>
     <string name="_bx_polls_page_title_sys_entries_updated"><![CDATA[Обновленные голосования]]></string>
     <string name="_bx_polls_page_title_entries_updated"><![CDATA[Обновленные голосования]]></string>
     <string name="_bx_polls_page_block_title_popular_entries"><![CDATA[Популярные голосования]]></string>
     <string name="_bx_polls_page_block_title_popular_entries_view_full"><![CDATA[Популярные голосования (Полный просмотр)]]></string>
+    <string name="_bx_polls_page_block_title_top_entries"><![CDATA[Топ голосований]]></string>
     <string name="_bx_polls_page_block_title_updated_entries"><![CDATA[Обновленные голосования]]></string>
     <string name="_bx_polls_page_title_sys_view_entry_comments"><![CDATA[Комментарии к голосованию]]></string>
     <string name="_bx_polls_page_title_view_entry_comments"><![CDATA[Комментарии к {title}]]></string>
@@ -158,6 +162,8 @@
     <string name="_bx_polls_menu_item_title_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_polls_menu_item_title_system_entries_popular"><![CDATA[Популярные]]></string>
     <string name="_bx_polls_menu_item_title_entries_popular"><![CDATA[Популярные]]></string>
+    <string name="_bx_polls_menu_item_title_system_entries_top"><![CDATA[Топ]]></string>
+    <string name="_bx_polls_menu_item_title_entries_top"><![CDATA[Топ]]></string>
     <string name="_bx_polls_menu_title_view_entry_submenu"><![CDATA[Просмотреть голосование - Подменю]]></string>
     <string name="_bx_polls_menu_set_title_view_entry_submenu"><![CDATA[Просмотреть голосование - Подменю]]></string>
     <string name="_bx_polls_menu_item_title_view_entry_submenu_entry"><![CDATA[Голосование]]></string>