Ticket #2322 - Basic changes and usage in Posts module.

modules/base/text/classes/BxBaseModTextConfig.php

@@ -27,6 +27,10 @@ class BxBaseModTextConfig extends BxBaseModGeneralConfig
         parent::__construct($aModule);
 
         $this->CNF = array(
+            // modules icon
+            'ICON_POLLS_ANSWERS' => 'vote-yea',
+            'ICON_POLLS_RESULTS' => 'poll-h',
+
             // database tables
             'TABLE_POLLS' => $aModule['db_prefix'] . 'polls',
             'TABLE_POLLS_ANSWERS' => $aModule['db_prefix'] . 'polls_answers',

modules/base/text/classes/BxBaseModTextTemplate.php

@@ -460,7 +460,16 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
             if(!empty($sSelected) && $sSelected == $sView)
                 $sSelected = $sId;
 
-            $aMenu[] = array('id' => $sId, 'name' => $sId, 'class' => '', 'link' => 'javascript:void(0)', 'onclick' => 'javascript:' . $sJsObject . '.changePollView(this, \'' . $sView . '\', ' . $iPollId . ')', 'target' => '_self', 'title' => _t('_bx_posts_txt_poll_view_' . $sView));
+            $aMenu[] = array(
+                'id' => $sId, 
+                'name' => $sId, 
+                'class' => '', 
+                'link' => 'javascript:void(0)', 
+                'onclick' => 'javascript:' . $sJsObject . '.changePollView(this, \'' . $sView . '\', ' . $iPollId . ')', 
+                'target' => '_self', 
+                'title_attr' => _t($CNF['T']['txt_poll_menu_view_' . $sView]), 
+                'title' => $this->parseIcon($CNF['ICON_POLLS_' . strtoupper($sView)])
+            );
         }
 
         if(count($aMenu) <= 1)

modules/base/text/template/poll_item.html

@@ -4,7 +4,7 @@
             <div class="bx-base-text-poll-actions bx-def-padding-sec-bottom">
                 __action_menu__
                 <bx_if:show_action_embed>
-                    <a class="bx-base-text-poll-action bx-base-text-pa-icon bx-base-text-pa-embed bx-def-margin-sec-left-auto" href="javascript:void(0)" onclick="javascript:__js_object__.embedPoll(this, __id__);" title="<bx_text_attribute:_sys_txt_form_entry_input_picture_insert />"><i class="sys-icon paperclip"></i></a>
+                    <a class="bx-base-text-poll-action bx-base-text-pa-icon bx-base-text-pa-embed bx-def-margin-sec-left-auto" href="javascript:void(0)" onclick="javascript:__js_object__.embedPoll(this, __id__);" title="<bx_text_attribute:_sys_txt_form_entry_input_picture_insert />"><i class="sys-icon plus-square"></i></a>
                 </bx_if:show_action_embed>
                 <bx_if:show_action_delete>
                     <a class="bx-base-text-poll-action bx-base-text-pa-icon bx-base-text-pa-delete bx-def-margin-sec-left-auto" href="javascript:void(0)" onclick="javascript:__js_object__.deletePoll(this, __id__);" title="<bx_text_attribute:_Delete />"><i class="sys-icon times"></i></a>

modules/boonex/posts/classes/BxPostsConfig.php

@@ -180,6 +180,9 @@ class BxPostsConfig extends BxBaseModTextConfig
                 'txt_all_entries_by_author' => '_bx_posts_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_posts_page_title_browse_by_context',
                 'txt_err_cannot_perform_action' => '_bx_posts_txt_err_cannot_perform_action',
+                'txt_poll_menu_view_answers' => '_bx_posts_txt_poll_view_answers',
+                'txt_poll_menu_view_results' => '_bx_posts_txt_poll_view_results',
+                'txt_poll_menu_view_' => '_bx_posts_txt_poll_view_',
                 'txt_poll_answer_vote_do_by' => '_bx_posts_txt_poll_answer_vote_do_by',
                 'txt_poll_answer_vote_counter' => '_bx_posts_txt_poll_answer_vote_counter',
                 'txt_poll_answer_vote_percent' => '_bx_posts_txt_poll_answer_vote_percent'

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

@@ -62,9 +62,9 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_posts_view_entry', 4, 'bx_posts', '', '_bx_posts_page_block_title_entry_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 0, 0),
 ('bx_posts_view_entry', 4, 'bx_posts', '', '_bx_posts_page_block_title_entry_social_sharing', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:21:\"entity_social_sharing\";}', 0, 0, 0, 0),
 ('bx_posts_view_entry', 2, 'bx_posts', '', '_bx_posts_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:18:\"entity_attachments\";}', 0, 0, 1, 4),
-('bx_posts_view_entry', 2, 'bx_posts', '', '_bx_posts_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 5),
+('bx_posts_view_entry', 2, 'bx_posts', '', '_bx_posts_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 6),
 ('bx_posts_view_entry', 3, 'bx_posts', '', '_bx_posts_page_block_title_entry_location', 3, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:13:\"locations_map\";s:6:\"params\";a:2:{i:0;s:8:\"bx_posts\";i:1;s:4:\"{id}\";}s:5:\"class\";s:20:\"TemplServiceMetatags\";}', 0, 0, 1, 3),
-('bx_posts_view_entry', 3, 'bx_posts', '', '_bx_posts_page_block_title_entry_polls', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:12:\"entity_polls\";}', 0, 0, 1, 4),
+('bx_posts_view_entry', 2, 'bx_posts', '', '_bx_posts_page_block_title_entry_polls', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:12:\"entity_polls\";}', 0, 0, 1, 5),
 ('bx_posts_view_entry', 3, 'bx_posts', '', '_bx_posts_page_block_title_featured_entries_view_extended', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_posts";s:6:"method";s:15:"browse_featured";s:6:"params";a:1:{i:0;s:8:"extended";}}', 0, 0, 1, 5);
 
 

template/css/menu.css

@@ -560,25 +560,31 @@ ul.bx-menu-floating-blocks {
 /* --------------- interactive block menu */
 ul.bx-menu-inter,
 ul.bx-menu-inter-vert {
-	padding:0;
+    padding:0;
     margin:0;
-	list-style:none;
+    list-style:none;
 }
 ul.bx-menu-inter li {
     float:left;
 }
+ul.bx-menu-inter li:hover {
+    background-color: transparent;
+}
 li.bx-menu-inter-div {
-	padding: 0px 3px;
+    padding: 0px 3px;
 }
 li.bx-menu-inter-div:first-child {
-	display: none;
+    display: none;
+}
+li.bx-menu-inter-act .sys-icon {
+    color: rgba(0, 0, 0, 0.2);
 }
-li.bx-menu-inter-act {}
 li.bx-menu-inter-pas a:hover {
-	text-decoration: none;
+    background-color: transparent;
+    text-decoration: none;
 }
 li.bx-menu-inter-hidden {
-	display: none;
+    display: none;
 }
 
 /* --------------- horizontal buttons menu */

template/menu_interactive.html

@@ -1,23 +1,23 @@
 <ul id="bx-menu-inter-__id__" class="bx-menu-inter bx-menu-object-__object__ bx-clearfix">
-	<bx_repeat:menu_items>
-		<bx_if:show_divider>
-			<li class="bx-menu-inter-div"><span>&#183;</span></li>
-		</bx_if:show_divider>
-	    <li id="__id__-act" class="bx-menu-inter-act __class_wrp_act__">
-	        <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__">__title__</div>
-	    </li>
-	    <li id="__id__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
-	        <a id="__id__" class="__class__" href="__link__" target="__target__" onclick="__onclick__">
-	        	<div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
-	        </a>
-	    </li>
-	</bx_repeat:menu_items>
+    <bx_repeat:menu_items>
+        <bx_if:show_divider>
+            <li class="bx-menu-inter-div"><span>&#183;</span></li>
+        </bx_if:show_divider>
+        <li id="__id__-act" class="bx-menu-inter-act __class_wrp_act__">
+            <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__" title="__title_attr__">__title__</div>
+        </li>
+        <li id="__id__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
+            <a id="__id__" class="__class__" href="__link__" target="__target__" onclick="__onclick__" title="__title_attr__">
+                <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
+            </a>
+        </li>
+    </bx_repeat:menu_items>
 </ul>
 <script type="text/javascript" language="javascript">
     $(document).ready(function() {
     	$('#bx-menu-inter-__id__').find('a').bind('click', function() {
-    		var sId = $(this).attr('id');
-			$(this).parent().siblings('.bx-menu-inter-act:visible').hide().siblings('.bx-menu-inter-pas:hidden').show().siblings('#' + sId + '-pas:visible').hide().siblings('#' + sId + '-act:hidden').show();
+            var sId = $(this).attr('id');
+            $(this).parent().siblings('.bx-menu-inter-act:visible').hide().siblings('.bx-menu-inter-pas:hidden').show().siblings('#' + sId + '-pas:visible').hide().siblings('#' + sId + '-act:hidden').show();
     	});
     });
 </script>

template/menu_interactive_vertical.html

@@ -1,21 +1,21 @@
 <ul id="bx-menu-inter-__id__" class="bx-menu-inter-vert bx-menu-object-__object__">
-	<bx_repeat:menu_items>
-	    <li id="__name__-act" class="bx-menu-inter-act __class_wrp_act__">
-	        <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__">__title__</div>
-	    </li>
-	    <li id="__name__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
-	        <a id="__name__" class="__class__" href="__link__" target="__target__" onclick="__onclick__">
-	        	<div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
-	        </a>
-	    </li>
-	</bx_repeat:menu_items>
+    <bx_repeat:menu_items>
+        <li id="__name__-act" class="bx-menu-inter-act __class_wrp_act__">
+            <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__" title="__title_attr__">__title__</div>
+        </li>
+        <li id="__name__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
+            <a id="__name__" class="__class__" href="__link__" target="__target__" onclick="__onclick__" title="__title_attr__">
+                <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
+            </a>
+        </li>
+    </bx_repeat:menu_items>
 </ul>
 <script type="text/javascript" language="javascript">
     $(document).ready(function() {
     	$('#bx-menu-inter-__id__').find('a').bind('click', function() {
-    		var sId = $(this).attr('id');
-    		var sClassHidden = 'bx-menu-inter-hidden';
-			$(this).parent().siblings('.bx-menu-inter-act:not(.' + sClassHidden + ')').addClass(sClassHidden).siblings('.bx-menu-inter-pas.' + sClassHidden).removeClass(sClassHidden).siblings('#' + sId + '-pas:not(.' + sClassHidden + ')').addClass(sClassHidden).siblings('#' + sId + '-act.' + sClassHidden).removeClass(sClassHidden);
+            var sId = $(this).attr('id');
+            var sClassHidden = 'bx-menu-inter-hidden';
+            $(this).parent().siblings('.bx-menu-inter-act:not(.' + sClassHidden + ')').addClass(sClassHidden).siblings('.bx-menu-inter-pas.' + sClassHidden).removeClass(sClassHidden).siblings('#' + sId + '-pas:not(.' + sClassHidden + ')').addClass(sClassHidden).siblings('#' + sId + '-act.' + sClassHidden).removeClass(sClassHidden);
     	});
     });
 </script>

template/scripts/BxBaseMenuInteractive.php

@@ -74,6 +74,7 @@ class BxBaseMenuInteractive extends BxTemplMenu
 
             $a['link'] = isset($a['link']) ? $this->_oPermalinks->permalink($a['link']) : 'javascript:void(0);';
             $a['title'] = _t($a['title']);
+            $a['title_attr'] = isset($a['title_attr']) ? bx_html_attribute($a['title_attr']) : '';
             $a['bx_if:show_divider'] = array (
             	'condition' => $this->_bShowDivider,
                 'content' => array(),