Ticket #258 - Minor fixes and improvements.

modules/boonex/market/classes/BxMarketModule.php

@@ -63,11 +63,6 @@ class BxMarketModule extends BxBaseModTextModule
         return $this->_oTemplate->entryAttachmentsByStorage($CNF['OBJECT_STORAGE_FILES'], $aContentInfo);
     }
 
-    public function serviceEntityCover($iContentId = 0)
-    {
-		return $this->_serviceTemplateFunc ('entryCover', $iContentId);
-    }
-
 	public function serviceEntityInfo ($iContentId = 0)
     {
         return $this->_serviceTemplateFunc ('entryInfo', $iContentId);

modules/boonex/market/classes/BxMarketPageEntry.php

@@ -25,6 +25,8 @@ class BxMarketPageEntry extends BxBaseModTextPageEntry
     	$sResult = parent::getCode();
     	$sResult .= $this->_oModule->_oTemplate->getJsCode('entry');
 
+		$this->_oModule->_oTemplate->setCover($this->_aContentInfo);
+
     	$this->_oModule->_oTemplate->addJs(array('fancybox/jquery.fancybox.pack.js', 'entry.js'));
 		$this->_oModule->_oTemplate->addCss(array(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'fancybox/|jquery.fancybox.css', 'entry.css'));
     	return $sResult;

modules/boonex/market/classes/BxMarketTemplate.php

@@ -28,25 +28,6 @@ class BxMarketTemplate extends BxBaseModTextTemplate
         $this->_aCurrency = $this->_oConfig->getCurrency();
     }
 
-    public function entryCover($aData)
-    {
-    	$CNF = &$this->_oConfig->CNF;
-
-    	$sCoverUrl = '';
-        if ($aData[$CNF['FIELD_COVER']]) {
-            $oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_COVER']);
-            if($oImagesTranscoder)
-				$sCoverUrl = $oImagesTranscoder->getFileUrl($aData[$CNF['FIELD_COVER']]);
-        }
-
-        if(empty($sCoverUrl))
-        	return '';
-
-    	return $this->parseHtmlByName('entry-cover.html', array(
-    		'cover_url' => $sCoverUrl
-    	));
-    }
-
     public function entryInfo($aData)
     {
     	$aCategory = array();
@@ -89,8 +70,7 @@ class BxMarketTemplate extends BxBaseModTextTemplate
     
     public function entryText ($aData, $sTemplateName = 'entry-text.html')
     {
-    	$oModule = BxDolModule::getInstance($this->MODULE);
-    	$CNF = &$oModule->_oConfig->CNF;
+    	$CNF = &BxDolModule::getInstance($this->MODULE)->_oConfig->CNF;
 
     	$sThumbUrl = '';
         if ($aData[$CNF['FIELD_THUMB']]) {
@@ -145,10 +125,43 @@ class BxMarketTemplate extends BxBaseModTextTemplate
     	));
     }
 
+    public function setCover($aData)
+    {
+		$CNF = &BxDolModule::getInstance($this->MODULE)->_oConfig->CNF;
+
+        $oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_COVER']);
+		if(empty($oImagesTranscoder))
+			return;
+
+		$sCoverUrl = $oImagesTranscoder->getFileUrl($aData[$CNF['FIELD_COVER']]);
+		if(empty($sCoverUrl))
+			return;
+
+		$oCover = BxDolCover::getInstance($this);
+		$oCover->setCoverImageUrl($sCoverUrl);
+
+		$mixedOptions = BxDolMenu::getObjectInstance('sys_site_submenu')->getParamsForCover();
+        if(empty($mixedOptions) || !is_array($mixedOptions))
+        	return;
+
+		$oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_PREVIEW']);
+		if(empty($oImagesTranscoder))
+			return;
+
+		$sThumbnailUrl = $oImagesTranscoder->getFileUrl($aData[$CNF['FIELD_THUMB']]);
+		if(empty($sThumbnailUrl))
+			return;
+
+		$mixedOptions['bx_if:icon']['condition'] = false;
+		$mixedOptions['bx_if:image']['condition'] = true;
+		$mixedOptions['bx_if:image']['content']['icon_url'] = $sThumbnailUrl;
+
+		$oCover->set($mixedOptions);
+    }
+
     public function getScreenshots($aData)
     {
-    	$oModule = BxDolModule::getInstance($this->MODULE);
-    	$CNF = &$oModule->_oConfig->CNF;
+    	$CNF = &BxDolModule::getInstance($this->MODULE)->_oConfig->CNF;
 
     	$oStorage = BxDolStorage::getObjectInstance($CNF['OBJECT_STORAGE']);
     	$oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_SCREENSHOT']);

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

@@ -56,8 +56,8 @@
 	<string name="_bx_market_form_entry_input_sys_pictures"><![CDATA[Pictures]]></string>
 	<string name="_bx_market_form_entry_input_pictures"><![CDATA[Pictures]]></string>
 	<string name="_bx_market_form_entry_input_pictures_title"><![CDATA[Title]]></string>
-	<string name="_bx_market_form_entry_input_pictures_use_as_thumb"><![CDATA[Preview picture]]></string>
-	<string name="_bx_market_form_entry_input_pictures_use_as_cover"><![CDATA[Cover picture]]></string>
+	<string name="_bx_market_form_entry_input_pictures_use_as_thumb"><![CDATA[Product icon]]></string>
+	<string name="_bx_market_form_entry_input_pictures_use_as_cover"><![CDATA[Product cover]]></string>
 	<string name="_bx_market_form_entry_input_sys_files"><![CDATA[Files]]></string>
 	<string name="_bx_market_form_entry_input_files"><![CDATA[Files]]></string>
 	<string name="_bx_market_form_entry_input_files_use_as_main"><![CDATA[Use as Main]]></string>
@@ -114,7 +114,6 @@
     <string name="_bx_market_page_block_title_entry_comments"><![CDATA[Reviews]]></string>
     <string name="_bx_market_page_block_title_entry_comments_link"><![CDATA[Reviews to <a href="{entry_link}">{title}</a>]]></string>
     <string name="_bx_market_page_block_title_entry_comments_n"><![CDATA[Reviews ({0})]]></string>
-    <string name="_bx_market_page_block_title_entry_cover"><![CDATA[Cover]]></string>
     <string name="_bx_market_page_block_title_entry_info"><![CDATA[Info]]></string>
     <string name="_bx_market_page_block_title_entry_location"><![CDATA[Location]]></string>
     <string name="_bx_market_page_block_title_entry_attachments"><![CDATA[Attachments]]></string>
@@ -289,7 +288,6 @@
 
     <string name="_bx_market_txt_all_entries_by"><![CDATA[<a href="{0}">All Products by {1} ({2})</a>]]></string>
     <string name="_bx_market_txt_category"><![CDATA[Category:]]></string>
-	<string name="_bx_market_txt_installs"><![CDATA[Active Installs:]]></string>
     <string name="_bx_market_txt_most_current_version"><![CDATA[The most current version]]></string>
     <string name="_bx_market_txt_released"><![CDATA[Released:]]></string>
     <string name="_bx_market_txt_sample_single"><![CDATA[product]]></string>

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

@@ -54,7 +54,6 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 ('bx_market_view_entry', '_bx_market_page_title_sys_view_entry', '_bx_market_page_title_view_entry', 'bx_market', 7, 2147483647, 1, 'view-product', '', '', '', '', 0, 1, 0, 'BxMarketPageEntry', 'modules/boonex/market/classes/BxMarketPageEntry.php');
 
 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_market_view_entry', 1, 'bx_market', '', '_bx_market_page_block_title_entry_cover', 3, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:12:\"entity_cover\";}', 0, 0, 1, 0),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_text', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:18:\"entity_all_actions\";}', 0, 0, 0, 1),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 1, 2),

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

@@ -228,7 +228,7 @@ INSERT INTO `sys_objects_transcoder` (`object`, `storage_object`, `source_type`,
 INSERT INTO `sys_transcoder_filters` (`transcoder_object`, `filter`, `filter_params`, `order`) VALUES 
 ('bx_market_preview', 'Resize', 'a:3:{s:1:"w";s:3:"300";s:1:"h";s:3:"200";s:11:"crop_resize";s:1:"1";}', '0'),
 ('bx_market_gallery', 'Resize', 'a:1:{s:1:"w";s:3:"500";}', '0'),
-('bx_market_cover', 'Resize', 'a:1:{s:1:"w";s:3:"2000";}', '0'),
+('bx_market_cover', 'Resize', 'a:1:{s:1:"w";s:4:"2000";}', '0'),
 ('bx_market_screenshot', 'Resize', 'a:3:{s:1:"w";s:3:"200";s:1:"h";s:3:"120";s:11:"crop_resize";s:1:"1";}', '0');
 
 -- FORMS

modules/boonex/market/template/css/entry.css

@@ -1,20 +1,3 @@
-/*--- Entry Cover ---*/
-.bx-market-entity-cover-size {
-	width: 100%;
-	max-height: 384px;
-	max-height: 24rem;
-}
-div.bx-market-entity-cover {
-	position: relative;
-	overflow: hidden;
-}
-div.bx-market-entity-cover img {
-	position: relative;
-	display: block;
-
-	object-fit: cover;
-}
-
 /*--- Entry Content ---*/
 div.bx-market-entity-content {}
 

modules/boonex/market/template/entry-author.html

@@ -1,5 +1,4 @@
 <div class="bx-market-entity-author">
     <p><span class="bx-def-font-grayed"><bx_text:_bx_market_txt_joined /></span> __joined__</p>
     <p><span class="bx-def-font-grayed"><bx_text:_bx_market_txt_last_active /></span> __last_active__</p>
-    <p><span class="bx-def-font-grayed"><bx_text:_bx_market_txt_installs /></span> __installs__</p>
 </div>

modules/boonex/market/template/entry-cover.html

@@ -1,3 +0,0 @@
-<div class="bx-market-entity-cover bx-def-round-corners">
-	<img class="bx-market-entity-cover-size" src="__cover_url__" />
-</div>

modules/boonex/market/template/entry-info.html

@@ -4,5 +4,4 @@
     </bx_if:show_category>
     <p><span class="bx-def-font-grayed"><bx_text:_bx_market_txt_released /></span> __released__</p>
     <p><span class="bx-def-font-grayed"><bx_text:_bx_market_txt_updated /></span> __updated__</p>
-    <p><span class="bx-def-font-grayed"><bx_text:_bx_market_txt_installs /></span> __installs__</p>
 </div>

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

@@ -56,8 +56,8 @@
 	<string name="_bx_market_form_entry_input_sys_pictures"><![CDATA[Картинки]]></string>
 	<string name="_bx_market_form_entry_input_pictures"><![CDATA[Картинки]]></string>
 	<string name="_bx_market_form_entry_input_pictures_title"><![CDATA[Название]]></string>
-	<string name="_bx_market_form_entry_input_pictures_use_as_thumb"><![CDATA[Изображение предпросмотра]]></string>
-	<string name="_bx_market_form_entry_input_pictures_use_as_cover"><![CDATA[Изображение обложки]]></string>
+	<string name="_bx_market_form_entry_input_pictures_use_as_thumb"><![CDATA[Иконка продукта]]></string>
+	<string name="_bx_market_form_entry_input_pictures_use_as_cover"><![CDATA[Обложка продукта]]></string>
 	<string name="_bx_market_form_entry_input_sys_files"><![CDATA[Файлы]]></string>
 	<string name="_bx_market_form_entry_input_files"><![CDATA[Файлы]]></string>
 	<string name="_bx_market_form_entry_input_files_use_as_main"><![CDATA[Использовать как главный]]></string>
@@ -114,7 +114,6 @@
     <string name="_bx_market_page_block_title_entry_comments"><![CDATA[Обзоры]]></string>
     <string name="_bx_market_page_block_title_entry_comments_link"><![CDATA[Обзоры к <a href="{entry_link}">{title}</a>]]></string>
     <string name="_bx_market_page_block_title_entry_comments_n"><![CDATA[Обзоры ({0})]]></string>
-    <string name="_bx_market_page_block_title_entry_cover"><![CDATA[Обложка]]></string>
     <string name="_bx_market_page_block_title_entry_info"><![CDATA[Информация]]></string>
     <string name="_bx_market_page_block_title_entry_location"><![CDATA[Расположение]]></string>
     <string name="_bx_market_page_block_title_entry_attachments"><![CDATA[Прикрепления]]></string>
@@ -281,7 +280,6 @@
 
     <string name="_bx_market_txt_all_entries_by"><![CDATA[<a href="{0}">Все продукты от {1} ({2})</a>]]></string>
     <string name="_bx_market_txt_category"><![CDATA[Категория:]]></string>
-    <string name="_bx_market_txt_installs"><![CDATA[Установок:]]></string>
     <string name="_bx_market_txt_most_current_version"><![CDATA[Самая новая версия]]></string>
     <string name="_bx_market_txt_released"><![CDATA[Дата выпуска:]]></string>
     <string name="_bx_market_txt_sample_single"><![CDATA[продукт]]></string>