Ticket #3796 - Show block submenu as tabs above the content if the block is shown without title.

modules/boonex/polls/classes/BxPollsTemplate.php

@@ -130,22 +130,8 @@ class BxPollsTemplate extends BxBaseModTextTemplate
 
         $sSubentries = $this->$sMethod($aData);
 
-        $sTmplVarsMenu = '';
-        if(($oMenu = $this->_getGetBlockMenu($aData, $sMenuItem)) !== '') {
-            $sMenu = str_replace('_', '-', $this->_oConfig->getName()) . '-menu-db';
-            $sMenuId = $sMenu . '-' . $aData['salt'];        
-
-            $sTmplVarsMenu = BxTemplFunctions::getInstance()->designBoxMenu($oMenu, [[
-                 'menu' => [
-                     'id' => $sMenuId, 
-                     'class' => $sMenu, 
-                     'onclick' => "bx_menu_popup_inline('#" . $sMenuId . "', this)"
-                 ]
-             ]]);
-        }
-
         $aTmplVars = array_merge($aTmplVars, array(
-            'menu' => $sTmplVarsMenu,
+            'menu' => 'delete',
             'bx_if:show_subentries' => array(
                 'condition' => !empty($sSubentries),
                 'content' => array(
@@ -156,7 +142,7 @@ class BxPollsTemplate extends BxBaseModTextTemplate
 
         return array(
             'content' => $this->parseHtmlByName('entry-text-subentries.html', $aTmplVars),
-            'menu' => $oMenu
+            'menu' => $this->_getGetBlockMenu($aData, $sMenuItem)
         );
     }
 

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

@@ -49,7 +49,7 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_polls_view_entry', 2, 'bx_polls', '', '_bx_polls_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 0, 0),
-('bx_polls_view_entry', 2, 'bx_polls', '', '_bx_polls_page_block_title_entry_text_and_subentries', 3, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:29:\"get_block_text_and_subentries\";}', 0, 0, 1, 2),
+('bx_polls_view_entry', 2, 'bx_polls', '', '_bx_polls_page_block_title_entry_text_and_subentries', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:29:\"get_block_text_and_subentries\";}', 0, 0, 1, 2),
 ('bx_polls_view_entry', 1, 'bx_polls', '', '_bx_polls_page_block_title_entry_subentries', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:20:\"get_block_subentries\";}', 0, 0, 0, 0),
 ('bx_polls_view_entry', 2, 'bx_polls', '', '_bx_polls_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 1),
 ('bx_polls_view_entry', 3, 'bx_polls', '_bx_polls_page_block_title_sys_entry_context', '_bx_polls_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),

modules/boonex/polls/template/entry-text-subentries.html

@@ -1,18 +1,15 @@
-<div class="bx-polls-entity-actions">__menu__</div>
-<div class="bx-polls-entity-entity-content bx-content-padding-block">
-    <div class="bx-content-description-before">__content_description_before__</div>
-    <div class="bx-content-description">
-        <div class="bx-pull-combined-entity-content bx-base-text-entity-content bx-def-constraint-list bx-def-constraint-pre bx-def-constraint-object bx-def-constraint-iframe bx-def-constraint-img bx-def-vanilla-html">
-            __entry_text__
-        </div>
-        <bx_if:show_image>
-            <div class="bx-base-text-entity-image bx-def-margin-top bx-def-font-align-center">
-                <img class="bx-def-border-radius-block" src="__entry_image__" />
-            </div>
-        </bx_if:show_image>
-        <bx_if:show_subentries>
-            <div class="bx-poll-entity-subentries bx-def-margin-top">__entry_subentries__</div>
-        </bx_if:show_subentries>
+<div class="bx-content-description-before">__content_description_before__</div>
+<div class="bx-content-description">
+    <div class="bx-pull-combined-entity-content bx-base-text-entity-content bx-def-constraint-list bx-def-constraint-pre bx-def-constraint-object bx-def-constraint-iframe bx-def-constraint-img bx-def-vanilla-html">
+        __entry_text__
     </div>
-    <div class="bx-content-description-after">__content_description_after__</div>
-</div>
+    <bx_if:show_image>
+        <div class="bx-base-text-entity-image bx-def-margin-top bx-def-font-align-center">
+            <img class="bx-def-border-radius-block" src="__entry_image__" />
+        </div>
+    </bx_if:show_image>
+    <bx_if:show_subentries>
+        <div class="bx-poll-entity-subentries bx-def-margin-top">__entry_subentries__</div>
+    </bx_if:show_subentries>
+</div>
+<div class="bx-content-description-after">__content_description_after__</div>