Index: branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php
===================================================================
diff -u -N -r14853 -r14929
--- branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php	(.../promo_blocks_config.php)	(revision 14853)
+++ branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php	(.../promo_blocks_config.php)	(revision 14929)
@@ -29,34 +29,12 @@
 			'edit_status_labels' => Array ('promo-block' => '!la_title_EditingPromoBlock!'),
 		),
 
-		'promo_block_list' => Array ('prefixes' => Array ('promo-block_List'), 'format' => "!la_tab_PromoBlocks! (#promo-block_recordcount#)"),
+		'promo_block_list' => Array ('prefixes' => Array ('promo-block-group', 'promo-block_List'), 'format' => "!la_tab_PromoBlocks! - #promo-block-group_titlefield# (#promo-block_recordcount#)"),
 		'promo_block_edit' => Array ('prefixes' => Array ('promo-block'), 'format' => "#promo-block_status# '#promo-block_titlefield#'"),
 	),
 
-	'PermSection' => Array('main' => 'in-portal:promo_blocks'),
+	'PermSection' => Array('main' => 'in-portal:promo_block_groups'),
 
-	'Sections' => Array (
-		'in-portal:promo_blocks'	=>	Array(
-			'parent'		=>	'in-portal:site',
-			'icon'			=>	'custom',
-			'label'			=>	'la_tab_PromoBlocks',
-			'url'			=>	Array('t' => 'promo_blocks/promo_block_list', 'pass' => 'm'),
-			'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-			'priority'		=>	7,
-			'type'			=>	stTREE,
-		),
-
-		'in-portal:configure_promo_blocks' => Array (
-			'parent'		=>	'in-portal:website_setting_folder',
-			'icon'			=>	'custom',
-			'label'			=>	'la_title_PromoBlocks',
-			'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
-			'permissions'	=>	Array ('view', 'edit'),
-			'priority'		=>	3,
-			'type'			=>	stTREE,
-		),
-	),
-
 	'CalculatedFields' => Array (
 		'' => Array (
 			'ConversionPercent' => 'IF(%1$s.NumberOfViews > 0, NumberOfClicks / NumberOfViews * 100, NULL)',
@@ -75,6 +53,11 @@
 
 	'Fields' => Array (
 		'BlockId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PromoBlockGroupId' => Array (
+			'type' => 'int',
+			'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PromoBlockGroups ORDER BY Title', 'option_title_field' => 'Title', 'option_key_field' => 'PromoBlockGroupId',
+			'not_null' => 1, 'required' => 1, 'default' => 0,
+		),
 		'Title' => Array (
 			'type' => 'string', 'max_len' => 50,
 			'not_null' => 1, 'required' => 1, 'default' => '',