Ticket #967 - Posts and Polls modules.

modules/boonex/polls/classes/BxPollsConfig.php

@@ -39,12 +39,14 @@ class BxPollsConfig extends BxBaseModTextConfig
             'FIELD_TITLE' => '',
             'FIELD_TEXT' => 'text',
             'FIELD_TEXT_ID' => 'poll-text',
+        	'FIELD_CATEGORY' => 'cat',
         	'FIELD_SUBENTRIES' => 'subentries',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
         	'FIELD_ANONYMOUS' => 'anonymous',
         	'FIELD_HIDDEN_RESULTS' => 'hidden_results',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
+        	'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
 	        'FIELD_STATUS' => 'status',
         	'FIELD_STATUS_ADMIN' => 'status_admin',
@@ -85,6 +87,7 @@ class BxPollsConfig extends BxBaseModTextConfig
         	'OBJECT_FEATURED' => 'bx_polls',
             'OBJECT_METATAGS' => 'bx_polls',
             'OBJECT_COMMENTS' => 'bx_polls',
+            'OBJECT_CATEGORY' => 'bx_polls_cats',
             'OBJECT_PRIVACY_VIEW' => 'bx_polls_allow_view_to',
             'OBJECT_FORM_ENTRY' => 'bx_polls',
             'OBJECT_FORM_ENTRY_DISPLAY_VIEW' => 'bx_polls_entry_view',
@@ -96,6 +99,7 @@ class BxPollsConfig extends BxBaseModTextConfig
             'OBJECT_MENU_SUBMENU' => 'bx_polls_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_polls_view_submenu', // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'polls-home', // first item in view entry submenu from main module submenu
+            'OBJECT_MENU_SNIPPET_META' => 'bx_polls_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_polls_menu_manage_tools', //manage menu in content administration tools
             'OBJECT_GRID_ADMINISTRATION' => 'bx_polls_administration',
         	'OBJECT_GRID_COMMON' => 'bx_polls_common',

modules/boonex/polls/classes/BxPollsTemplate.php

@@ -101,55 +101,6 @@ class BxPollsTemplate extends BxBaseModTextTemplate
         );
     }
 
-    protected function getUnit ($aData, $aParams = array())
-    {
-        $CNF = &$this->getModule()->_oConfig->CNF;
-        $sJsObject = $this->_oConfig->getJsObject('entry');
-
-        $iContentId = $aData[$CNF['FIELD_ID']];
-        $bPerformed = $this->_oDb->isPerformed($iContentId, bx_get_logged_profile_id());
-
-        $oComments = BxDolCmts::getObjectInstance($CNF['OBJECT_COMMENTS'], $iContentId);
-
-        $bTmplVarsComments = $oComments && $oComments->isEnabled();
-        $aTmplVarsComments = array();
-        if($bTmplVarsComments)
-            $aTmplVarsComments = array(
-            	'entry_comments' => _t('_bx_polls_txt_entry_comment_counter', $aData[$CNF['FIELD_COMMENTS']]),
-                'entry_comments_url' => $oComments->getListUrl()
-            );
-
-        $bTmplVarsSwitcher = (int)$aData[$CNF['FIELD_HIDDEN_RESULTS']] == 0 || $bPerformed;
-        $aTmplVarsSwitcher = array();
-        if($bTmplVarsSwitcher)
-            $aTmplVarsSwitcher = array(
-                'js_object' => $sJsObject,
-                'id' => $iContentId,
-                'bx_if:hide_subentries' => array(
-                    'condition' => !$bPerformed,
-                    'content' => array()
-                ),
-                'bx_if:hide_results' => array(
-                    'condition' => $bPerformed,
-                    'content' => array()
-                ),
-            );
-
-        $aResult = parent::getUnit ($aData, $aParams);
-        $aResult = array_merge($aResult, array(
-            'bx_if:show_comments' => array(
-                'condition' => $bTmplVarsComments, 
-                'content' => $aTmplVarsComments
-            ),
-            'bx_if:show_switcher' => array(
-                'condition' => $bTmplVarsSwitcher, 
-                'content' => $aTmplVarsSwitcher
-            ),
-        )); 
-
-        return $aResult;
-    }
-
     protected function getTitle($aData)
     {
         return $this->_oConfig->getTitle($aData);

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

@@ -213,7 +213,6 @@
     <string name="_bx_polls_txt_sample_single_with_article"><![CDATA[a poll]]></string>
     <string name="_bx_polls_txt_sample_comment_single"><![CDATA[comment to poll]]></string>
     <string name="_bx_polls_txt_sample_vote_single"><![CDATA[vote to poll]]></string>
-    <string name="_bx_polls_txt_entry_comment_counter"><![CDATA[{0} comments]]></string>
     <string name="_bx_polls_txt_subentry_vote_do_by"><![CDATA[Voted for]]></string>
     <string name="_bx_polls_txt_subentry_vote_counter"><![CDATA[{0} votes]]></string>
     <string name="_bx_polls_txt_subentry_vote_percent"><![CDATA[({0}%)]]></string>

modules/boonex/polls/install/sql/disable.sql

@@ -13,7 +13,7 @@ DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_polls' OR `object` IN('bx_po
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_polls';
 DELETE FROM `sys_menu_sets` WHERE `module` = 'bx_polls';
-DELETE FROM `sys_menu_items` WHERE `module` = 'bx_polls' OR `set_name` IN('bx_polls_view', 'bx_polls_submenu', 'bx_polls_view_submenu', 'bx_polls_my');
+DELETE FROM `sys_menu_items` WHERE `module` = 'bx_polls' OR `set_name` IN('bx_polls_view', 'bx_polls_submenu', 'bx_polls_view_submenu', 'bx_polls_snippet_meta', 'bx_polls_my');
 
 -- PRIVACY 
 DELETE FROM `sys_objects_privacy` WHERE `object` = 'bx_polls_allow_view_to';

modules/boonex/polls/install/sql/enable.sql

@@ -208,6 +208,22 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_polls_view_submenu', 'bx_polls', 'view-poll', '_bx_polls_menu_item_title_system_view_entry', '_bx_polls_menu_item_title_view_entry_submenu_entry', 'page.php?i=view-poll&id={content_id}', '', '', '', '', 2147483647, 0, 0, 1),
 ('bx_polls_view_submenu', 'bx_polls', 'view-poll-comments', '_bx_polls_menu_item_title_system_view_entry_comments', '_bx_polls_menu_item_title_view_entry_submenu_comments', 'page.php?i=view-poll-comments&id={content_id}', '', '', '', '', 2147483647, 0, 0, 2);
 
+-- 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_polls_snippet_meta', '_sys_menu_title_snippet_meta', 'bx_polls_snippet_meta', 'bx_polls', 15, 0, 1, 'BxPollsMenuSnippetMeta', 'modules/boonex/polls/classes/BxPollsMenuSnippetMeta.php');
+
+INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
+('bx_polls_snippet_meta', 'bx_polls', '_sys_menu_set_title_snippet_meta', 0);
+
+INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES 
+('bx_polls_snippet_meta', 'bx_polls', 'date', '_sys_menu_item_title_system_sm_date', '_sys_menu_item_title_sm_date', '', '', '', '', '', 2147483647, 1, 0, 1, 1),
+('bx_polls_snippet_meta', 'bx_polls', 'comments', '_sys_menu_item_title_system_sm_comments', '_sys_menu_item_title_sm_comments', '', '', '', '', '', 2147483647, 1, 0, 1, 2),
+('bx_polls_snippet_meta', 'bx_polls', 'author', '_sys_menu_item_title_system_sm_author', '_sys_menu_item_title_sm_author', '', '', '', '', '', 2147483647, 1, 0, 1, 3),
+('bx_polls_snippet_meta', 'bx_polls', 'category', '_sys_menu_item_title_system_sm_category', '_sys_menu_item_title_sm_category', '', '', '', '', '', 2147483647, 0, 0, 1, 4),
+('bx_polls_snippet_meta', 'bx_polls', 'tags', '_sys_menu_item_title_system_sm_tags', '_sys_menu_item_title_sm_tags', '', '', '', '', '', 2147483647, 0, 0, 1, 5),
+('bx_polls_snippet_meta', 'bx_polls', 'views', '_sys_menu_item_title_system_sm_views', '_sys_menu_item_title_sm_views', '', '', '', '', '', 2147483647, 0, 0, 1, 6),
+('bx_polls_snippet_meta', 'bx_polls', 'actions', '_sys_menu_item_title_system_sm_actions', '_sys_menu_item_title_sm_actions', '', '', '', '', '', 2147483647, 1, 0, 1, 7);
+
 -- MENU: profile stats
 SET @iNotifMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_profile_stats' AND `active` = 1 LIMIT 1);
 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

modules/boonex/polls/template/unit.html

@@ -6,20 +6,7 @@
     </bx_if:thumb>
     <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <h2 class="bx-base-text-unit-title"><a href="__content_url__">__title__</a></h2>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
-            <span class="bx-def-font-grayed">__entry_posting_date__</span>
-            <bx_if:show_comments>
-	            <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-	            <a class="bx-base-text-unit-comments" href="__entry_comments_url__">__entry_comments__</a>
-            </bx_if:show_comments>
-            <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-            <a class="bx-base-text-unit-author" href="__author_url__">__author__</a>
-            <bx_if:show_switcher>
-                <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-                <a class="bx-base-text-unit-switcher bx-base-text-unit-subentries" href="javascript:void(0)" onclick="javascript:__js_object__.changeBlockSnippet(this, 'subentries', __id__);" style="<bx_if:hide_subentries>display:none</bx_if:hide_subentries>"><bx_text:_bx_polls_menu_item_view_subentries /></a>
-                <a class="bx-base-text-unit-switcher bx-base-text-unit-results" href="javascript:void(0)" onclick="javascript:__js_object__.changeBlockSnippet(this, 'results', __id__);" style="<bx_if:hide_results>display:none</bx_if:hide_results>"><bx_text:_bx_polls_menu_item_view_results /></a>
-            </bx_if:show_switcher>
-        </div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
         <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
             __summary__
         </div> 

modules/boonex/polls/template/unit_full.html

@@ -6,20 +6,7 @@
     </bx_if:thumb>
     <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <div class="bx-base-text-unit-title">__text__</div>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
-            <a href="__content_url__">__entry_posting_date__</a>
-            <bx_if:show_comments>
-                <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-                <a class="bx-base-text-unit-comments" href="__entry_comments_url__">__entry_comments__</a>
-            </bx_if:show_comments>
-            <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-            <a class="bx-base-text-unit-author" href="__author_url__">__author__</a>
-            <bx_if:show_switcher>
-                <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-                <a class="bx-base-text-unit-switcher bx-base-text-unit-subentries" href="javascript:void(0)" onclick="javascript:__js_object__.changeBlockSnippet(this, 'subentries', __id__);" style="<bx_if:hide_subentries>display:none</bx_if:hide_subentries>"><bx_text:_bx_polls_menu_item_view_subentries /></a>
-                <a class="bx-base-text-unit-switcher bx-base-text-unit-results" href="javascript:void(0)" onclick="javascript:__js_object__.changeBlockSnippet(this, 'results', __id__);" style="<bx_if:hide_results>display:none</bx_if:hide_results>"><bx_text:_bx_polls_menu_item_view_results /></a>
-            </bx_if:show_switcher>
-        </div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
         <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
             __summary__
         </div> 

modules/boonex/posts/classes/BxPostsConfig.php

@@ -37,9 +37,11 @@ class BxPostsConfig extends BxBaseModTextConfig
             'FIELD_TITLE' => 'title',
             'FIELD_TEXT' => 'text',
             'FIELD_TEXT_ID' => 'post-text',
+        	'FIELD_CATEGORY' => 'cat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
+        	'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
 	        'FIELD_STATUS' => 'status',
         	'FIELD_STATUS_ADMIN' => 'status_admin',
@@ -78,6 +80,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             'OBJECT_FEATURED' => 'bx_posts',
             'OBJECT_METATAGS' => 'bx_posts',
             'OBJECT_COMMENTS' => 'bx_posts',
+            'OBJECT_CATEGORY' => 'bx_posts_cats',
             'OBJECT_PRIVACY_VIEW' => 'bx_posts_allow_view_to',
             'OBJECT_FORM_ENTRY' => 'bx_posts',
             'OBJECT_FORM_ENTRY_DISPLAY_VIEW' => 'bx_posts_entry_view',
@@ -89,6 +92,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             'OBJECT_MENU_SUBMENU' => 'bx_posts_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_posts_view_submenu', // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'posts-home', // first item in view entry submenu from main module submenu
+            'OBJECT_MENU_SNIPPET_META' => 'bx_posts_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_posts_menu_manage_tools', //manage menu in content administration tools
             'OBJECT_GRID_ADMINISTRATION' => 'bx_posts_administration',
         	'OBJECT_GRID_COMMON' => 'bx_posts_common',

modules/boonex/posts/install/sql/disable.sql

@@ -13,7 +13,7 @@ DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_posts' OR `object` IN('bx_po
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_posts';
 DELETE FROM `sys_menu_sets` WHERE `module` = 'bx_posts';
-DELETE FROM `sys_menu_items` WHERE `module` = 'bx_posts' OR `set_name` IN('bx_posts_view', 'bx_posts_submenu', 'bx_posts_view_submenu', 'bx_posts_my');
+DELETE FROM `sys_menu_items` WHERE `module` = 'bx_posts' OR `set_name` IN('bx_posts_view', 'bx_posts_submenu', 'bx_posts_view_submenu', 'bx_posts_snippet_meta', 'bx_posts_my');
 
 -- PRIVACY 
 DELETE FROM `sys_objects_privacy` WHERE `object` = 'bx_posts_allow_view_to';

modules/boonex/posts/install/sql/enable.sql

@@ -218,7 +218,6 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_posts_submenu', 'bx_posts', 'posts-manage', '_bx_posts_menu_item_title_system_entries_manage', '_bx_posts_menu_item_title_entries_manage', 'page.php?i=posts-manage', '', '', '', '', 2147483646, 1, 1, 4);
 
 -- 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 
 ('bx_posts_view_submenu', '_bx_posts_menu_title_view_entry_submenu', 'bx_posts_view_submenu', 'bx_posts', 8, 0, 1, 'BxPostsMenuView', 'modules/boonex/posts/classes/BxPostsMenuView.php');
 
@@ -229,6 +228,21 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_posts_view_submenu', 'bx_posts', 'view-post', '_bx_posts_menu_item_title_system_view_entry', '_bx_posts_menu_item_title_view_entry_submenu_entry', 'page.php?i=view-post&id={content_id}', '', '', '', '', 2147483647, 0, 0, 1),
 ('bx_posts_view_submenu', 'bx_posts', 'view-post-comments', '_bx_posts_menu_item_title_system_view_entry_comments', '_bx_posts_menu_item_title_view_entry_submenu_comments', 'page.php?i=view-post-comments&id={content_id}', '', '', '', '', 2147483647, 0, 0, 2);
 
+-- 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_posts_snippet_meta', '_sys_menu_title_snippet_meta', 'bx_posts_snippet_meta', 'bx_posts', 15, 0, 1, 'BxPostsMenuSnippetMeta', 'modules/boonex/posts/classes/BxPostsMenuSnippetMeta.php');
+
+INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
+('bx_posts_snippet_meta', 'bx_posts', '_sys_menu_set_title_snippet_meta', 0);
+
+INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES 
+('bx_posts_snippet_meta', 'bx_posts', 'date', '_sys_menu_item_title_system_sm_date', '_sys_menu_item_title_sm_date', '', '', '', '', '', 2147483647, 1, 0, 1, 1),
+('bx_posts_snippet_meta', 'bx_posts', 'author', '_sys_menu_item_title_system_sm_author', '_sys_menu_item_title_sm_author', '', '', '', '', '', 2147483647, 1, 0, 1, 2),
+('bx_posts_snippet_meta', 'bx_posts', 'category', '_sys_menu_item_title_system_sm_category', '_sys_menu_item_title_sm_category', '', '', '', '', '', 2147483647, 0, 0, 1, 3),
+('bx_posts_snippet_meta', 'bx_posts', 'tags', '_sys_menu_item_title_system_sm_tags', '_sys_menu_item_title_sm_tags', '', '', '', '', '', 2147483647, 0, 0, 1, 4),
+('bx_posts_snippet_meta', 'bx_posts', 'views', '_sys_menu_item_title_system_sm_views', '_sys_menu_item_title_sm_views', '', '', '', '', '', 2147483647, 0, 0, 1, 5),
+('bx_posts_snippet_meta', 'bx_posts', 'comments', '_sys_menu_item_title_system_sm_comments', '_sys_menu_item_title_sm_comments', '', '', '', '', '', 2147483647, 0, 0, 1, 6);
+
 -- MENU: profile stats
 SET @iNotifMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_profile_stats' AND `active` = 1 LIMIT 1);
 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