Merge branch 'master' of github.com:boonex/dolphin

inc/js/functions.js

@@ -332,8 +332,8 @@ function bx_menu_slide (jSel, e, sPosition) {
         eSlider.css({
             position: 'absolute',
             top: eBlock.find('.bx-db-header').outerHeight(true),
-            left: 0,
-            width: eBlock.width()
+            left: 0
+            //width: eBlock.width() TODO: Commited to test. Remove if everything is OK.
         });
     };
 

modules/boonex/market/classes/BxMarketMenuView.php

@@ -20,6 +20,11 @@ class BxMarketMenuView extends BxBaseModTextMenuView
         parent::__construct($aObject, $oTemplate);
     }
 
+    public function getCode ()
+    {
+    	return parent::getCode() . BxDolPayments::getInstance()->getCartJs();
+    }
+
     protected function _isVisible ($a)
     {
     	$CNF = &$this->_oModule->_oConfig->CNF;
@@ -36,8 +41,11 @@ class BxMarketMenuView extends BxBaseModTextMenuView
 				if(!$bResult) 
 					break;
 
+				$aCurrency = $this->_oModule->_oConfig->getCurrency();
+
 				list($sJsCode, $sJsMethod) = $oPayment->getAddToCartJs($this->_aContentInfo['author'], $this->MODULE, $this->_aContentInfo['id'], 1);
 				$this->addMarkers(array(
+					'add_to_cart_title' => _t('_bx_market_menu_item_title_add_to_cart', $aCurrency['sign'], $this->_aContentInfo[$CNF['FIELD_PRICE_SINGLE']]),
 		        	'add_to_cart_onclick' => $sJsMethod
 		        ));
 				break;
@@ -47,8 +55,11 @@ class BxMarketMenuView extends BxBaseModTextMenuView
 				if(!$bResult) 
 					break;
 
+				$aCurrency = $this->_oModule->_oConfig->getCurrency();
+
 				list($sJsCode, $sJsMethod) = $oPayment->getSubscribeJs($this->_aContentInfo['author'], '', $this->MODULE, $this->_aContentInfo['id'], 1);
 				$this->addMarkers(array(
+					'subscribe_title' => _t('_bx_market_menu_item_title_subscribe', $aCurrency['sign'], $this->_aContentInfo[$CNF['FIELD_PRICE_RECURRING']], _t('_bx_market_txt_per_' . $this->_aContentInfo[$CNF['FIELD_DURATION_RECURRING']])),
 		        	'subscribe_onclick' => $sJsMethod
 		        )); 
 				break;

modules/boonex/market/classes/BxMarketTemplate.php

@@ -70,58 +70,15 @@ class BxMarketTemplate extends BxBaseModTextTemplate
     
     public function entryText ($aData, $sTemplateName = 'entry-text.html')
     {
-    	$CNF = &BxDolModule::getInstance($this->MODULE)->_oConfig->CNF;
-
-    	$sThumbUrl = '';
-        if ($aData[$CNF['FIELD_THUMB']]) {
-            $oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_PREVIEW']);
-            if ($oImagesTranscoder)
-                $sThumbUrl = $oImagesTranscoder->getFileUrl($aData[$CNF['FIELD_THUMB']]);
-        }
-
-        $sJsCode = '';
-        $oPayment = BxDolPayments::getInstance();
-
-        $aTmplVarsSingle = array();
-        $bSingle = (float)$aData[$CNF['FIELD_PRICE_SINGLE']] != 0;
-        if($bSingle) {
-        	list($sJsCode, $sSingleOnclick) = $oPayment->getAddToCartJs($aData[$CNF['FIELD_AUTHOR']], $this->_oConfig->getName(), $aData[$CNF['FIELD_ID']], 1);
-
-        	$aTmplVarsSingle = array(
-        		'buy_onclick' => $sSingleOnclick,
-    			'buy' => _t('_bx_market_txt_get_for_single', $this->_aCurrency['sign'], $aData[$CNF['FIELD_PRICE_SINGLE']]),
-        	);
-        }
-        
-        
-        $aTmplVarsRecurring = array();
-        $bTmplVarsRecurring = $this->_oDb->getParam($CNF['OPTION_ENABLE_RECURRING']) == 'on' && (float)$aData[$CNF['FIELD_PRICE_RECURRING']] != 0;
-        if($bTmplVarsRecurring) {
-        	list($sJsCode, $sRecurringOnclick) = $oPayment->getSubscribeJs($aData[$CNF['FIELD_AUTHOR']], '', $this->_oConfig->getName(), $aData[$CNF['FIELD_ID']], 1);
-
-        	$aTmplVarsRecurring = array(
-        		'recurring_onclick' => $sRecurringOnclick,
-        		'recurring' => _t('_bx_market_txt_get_for_recurring', $this->_aCurrency['sign'], $aData[$CNF['FIELD_PRICE_RECURRING']], _t('_bx_market_txt_per_' . $aData[$CNF['FIELD_DURATION_RECURRING']])),
-        	);
-        }
+    	$sScreenshots = $this->getScreenshots($aData);
 
     	return $this->parseHtmlByContent(parent::entryText($aData), array(
-    		'title_attr' => bx_html_attribute(isset($aData[$CNF['FIELD_TITLE']]) ? $aData[$CNF['FIELD_TITLE']] : ''),
-    		'thumb_url' => $sThumbUrl,
-    		'bx_if:show_single' => array(
-    			'condition' => $bSingle,
-    			'content' => $aTmplVarsSingle
-    		),
-    		'bx_if:show_recurring' => array(
-    			'condition' => $bTmplVarsRecurring,
-    			'content' => $aTmplVarsRecurring
-    		),
-    		'bx_if:show_free' => array(
-    			'condition' => !$bSingle && !$bTmplVarsRecurring,
-    			'content' => array()
-    		),
-    		'screenshots' => $this->getScreenshots($aData),
-    		'js_code' => $sJsCode
+    		'bx_if:show_screenshots' => array(
+    			'condition' => !empty($sScreenshots),
+    			'content' => array(
+    				'screenshots' => $sScreenshots
+    			)
+    		)
     	));
     }
 
@@ -172,10 +129,12 @@ class BxMarketTemplate extends BxBaseModTextTemplate
     {
     	$CNF = &BxDolModule::getInstance($this->MODULE)->_oConfig->CNF;
 
-    	$oStorage = BxDolStorage::getObjectInstance($CNF['OBJECT_STORAGE']);
-    	$oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_SCREENSHOT']);
     	$aPhotos = $this->_oDb->getPhoto(array('type' => 'content_id', 'content_id' => $aData[$CNF['FIELD_ID']], 'except' => array($aData[$CNF['FIELD_THUMB']], $aData[$CNF['FIELD_COVER']])));
-    	$iPhotos = count($aPhotos);
+    	if(empty($aPhotos) || !is_array($aPhotos))
+    		return '';
+
+		$oStorage = BxDolStorage::getObjectInstance($CNF['OBJECT_STORAGE']);
+    	$oImagesTranscoder = BxDolTranscoderImage::getObjectInstance($CNF['OBJECT_IMAGES_TRANSCODER_SCREENSHOT']);
 
     	$aTmplVarsPhotos = array();
     	foreach($aPhotos as $aPhoto) 

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

@@ -162,12 +162,11 @@
     <string name="_bx_market_menu_item_title_system_delete_entry"><![CDATA[Delete Product]]></string>
     <string name="_bx_market_menu_item_title_delete_entry"><![CDATA[Delete Product]]></string>
     <string name="_bx_market_menu_item_title_system_add_to_cart"><![CDATA[Add to Cart]]></string>
-    <string name="_bx_market_menu_item_title_add_to_cart"><![CDATA[Add to Cart]]></string>
-    <string name="_bx_market_menu_item_title_system_subscribe"><![CDATA[Subscribe]]></string>
-    <string name="_bx_market_menu_item_title_subscribe"><![CDATA[Subscribe]]></string>
+    <string name="_bx_market_menu_item_title_add_to_cart"><![CDATA[Buy for {0}{1}]]></string>
+    <string name="_bx_market_menu_item_title_system_subscribe"><![CDATA[Rent]]></string>
+    <string name="_bx_market_menu_item_title_subscribe"><![CDATA[Rent for {0}{1}/{2}]]></string>
     <string name="_bx_market_menu_item_title_system_download"><![CDATA[Download]]></string>
     <string name="_bx_market_menu_item_title_download"><![CDATA[Download]]></string>
-    <string name="_bx_market_menu_item_title_system_view_entry"><![CDATA[View Product]]></string>
     <string name="_bx_market_menu_item_title_system_entries_home"><![CDATA[Market]]></string>
     <string name="_bx_market_menu_item_title_entries_home"><![CDATA[Market]]></string>
     <string name="_bx_market_menu_item_title_system_entries_categories"><![CDATA[Categories]]></string>
@@ -180,9 +179,10 @@
     <string name="_bx_market_menu_item_title_entries_popular"><![CDATA[Popular]]></string>
     <string name="_bx_market_menu_title_view_entry_submenu"><![CDATA[View Product Submenu]]></string>
     <string name="_bx_market_menu_set_title_view_entry_submenu"><![CDATA[View Product Submenu]]></string>
-    <string name="_bx_market_menu_item_title_view_entry_submenu_entry"><![CDATA[Product]]></string>
+    <string name="_bx_market_menu_item_title_system_view_entry_submenu_entry"><![CDATA[Overview]]></string>
+    <string name="_bx_market_menu_item_title_view_entry_submenu_entry"><![CDATA[Overview]]></string>
+    <string name="_bx_market_menu_item_title_system_view_entry_submenu_comments"><![CDATA[Reviews]]></string>
     <string name="_bx_market_menu_item_title_view_entry_submenu_comments"><![CDATA[Reviews]]></string>
-    <string name="_bx_market_menu_item_title_system_view_entry_comments"><![CDATA[Product Reviews]]></string>
     <string name="_bx_market_menu_item_title_system_view_entries_author"><![CDATA[Products]]></string>
     <string name="_bx_market_menu_item_title_view_entries_author"><![CDATA[Products]]></string>
     <string name="_bx_market_menu_title_entries_my"><![CDATA[My Products Action Menu]]></string>
@@ -296,9 +296,7 @@
     <string name="_bx_market_txt_updated"><![CDATA[Updated:]]></string>
     <string name="_bx_market_txt_joined"><![CDATA[Joined:]]></string>
     <string name="_bx_market_txt_last_active"><![CDATA[Last Active:]]></string>
-    <string name="_bx_market_txt_get_for_single"><![CDATA[Get for {0}{1}]]></string>
     <string name="_bx_market_txt_price_single"><![CDATA[{0}{1}]]></string>
-    <string name="_bx_market_txt_get_for_recurring"><![CDATA[Get for {0}{1}/{2}]]></string>
     <string name="_bx_market_txt_price_recurring"><![CDATA[{0}{1}/{2}]]></string>
     <string name="_bx_market_txt_per_week"><![CDATA[week]]></string>
     <string name="_bx_market_txt_per_week_short"><![CDATA[wk]]></string>

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

@@ -56,7 +56,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_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),
+('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, 0, 2),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_social_sharing', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:21:\"entity_social_sharing\";}', 0, 0, 0, 3),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 4),
 ('bx_market_view_entry', 3, 'bx_market', '', '_bx_market_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 0),
@@ -183,8 +183,8 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_market_view', 'bx_market', 'edit-product', '_bx_market_menu_item_title_system_edit_entry', '_bx_market_menu_item_title_edit_entry', 'page.php?i=edit-product&id={content_id}', '', '', 'pencil', '', 2147483647, 1, 0, 1),
 ('bx_market_view', 'bx_market', 'delete-product', '_bx_market_menu_item_title_system_delete_entry', '_bx_market_menu_item_title_delete_entry', 'page.php?i=delete-product&id={content_id}', '', '', 'remove', '', 2147483647, 1, 0, 2),
 ('bx_market_view', 'bx_market', 'download', '_bx_market_menu_item_title_system_download', '_bx_market_menu_item_title_download', 'page.php?i=download-product&id={content_id}', '', '', 'download', '', 2147483647, 1, 0, 3),
-('bx_market_view', 'bx_market', 'add-to-cart', '_bx_market_menu_item_title_system_add_to_cart', '_bx_market_menu_item_title_add_to_cart', 'javascript:void(0);', 'javascript:{add_to_cart_onclick}', '', 'cart-plus', '', 2147483647, 1, 0, 4),
-('bx_market_view', 'bx_market', 'subscribe', '_bx_market_menu_item_title_system_subscribe', '_bx_market_menu_item_title_subscribe', 'javascript:void(0);', 'javascript:{subscribe_onclick}', '', 'rss', '', 2147483647, 1, 0, 5);
+('bx_market_view', 'bx_market', 'add-to-cart', '_bx_market_menu_item_title_system_add_to_cart', '{add_to_cart_title}', 'javascript:void(0);', 'javascript:{add_to_cart_onclick}', '', 'cart-plus', '', 2147483647, 1, 0, 4),
+('bx_market_view', 'bx_market', 'subscribe', '_bx_market_menu_item_title_system_subscribe', '{subscribe_title}', 'javascript:void(0);', 'javascript:{subscribe_onclick}', '', 'money', '', 2147483647, 1, 0, 5);
 
 
 -- MENU: actions menu for my entries
@@ -219,8 +219,8 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_market_view_submenu', 'bx_market', '_bx_market_menu_set_title_view_entry_submenu', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_market_view_submenu', 'bx_market', 'view-product', '_bx_market_menu_item_title_system_view_entry', '_bx_market_menu_item_title_view_entry_submenu_entry', 'page.php?i=view-product&id={content_id}', '', '', '', '', 2147483647, 1, 0, 1),
-('bx_market_view_submenu', 'bx_market', 'view-product-comments', '_bx_market_menu_item_title_system_view_entry_comments', '_bx_market_menu_item_title_view_entry_submenu_comments', 'page.php?i=view-product-comments&id={content_id}', '', '', '', '', 2147483647, 1, 0, 2);
+('bx_market_view_submenu', 'bx_market', 'view-product', '_bx_market_menu_item_title_system_view_entry_submenu_entry', '_bx_market_menu_item_title_view_entry_submenu_entry', 'page.php?i=view-product&id={content_id}', '', '', '', '', 2147483647, 1, 0, 1),
+('bx_market_view_submenu', 'bx_market', 'view-product-comments', '_bx_market_menu_item_title_system_view_entry_submenu_comments', '_bx_market_menu_item_title_view_entry_submenu_comments', 'page.php?i=view-product-comments&id={content_id}', '', '', '', '', 2147483647, 1, 0, 2);
 
 -- MENU: profile stats
 SET @iNotifMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_profile_stats' AND `active` = 1 LIMIT 1);

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

@@ -29,8 +29,16 @@ div.bx-market-ech-info .bx-market-ech-free {}
 /*--- Entry Screenshots ---*/
 div.bx-market-screenshots {
 	position: relative;
+	height: 120px;
+
 	overflow: hidden;
 }
+div.bx-market-screenshots-cnt {
+	position: relative;
+	overflow-x: scroll;
+	overflow-y: hidden;
+	-webkit-overflow-scrolling: touch;
+}
 div.bx-market-ss-cnt {
 	position: relative;
 	display: inline-block;

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

@@ -1,16 +1,18 @@
 <div class="bx-market-screenshots bx-def-margin-fiv-top">
-	<div class="bx-market-ss-left">
-		<i class="sys-icon caret-left"></i>
-	</div>
-	<div class="bx-market-ss-cnt">
-		<bx_repeat:items><div class="bx-market-ss-item bx-def-padding-right">
-				<a href="__item_url_bg__" rel="group">
-	        		<img class="bx-market-ssi-img bx-market-screenshot-size bx-def-round-corners" src="<bx_image_url:spacer.gif />" style="background-image:url(__item_url_sm__);" />
-	        	</a>
-		</div></bx_repeat:items>
-		<div class="bx-clear"></div>
-	</div>
-	<div class="bx-market-ss-right">
-		<i class="sys-icon caret-right"></i>
+	<div class="bx-market-screenshots-cnt">
+		<div class="bx-market-ss-left">
+			<i class="sys-icon caret-left"></i>
+		</div>
+		<div class="bx-market-ss-cnt">
+			<bx_repeat:items><div class="bx-market-ss-item bx-def-padding-right">
+					<a href="__item_url_bg__" rel="group">
+		        		<img class="bx-market-ssi-img bx-market-screenshot-size bx-def-round-corners" src="<bx_image_url:spacer.gif />" style="background-image:url(__item_url_sm__);" />
+		        	</a>
+			</div></bx_repeat:items>
+			<div class="bx-clear"></div>
+		</div>
+		<div class="bx-market-ss-right">
+			<i class="sys-icon caret-right"></i>
+		</div>
 	</div>
 </div>

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

@@ -1,22 +1,6 @@
 <div class="bx-base-text-entity-content bx-market-entity-content bx-def-constraint-list bx-def-constraint-pre bx-def-constraint-object bx-def-constraint-iframe bx-def-constraint-img">
-    <div class="bx-market-ec-head">
-    	<div class="bx-market-ech-info">
-    		<div class="bx-market-ech-info-cnt">
-	    		<div class="bx-market-ech-price bx-def-margin-sec-top">
-	    			<bx_if:show_single>
-	    				<a class="bx-market-ech-paid bx-btn bx-def-margin-sec-right" href="javascript:void(0)" onclick="javascript:__buy_onclick__">__buy__</a>
-	    			</bx_if:show_single>
-	    			<bx_if:show_recurring>
-						<a class="bx-market-ech-paid bx-btn" href="javascript:void(0)" onclick="javascript:__recurring_onclick__">__recurring__</a>
-		    		</bx_if:show_recurring>
-		    		<bx_if:show_free>
-		    			<span class="bx-market-ech-free bx-def-font-bold col-green3"><bx_text:_bx_market_txt_get_for_free /></span>
-		    		</bx_if:show_free>
-	    		</div>
-	    	</div>
-    	</div>
-    </div>
-    <div class="bx-market-ec-slideshow bx-def-margin-top">__screenshots__</div>
-    <div class="bx-market-ec-description bx-def-margin-top">__text__</div>
-</div>
-__js_code__
+	<bx_if:show_screenshots>
+    	<div class="bx-market-ec-slideshow bx-def-margin-top-auto">__screenshots__</div>
+    </bx_if:show_screenshots>
+    <div class="bx-market-ec-description bx-def-margin-top-auto">__text__</div>
+</div>

modules/boonex/payment/classes/BxPaymentCart.php

@@ -243,8 +243,10 @@ class BxPaymentCart extends BxBaseModPaymentCart
             return array('code' => 1, 'message' => _t($CNF['T']['ERR_WRONG_DATA']));
 
 		$iClientId = $this->_oModule->getProfileId();
-        if(empty($iClientId))
-            return array('code' => 2, 'message' => _t($CNF['T']['ERR_REQUIRED_LOGIN']));
+        if(empty($iClientId)) {
+        	$sLoginUrl = BxDolPermalinks::getInstance()->permalink('page.php?i=login');
+            return array('code' => 2, 'eval' => 'window.open("' . $sLoginUrl . '", "_self");');
+        }
 
         if($iClientId == $iSellerId)
             return array('code' => 3, 'message' => _t($CNF['T']['ERR_SELF_PURCHASE']));

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

@@ -160,9 +160,12 @@
     <string name="_bx_market_menu_item_title_edit_entry"><![CDATA[Редактировать продукт]]></string>
     <string name="_bx_market_menu_item_title_system_delete_entry"><![CDATA[Удалить продукт]]></string>
     <string name="_bx_market_menu_item_title_delete_entry"><![CDATA[Удалить продукт]]></string>
-	<string name="_bx_market_menu_item_title_system_add_to_cart"><![CDATA[В корзину]]></string>
-    <string name="_bx_market_menu_item_title_add_to_cart"><![CDATA[В корзину]]></string>
-    <string name="_bx_market_menu_item_title_system_view_entry"><![CDATA[Просмотреть продукт]]></string>
+	<string name="_bx_market_menu_item_title_system_add_to_cart"><![CDATA[Приобрести]]></string>
+    <string name="_bx_market_menu_item_title_add_to_cart"><![CDATA[Приобрести за {0}{1}]]></string>
+    <string name="_bx_market_menu_item_title_system_subscribe"><![CDATA[Арендовать]]></string>
+    <string name="_bx_market_menu_item_title_subscribe"><![CDATA[Арендовать за {0}{1}/{2}]]></string>
+    <string name="_bx_market_menu_item_title_system_download"><![CDATA[Скачать]]></string>
+    <string name="_bx_market_menu_item_title_download"><![CDATA[Скачать]]></string>
     <string name="_bx_market_menu_item_title_system_entries_home"><![CDATA[Рынок]]></string>
     <string name="_bx_market_menu_item_title_entries_home"><![CDATA[Рынок]]></string>
 	<string name="_bx_market_menu_item_title_system_entries_categories"><![CDATA[Категории]]></string>
@@ -175,9 +178,10 @@
     <string name="_bx_market_menu_item_title_entries_popular"><![CDATA[Популярные]]></string>
     <string name="_bx_market_menu_title_view_entry_submenu"><![CDATA[Просмотреть продукт - Подменю]]></string>
     <string name="_bx_market_menu_set_title_view_entry_submenu"><![CDATA[Просмотреть продукт - Подменю]]></string>
-    <string name="_bx_market_menu_item_title_view_entry_submenu_entry"><![CDATA[продукт]]></string>
-    <string name="_bx_market_menu_item_title_view_entry_submenu_comments"><![CDATA[Обзоры]]></string>
-    <string name="_bx_market_menu_item_title_system_view_entry_comments"><![CDATA[Обзоры к продукту]]></string>
+    <string name="_bx_market_menu_item_title_system_view_entry_submenu_entry"><![CDATA[Обзор]]></string>
+    <string name="_bx_market_menu_item_title_view_entry_submenu_entry"><![CDATA[Обзор]]></string>
+    <string name="_bx_market_menu_item_title_system_view_entry_submenu_comments"><![CDATA[Рецензии]]></string>
+    <string name="_bx_market_menu_item_title_view_entry_submenu_comments"><![CDATA[Рецензии]]></string>    
     <string name="_bx_market_menu_item_title_system_view_entries_author"><![CDATA[Продукты]]></string>
     <string name="_bx_market_menu_item_title_view_entries_author"><![CDATA[Продукты]]></string>
     <string name="_bx_market_menu_title_entries_my"><![CDATA[Мои продукты - Меню действий]]></string>
@@ -288,9 +292,7 @@
     <string name="_bx_market_txt_updated"><![CDATA[Дата обновления:]]></string>
     <string name="_bx_market_txt_joined"><![CDATA[Зарегистрирован:]]></string>
     <string name="_bx_market_txt_last_active"><![CDATA[Последняя активность:]]></string>
-    <string name="_bx_market_txt_get_for_single"><![CDATA[Приобрести за {0}{1}]]></string>
     <string name="_bx_market_txt_price_single"><![CDATA[{0}{1}]]></string>
-    <string name="_bx_market_txt_get_for_recurring"><![CDATA[Приобрести за {0}{1} в {2}]]></string>
     <string name="_bx_market_txt_price_recurring"><![CDATA[{0}{1}/{2}]]></string>
     <string name="_bx_market_txt_per_week"><![CDATA[неделю]]></string>
     <string name="_bx_market_txt_per_week_short"><![CDATA[нед]]></string>

studio/template/css/login.css

@@ -17,7 +17,10 @@ div.bx-std-lf-submit {
     float: left;
     width: 125px;
 }
-div.bx-std-lf-submit input {
-	width: 125px
-}
+div.bx-std-lf-submit .bx-btn {
+	width: 125px;
 
+	-moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+}