Ticket #562 - fixes and improvements.

modules/boonex/polls/classes/BxPollsConfig.php

@@ -160,6 +160,11 @@ class BxPollsConfig extends BxBaseModTextConfig
 
         return isset($this->_aHtmlIds[$sKey]) ? $this->_aHtmlIds[$sKey] : '';
     }
+
+    public function getTitle($aData)
+    {
+        return BxTemplFunctions::getInstance()->getStringWithLimitedLength(strip_tags($aData[$this->CNF['FIELD_TEXT']]), (int)getParam($this->CNF['PARAM_CHARS_TITLE']));
+    }
 }
 
 /** @} */

modules/boonex/polls/classes/BxPollsModule.php

@@ -58,7 +58,6 @@ class BxPollsModule extends BxBaseModTextModule
 	/**
      * INTERNAL METHODS
      */
-    
     protected function _getImagesForTimelinePost($aEvent, $aContentInfo, $sUrl)
     {
         return array();
@@ -66,9 +65,18 @@ class BxPollsModule extends BxBaseModTextModule
 
     protected function _getContentForTimelinePost($aEvent, $aContentInfo)
     {
-        return $this->_oTemplate->getContentForTimelinePost($aEvent, $aContentInfo);
+        $aBlock = $this->_oTemplate->entrySubentries($aContentInfo);
+
+        $aResult = parent::_getContentForTimelinePost($aEvent, $aContentInfo);
+        $aResult['title'] = $this->_oConfig->getTitle($aContentInfo);
+        $aResult['text'] = '';
+        $aResult['raw'] = $this->_oTemplate->getJsCode('entry') . $aBlock['content'];
+
+        $this->_oTemplate->addJs(array('entry.js'));
+        $this->_oTemplate->addCss(array('entry.css'));
+
+        return $aResult;
     }
-    
 }
 
 /** @} */

modules/boonex/polls/classes/BxPollsSearchResult.php

@@ -21,7 +21,7 @@ class BxPollsSearchResult extends BxBaseModTextSearchResult
             'object_metatags' => 'bx_polls',
             'title' => _t('_bx_polls_page_title_browse'),
             'table' => 'bx_polls_entries',
-            'ownFields' => array('id', 'text', 'thumb', 'author', 'anonymous', 'hidden_results', 'added'),
+            'ownFields' => array('id', 'text', 'thumb', 'author', 'anonymous', 'hidden_results', 'comments', 'added'),
             'searchFields' => array(),
             'restriction' => array(
                 'author' => array('value' => '', 'field' => 'author', 'operator' => '='),

modules/boonex/polls/classes/BxPollsTemplate.php

@@ -52,8 +52,8 @@ class BxPollsTemplate extends BxBaseModTextTemplate
             'content' => $this->parseHtmlByName('subentries.html', array(
     			'html_id' => $this->_oConfig->getHtmlIds('content') . $aData[$CNF['FIELD_ID']],
                 'bx_repeat:subentries' => $aTmplVarsSubentries,
-    	        'bx_if:show_anonymous' => array(
-    	            'condition' => (int)$aData[$CNF['FIELD_ANONYMOUS']] == 1,
+    	        'bx_if:show_public' => array(
+    	            'condition' => (int)$aData[$CNF['FIELD_ANONYMOUS']] == 0,
     	            'content' => array()
     	        )
             )),
@@ -97,40 +97,33 @@ class BxPollsTemplate extends BxBaseModTextTemplate
         );
     }
 
-    public function getContentForTimelinePost($aEvent, $aData)
+    //TODO: Continue from here with Full View
+    protected function getUnit ($aData, $aParams = array())
     {
         $CNF = &$this->getModule()->_oConfig->CNF;
+        
+        $oComments = BxDolCmts::getObjectInstance($CNF['OBJECT_COMMENTS'], $aData[$CNF['FIELD_ID']]);
+
+        $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()
+            );
 
-        $sTitle = $this->getTitle($aData);
-        $sTitleAttr = bx_html_attribute($sTitle);
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aData[$CNF['FIELD_ID']]);
-
-        if(!empty($sUrl) && !empty($sTitle))
-            $sTitle = $this->parseHtmlByName('bx_a.html', array(
-                'href' => $sUrl,
-                'title' => $sTitleAttr,
-                'bx_repeat:attrs' => array(
-                    array('key' => 'class', 'value' => 'bx-tl-title')
-                ),
-                'content' => $sTitle
-            ));
-
-        $aBlock = $this->entrySubentries($aData);
+        $aResult = parent::getUnit ($aData, $aParams);
+        $aResult['bx_if:show_comments'] = array(
+            'condition' => $bTmplVarsComments, 
+            'content' => $aTmplVarsComments
+        ); 
 
-        $this->addJs(array('entry.js'));
-        $this->addCss(array('entry.css'));
-        return $this->parseHtmlByName('unit_timeline.html', array(
-            'title' => $sTitle,
-            'content' => $aBlock['content'],
-            'js_code' => $this->getJsCode('entry')
-        ));
+        return $aResult;
     }
 
     protected function getTitle($aData)
     {
-        $CNF = &$this->getModule()->_oConfig->CNF;
-
-        return BxTemplFunctions::getInstance()->getStringWithLimitedLength(strip_tags($aData[$CNF['FIELD_TEXT']]), (int)getParam($CNF['PARAM_CHARS_TITLE']));
+        return $this->_oConfig->getTitle($aData);
     }
 
     protected function getSummary($aData, $sTitle = '', $sText = '', $sUrl = '')

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

@@ -36,8 +36,7 @@
 	<string name="_bx_polls_form_entry_input_pictures"><![CDATA[Pictures]]></string>
 	<string name="_bx_polls_form_profile_input_sys_anonymous"><![CDATA[Anonymous]]></string>
     <string name="_bx_polls_form_profile_input_anonymous"><![CDATA[Anonymous vote]]></string>
-    <string name="_bx_polls_form_profile_input_anonymous_info_author"><![CDATA[When Anonymous mode is enabled, a list of voters won't be available to anybody.]]></string>
-    <string name="_bx_polls_form_profile_input_anonymous_info_voter"><![CDATA[Anonymous mode. Your vote will be private.]]></string>
+    <string name="_bx_polls_form_profile_input_anonymous_info"><![CDATA[When Anonymous mode is enabled, a list of voters won't be available to anybody.]]></string>
     <string name="_bx_polls_form_profile_input_sys_hidden_results"><![CDATA[Hidden Results]]></string>
     <string name="_bx_polls_form_profile_input_hidden_results"><![CDATA[Hide results until voted]]></string>
     <string name="_bx_polls_form_entry_input_sys_allow_view_to"><![CDATA[Visibility]]></string>
@@ -209,7 +208,9 @@
     <string name="_bx_polls_txt_sample_single_with_article"><![CDATA[a poll]]></string>
     <string name="_bx_polls_txt_sample_comment_single"><![CDATA[poll's comment]]></string>
     <string name="_bx_polls_txt_sample_vote_single"><![CDATA[poll's vote]]></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>
+    <string name="_bx_polls_msg_public_voting"><![CDATA[This voting is public, your choice will be displayed for others.]]></string>
 </resources>

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

@@ -72,7 +72,7 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 ('bx_polls_popular', '_bx_polls_page_title_sys_entries_popular', '_bx_polls_page_title_entries_popular', 'bx_polls', 5, 2147483647, 1, 'polls-popular', 'page.php?i=polls-popular', '', '', '', 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_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:7:"gallery";s:13:"empty_message";b:1;s:13:"ajax_paginate";b:0;}}', 0, 1, 1);
+('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: recently updated entries
@@ -80,7 +80,7 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 ('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');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
-('bx_polls_updated', 1, 'bx_polls', '_bx_polls_page_block_title_updated_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:14:"browse_updated";s:6:"params";a:3:{s:9:"unit_view";s:7:"gallery";s:13:"empty_message";b:1;s:13:"ajax_paginate";b:0;}}', 0, 1, 1);
+('bx_polls_updated', 1, 'bx_polls', '_bx_polls_page_block_title_updated_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:14:"browse_updated";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: entries of author
@@ -122,7 +122,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 -- PAGE: add block to homepage
 SET @iBlockOrder = (SELECT `order` FROM `sys_pages_blocks` WHERE `object` = 'sys_home' AND `cell_id` = 1 ORDER BY `order` DESC LIMIT 1);
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('sys_home', 1, 'bx_polls', '_bx_polls_page_block_title_recent_entries', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:13:\"browse_public\";}', 1, 0, 0, IFNULL(@iBlockOrder, 0) + 1);
+('sys_home', 1, 'bx_polls', '_bx_polls_page_block_title_recent_entries', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_polls";s:6:"method";s:13:"browse_public";}', 1, 0, 0, IFNULL(@iBlockOrder, 0) + 1);
 
 
 -- PAGES: add page block to profiles modules (trigger* page objects are processed separately upon modules enable/disable)
@@ -134,8 +134,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 -- PAGE: service blocks
 SET @iBlockOrder = (SELECT `order` FROM `sys_pages_blocks` WHERE `object` = '' AND `cell_id` = 0 ORDER BY `order` DESC LIMIT 1);
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
-('', 0, 'bx_polls', '_bx_polls_page_block_title_recent_entries', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:13:\"browse_public\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:7:\"gallery\";s:13:\"empty_message\";b:1;s:13:\"ajax_paginate\";b:0;}}', 0, 1, IFNULL(@iBlockOrder, 0) + 1),
-
+('', 0, 'bx_polls', '_bx_polls_page_block_title_recent_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:13:"browse_public";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, IFNULL(@iBlockOrder, 0) + 1),
 ('', 0, 'bx_polls', '_bx_polls_page_block_title_recent_entries_view_full', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:13:"browse_public";s:6:"params";a:1:{i:0;s:4:"full";}}', 0, 1, IFNULL(@iBlockOrder, 0) + 2),
 ('', 0, 'bx_polls', '_bx_polls_page_block_title_popular_entries_view_extended', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:14:"browse_popular";s:6:"params";a:1:{i:0;s:8:"extended";}}', 0, 1, IFNULL(@iBlockOrder, 0) + 3),
 ('', 0, 'bx_polls', '_bx_polls_page_block_title_popular_entries_view_full', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_polls";s:6:"method";s:14:"browse_popular";s:6:"params";a:1:{i:0;s:4:"full";}}', 0, 1, IFNULL(@iBlockOrder, 0) + 4);

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

@@ -218,7 +218,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_polls', 'bx_polls', 'text', '', '', 0, 'textarea', '_bx_polls_form_entry_input_sys_text', '_bx_polls_form_entry_input_text', '', 1, 0, 3, '', '', '', 'Avail', '', '_bx_polls_form_entry_input_text_err', 'Xss', '', 1, 0),
 ('bx_polls', 'bx_polls', 'subentries', '', '', 0, 'custom', '_bx_polls_form_entry_input_sys_subentries', '_bx_polls_form_entry_input_subentries', '_bx_polls_form_entry_input_subentries_inf', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_polls', 'bx_polls', 'cat', '', '#!bx_polls_cats', 0, 'select', '_bx_polls_form_entry_input_sys_cat', '_bx_polls_form_entry_input_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_polls_form_entry_input_cat_err', 'Xss', '', 1, 0),
-('bx_polls', 'bx_polls', 'anonymous', 1, '', 1, 'switcher', '_bx_polls_form_profile_input_sys_anonymous', '_bx_polls_form_profile_input_anonymous', '_bx_polls_form_profile_input_anonymous_info_author', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0),
+('bx_polls', 'bx_polls', 'anonymous', 1, '', 1, 'switcher', '_bx_polls_form_profile_input_sys_anonymous', '_bx_polls_form_profile_input_anonymous', '_bx_polls_form_profile_input_anonymous_info', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0),
 ('bx_polls', 'bx_polls', 'hidden_results', 1, '', 0, 'switcher', '_bx_polls_form_profile_input_sys_hidden_results', '_bx_polls_form_profile_input_hidden_results', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0),
 ('bx_polls', 'bx_polls', 'added', '', '', 0, 'datetime', '_bx_polls_form_entry_input_sys_date_added', '_bx_polls_form_entry_input_date_added', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_polls', 'bx_polls', 'changed', '', '', 0, 'datetime', '_bx_polls_form_entry_input_sys_date_changed', '_bx_polls_form_entry_input_date_changed', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0);

modules/boonex/polls/template/subentries.html

@@ -2,9 +2,9 @@
     <bx_repeat:subentries>
         <div class="bx-polls-subentry bx-def-margin-top-auto">__subentry__</div>
     </bx_repeat:subentries>
-    <bx_if:show_anonymous>
+    <bx_if:show_public>
 	    <div class="bx-polls-content-info bx-def-margin-top bx-def-font-small bx-def-font-grayed">
-	        <bx_text:_bx_polls_form_profile_input_anonymous_info_voter />
+	        <bx_text:_bx_polls_msg_public_voting />
 	    </div>
-    </bx_if:show_anonymous>
+    </bx_if:show_public>
 </div>

modules/boonex/polls/template/unit.html

@@ -1 +1,22 @@
-<bx_include_base:../modules/base/text/template/unit.html />
+<div class="bx-base-text-unit bx-base-text-unit-ext bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-margin-bottom">
+    <bx_if:thumb>
+        <div class="bx-base-text-unit-cover">
+            <img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" />
+        </div>
+    </bx_if:thumb>
+    <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
+        <h2><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>
+        </div>
+        <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
+            __summary__
+        </div> 
+    </div>
+</div>

modules/boonex/polls/template/unit_full.html

@@ -1 +1,22 @@
-<bx_include_base:../modules/base/text/template/unit_full.html />
+<div class="bx-base-text-unit bx-base-text-unit-ext bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-margin-bottom">
+    <bx_if:thumb>
+        <div class="bx-base-text-unit-cover">
+            <img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" />
+        </div>
+    </bx_if:thumb>
+    <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
+        __text__
+        <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>
+        </div>
+        <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
+            __summary__
+        </div> 
+    </div>
+</div>

modules/boonex/polls/template/unit_timeline.html

@@ -1,5 +0,0 @@
-<div class="bx-tl-item-text">
-	<div class="bx-tl-title bx-def-margin-sec-bottom bx-def-font-h3">__title__</div>
-	<div class="bx-tl-content">__content__</div>
-	__js_code__
-</div>

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

@@ -36,8 +36,7 @@
 	<string name="_bx_polls_form_entry_input_pictures"><![CDATA[Картинки]]></string>
     <string name="_bx_polls_form_profile_input_sys_anonymous"><![CDATA[Анонимный]]></string>
     <string name="_bx_polls_form_profile_input_anonymous"><![CDATA[Анонимное голосование]]></string>
-    <string name="_bx_polls_form_profile_input_anonymous_info_author"><![CDATA[Список проголосовавших не будет доступен в режиме Анонимного голосования.]]></string>
-    <string name="_bx_polls_form_profile_input_anonymous_info_voter"><![CDATA[Анонимное голосование. Ваш голос будет конфиденциален.]]></string>
+    <string name="_bx_polls_form_profile_input_anonymous_info"><![CDATA[Список проголосовавших не будет доступен в режиме Анонимного голосования.]]></string>
     <string name="_bx_polls_form_profile_input_sys_hidden_results"><![CDATA[Скрытые результаты]]></string>
     <string name="_bx_polls_form_profile_input_hidden_results"><![CDATA[Скрывать результаты до голосования]]></string>
     <string name="_bx_polls_form_entry_input_sys_allow_view_to"><![CDATA[Видимость]]></string>
@@ -211,4 +210,5 @@
     <string name="_bx_polls_txt_subentry_vote_do_by"><![CDATA[Проголосовали за]]></string>
     <string name="_bx_polls_txt_subentry_vote_counter"><![CDATA[{0} голосов]]></string>
     <string name="_bx_polls_txt_subentry_vote_percent"><![CDATA[({0}%)]]></string>
+    <string name="_bx_polls_msg_public_voting"><![CDATA[Это публичное голосование, ваш выбор будет виден другим.]]></string>
 </resources>

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -774,6 +774,9 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
 
         $bBrowseItem = isset($aBrowseParams['type']) && $aBrowseParams['type'] == BX_TIMELINE_TYPE_ITEM;
 
+        //--- Process Raw ---//
+        $sRaw = isset($aContent['raw']) ? $aContent['raw'] : '';
+
         //--- Process Text ---//
         $sUrl = isset($aContent['url']) ? bx_html_attribute($aContent['url']) : '';
         $sTitle = $sTitleAttr = '';
@@ -952,6 +955,12 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                     ),
                 )
             ),
+            'bx_if:show_content_raw' => array(
+                'condition' => !empty($sRaw),
+                'content' => array(
+                    'item_content_raw' => $sRaw
+                )
+            ),
             'bx_if:show_links' => array(
                 'condition' => !empty($aTmplVarsLinks),
                 'content' => array(

modules/boonex/timeline/template/type_post.html

@@ -21,6 +21,7 @@
 		__item_content__<bx_if:show_more><span class="__style_prefix__-content-see-more">... <a class="bx-def-font-small" href="javascript:void(0)" onclick="__js_object__.showMoreContent(this);"><bx_text:_see_more /></a></span><span style="display:none;"> __item_content_more__</span></bx_if:show_more>
 		</div>
 	</bx_if:show_content>
+	<bx_if:show_content_raw>__item_content_raw__</bx_if:show_content_raw>
 </div>
 <bx_if:show_links>
 	<div class="__style_prefix__-item-links bx-def-margin-top">