Ticket #367 - related changes in core files.

modules/base/text/classes/BxBaseModTextTemplate.php

@@ -118,7 +118,7 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
         // get thumb url
         $sPhotoThumb = '';
         $sPhotoGallery = '';
-        if ($aData[$CNF['FIELD_THUMB']]) {
+        if(!empty($CNF['FIELD_THUMB']) && $aData[$CNF['FIELD_THUMB']]) {
 
             $oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_PREVIEW']);
             if ($oImagesTranscoder)

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

@@ -33,7 +33,7 @@
 	<string name="_bx_cnv_page_title_sys_create_entry"><![CDATA[New conversation]]></string>
 	<string name="_bx_cnv_page_title_create_entry"><![CDATA[New conversation]]></string>
 	<string name="_bx_cnv_page_block_title_create_entry"><![CDATA[New conversation]]></string>
-	<string name="_bx_cnv_page_title_sys_view_entry"><![CDATA[View converstion]]></string>
+	<string name="_bx_cnv_page_title_sys_view_entry"><![CDATA[View conversation]]></string>
 	<string name="_bx_cnv_page_title_view_entry"><![CDATA[{title}]]></string>
 	<string name="_bx_cnv_page_block_title_entry_attachments"><![CDATA[Attachments]]></string>
 	<string name="_bx_cnv_page_block_title_entry_text"><![CDATA[Text]]></string>

modules/boonex/market/install/sql/enable.sql

@@ -89,11 +89,11 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 -- PAGE: categories
 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_market_categories', '_bx_market_page_title_sys_entries_categories', '_bx_market_page_title_entries_categories', 'bx_market', 1, 2147483647, 1, 'products-categories', 'page.php?i=products-categories', '', '', '', 0, 1, 0, 'BxMarketPageBrowse', 'modules/boonex/market/classes/BxMarketPageBrowse.php');
+('bx_market_categories', '_bx_market_page_title_sys_entries_categories', '_bx_market_page_title_entries_categories', 'bx_market', 5, 2147483647, 1, 'products-categories', 'page.php?i=products-categories', '', '', '', 0, 1, 0, 'BxMarketPageBrowse', 'modules/boonex/market/classes/BxMarketPageBrowse.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
-('bx_market_categories', 1, 'bx_market', '_bx_market_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:15:\"categories_list\";s:6:\"params\";a:2:{i:0;s:14:\"bx_market_cats\";i:1;b:0;}s:5:\"class\";s:20:\"TemplServiceCategory\";}', 0, 1, 1),
-('bx_market_categories', 2, 'bx_market', '_bx_market_page_block_title_categories_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_market";s:6:"method";s:15:"browse_category";s:6:"params";a:1:{i:0;s:8:"extended";}}', 0, 1, 1);
+('bx_market_categories', 1, 'bx_market', '_bx_market_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:15:\"categories_list\";s:6:\"params\";a:2:{i:0;s:14:\"bx_market_cats\";i:1;b:0;}s:5:\"class\";s:20:\"TemplServiceCategory\";}', 0, 1, 1);
+--('bx_market_categories', 2, 'bx_market', '_bx_market_page_block_title_categories_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_market";s:6:"method";s:15:"browse_category";s:6:"params";a:1:{i:0;s:8:"extended";}}', 0, 1, 1);
 
 
 -- PAGE: popular entries

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

@@ -76,7 +76,7 @@
     <string name="_bx_cnv_menu_item_title_system_convos"><![CDATA[Переписка]]></string>
     <string name="_bx_cnv_menu_item_title_convos"><![CDATA[переписка]]></string>
     <string name="_bx_cnv_menu_item_title_system_unread_messages"><![CDATA[Количество непрочитанных сообщений]]></string>
-    <string name="_bx_cnv_menu_item_title_unread_messages"><![CDATA[{addon} - непрочитанные сообщения]]></string>
+    <string name="_bx_cnv_menu_item_title_unread_messages"><![CDATA[{addon} непрочитанных сообщений]]></string>
 
     <string name="_bx_cnv_txt_sample_single"><![CDATA[переписка]]></string>
 

template/comment.html

@@ -1,6 +1,6 @@
 <li id="cmt__id__" class="__style_prefix____class__ bx-def-padding-top bx-def-margin-bottom">
 	<a id="__system____id__" class="__style_prefix__-anchor bx-anchor-invisible"></a>
-	<div class="__style_prefix__-cnt">
+	<div class="__style_prefix__-cnt__class_cnt__">
 		<div class="__style_prefix__-blink-plate"></div>
 		<div class="__style_prefix__-avatar bx-def-thumb bx-def-thumb-size">
 			<bx_if:show_icon>

template/scripts/BxBaseCmts.php

@@ -170,7 +170,7 @@ class BxBaseCmts extends BxDolCmts
 
         list($sAuthorName, $sAuthorLink, $sAuthorIcon) = $this->_getAuthorInfo($aCmt['cmt_author_id']);
 
-        $sClass = '';
+        $sClass = $sClassCnt = '';
         if(isset($aCmt['vote_rate']) && (float)$aCmt['vote_rate'] < $this->_aSystem['viewing_threshold']) {
             $this->_oTemplate->pareseHtmlByName('comment_hidden.html', array(
                 'js_object' => $this->_sJsObjName,
@@ -184,15 +184,21 @@ class BxBaseCmts extends BxDolCmts
                 )
             ));
 
-            $sClass = ' cmt-hidden';
+            $sClass = ' ' . $this->_sStylePrefix . '-hidden';
         }
 
         if($aCmt['cmt_author_id'] == $iUserId)
-            $sClass .= ' cmt-mine';
+            $sClass .= ' ' . $this->_sStylePrefix . '-mine';
 
 		if(!empty($aDp['blink']) && in_array($aCmt['cmt_id'], $aDp['blink']))
-			$sClass .= ' cmt-blink';
+			$sClass .= ' ' . $this->_sStylePrefix . '-blink';
 
+		if(!empty($aDp['class_comment']))
+			$sClass .= ' ' . $aDp['class_comment'];
+
+		if(!empty($aDp['class_comment_content']))
+			$sClassCnt .= ' ' . $aDp['class_comment_content'];
+			
         $sActions = $this->_getActionsBox($aCmt, $aDp);
 
         $aTmplReplyTo = array();
@@ -240,6 +246,7 @@ class BxBaseCmts extends BxDolCmts
             'js_object' => $this->_sJsObjName,
             'id' => $aCmt['cmt_id'],
             'class' => $sClass,
+        	'class_cnt' => $sClassCnt,
             'bx_if:show_reply_to' => array(
                 'condition' => !empty($aTmplReplyTo),
                 'content' => $aTmplReplyTo