Ticket #544

modules/boonex/acl/classes/BxAclGridView.php

@@ -36,6 +36,7 @@ class BxAclGridView extends BxAclGridLevels
     		list($sJsCode, $sJsMethod) = $aJs;
 
     		$a['attr'] = array(
+    		    'title' => bx_html_attribute(_t('_bx_acl_grid_action_buy_title')),
     			'onclick' => $sJsMethod
     		);
     	}
@@ -50,6 +51,7 @@ class BxAclGridView extends BxAclGridLevels
 			list($sJsCode, $sJsMethod) = $aJs;
 
     		$a['attr'] = array(
+    			'title' => bx_html_attribute(_t('_bx_acl_grid_action_subscribe_title')),
     			'onclick' => $sJsMethod
     		);
 		}

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

@@ -53,8 +53,10 @@
 	<string name="_bx_acl_grid_action_add"><![CDATA[Add]]></string>
 	<string name="_bx_acl_grid_action_edit"><![CDATA[Edit]]></string>
 	<string name="_bx_acl_grid_action_delete"><![CDATA[Delete]]></string>
-	<string name="_bx_acl_grid_action_buy"><![CDATA[One-time payment]]></string>
-	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Subscribe on recurring payments]]></string>
+	<string name="_bx_acl_grid_action_buy"><![CDATA[Buy]]></string>
+	<string name="_bx_acl_grid_action_buy_title"><![CDATA[One-time payment]]></string>
+	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Rent]]></string>
+	<string name="_bx_acl_grid_action_subscribe_title"><![CDATA[Subscribe on recurring payments]]></string>
 
 	<string name="_bx_acl_popup_title_price_add"><![CDATA[Add Pricing Plan]]></string>
 	<string name="_bx_acl_popup_title_price_edit"><![CDATA[Edit Pricing Plan]]></string>

modules/boonex/acl/install/sql/install.sql

@@ -83,11 +83,11 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_acl_administration', 'trial', '_bx_acl_grid_column_trial', '15%', 0, 16, '', 6),
 ('bx_acl_administration', 'actions', '', '20%', 0, '', '', 7),
 
-('bx_acl_view', 'level_name', '_bx_acl_grid_column_level_name', '35%', 1, 36, '', 1),
+('bx_acl_view', 'level_name', '_bx_acl_grid_column_level_name', '25%', 1, 32, '', 1),
 ('bx_acl_view', 'price', '_bx_acl_grid_column_price', '15%', 0, 16, '', 2),
 ('bx_acl_view', 'period', '_bx_acl_grid_column_period', '15%', 0, 16, '', 3),
 ('bx_acl_view', 'trial', '_bx_acl_grid_column_trial', '15%', 0, 16, '', 4),
-('bx_acl_view', 'actions', '', '20%', 0, '', '', 5);
+('bx_acl_view', 'actions', '', '30%', 0, '', '', 5);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_acl_administration', 'independent', 'add', '_bx_acl_grid_action_add', '', 0, 0, 1),
@@ -95,8 +95,8 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_acl_administration', 'single', 'delete', '_bx_acl_grid_action_delete', 'remove', 1, 1, 2),
 ('bx_acl_administration', 'bulk', 'delete', '_bx_acl_grid_action_delete', '', 0, 1, 1),
 
-('bx_acl_view', 'single', 'buy', '_bx_acl_grid_action_buy', 'cart-plus', 1, 0, 1),
-('bx_acl_view', 'single', 'subscribe', '_bx_acl_grid_action_subscribe', 'thumb-tack', 1, 0, 2);
+('bx_acl_view', 'single', 'buy', '_bx_acl_grid_action_buy', 'cart-plus', 0, 0, 1),
+('bx_acl_view', 'single', 'subscribe', '_bx_acl_grid_action_subscribe', 'money', 0, 0, 2);
 
 
 -- STUDIO PAGE & WIDGET

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

@@ -48,13 +48,15 @@
 	<string name="_bx_acl_grid_column_name"><![CDATA[Имя]]></string>
 	<string name="_bx_acl_grid_column_period"><![CDATA[Период]]></string>
 	<string name="_bx_acl_grid_column_price"><![CDATA[Цена]]></string>
-	<string name="_bx_acl_grid_column_trial"><![CDATA[Пробный период]]></string>
+	<string name="_bx_acl_grid_column_trial"><![CDATA[Проба]]></string>
 
 	<string name="_bx_acl_grid_action_add"><![CDATA[Добавить]]></string>
 	<string name="_bx_acl_grid_action_edit"><![CDATA[Редактировать]]></string>
 	<string name="_bx_acl_grid_action_delete"><![CDATA[Удалить]]></string>
-	<string name="_bx_acl_grid_action_buy"><![CDATA[Единовременный платеж]]></string>
-	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Подписка на периодические платежи]]></string>
+	<string name="_bx_acl_grid_action_buy"><![CDATA[Купить]]></string>
+	<string name="_bx_acl_grid_action_buy_title"><![CDATA[Единовременный платеж]]></string>
+	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Арендовать]]></string>
+	<string name="_bx_acl_grid_action_subscribe_title"><![CDATA[Подписка на периодические платежи]]></string>
 
 	<string name="_bx_acl_popup_title_price_add"><![CDATA[Добавить ценовой план]]></string>
 	<string name="_bx_acl_popup_title_price_edit"><![CDATA[Редактировать ценовой план]]></string>

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

@@ -188,8 +188,8 @@
     <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[Приобрести за {0}{1}]]></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>
@@ -331,7 +331,7 @@
     <string name="_bx_market_txt_author_added_product"><![CDATA[{0} {1}]]></string>
     <string name="_bx_market_txt_joined"><![CDATA[Зарегистрирован:]]></string>
     <string name="_bx_market_txt_last_active"><![CDATA[Последняя активность:]]></string>
-    <string name="_bx_market_txt_price_single"><![CDATA[Приобрести за {0}{1}]]></string>
+    <string name="_bx_market_txt_price_single"><![CDATA[Купить за {0}{1}]]></string>
     <string name="_bx_market_txt_price_recurring"><![CDATA[Арендовать за {0}{1}/{2}]]></string>
     <string name="_bx_market_txt_per_day"><![CDATA[день]]></string>
     <string name="_bx_market_txt_per_day_short"><![CDATA[день]]></string>

template/scripts/BxBaseGrid.php

@@ -553,7 +553,7 @@ class BxBaseGrid extends BxDolGrid
             elseif ($sIconUrl = $this->_oTemplate->getIconUrl($a['icon']))
                 $sImage = '<i style="background-image:url(' . $sIconUrl . ');"></i>';
         }
-        return '<button ' . $sAttr . '>' . $sIcon . $sImage . ($a['icon_only'] ? '' : $a['title']) . '</button>';
+        return '<button ' . $sAttr . '>' . $sIcon . $sImage . ($a['icon_only'] ? '' : '<u>' . $a['title'] . '</u>') . '</button>';
     }
 
     protected function _getActionDivider ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())