Index: branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php =================================================================== diff -u -N -r15177 -r15373 --- branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php (.../promo_blocks_config.php) (revision 15177) +++ branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php (.../promo_blocks_config.php) (revision 15373) @@ -23,6 +23,8 @@ 'TitleField' => 'Title', + 'StatusField' => Array ('Status'), + 'TitlePresets' => Array ( 'default' => Array ( 'new_status_labels' => Array ('promo-block' => '!la_title_AddingPromoBlock!'), @@ -60,8 +62,12 @@ ), 'Title' => Array ( 'type' => 'string', 'max_len' => 50, - 'not_null' => 1, 'required' => 1, 'default' => '', + 'formatter' => 'kMultiLanguage', 'db_type' => 'varchar(50)', 'not_null' => 1, 'required' => 1, 'default' => '', ), + 'ButtonText' => Array ( + 'type' => 'string', 'max_len' => 255, + 'formatter' => 'kMultiLanguage', 'db_type' => 'varchar(255)', 'not_null' => 1, 'default' => '', + ), 'Status' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, @@ -77,12 +83,12 @@ 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), - 'CSSClassName' => Array( + /*'CSSClassName' => Array( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('promo-orange' => 'Orange', 'promo-green' => 'Green', 'promo-blue' => 'Blue'), 'not_null' => 1, 'default' => '', - ), + ),*/ 'LinkType' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Internal', 2 => 'la_opt_External'), 'use_phrases' => 1, @@ -109,7 +115,7 @@ ), 'NumberOfClicks' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1), 'NumberOfViews' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1), - 'Html' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null), + 'Html' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'db_type' => 'text', 'using_fck' => 1, 'default' => null), ), 'VirtualFields' => Array( @@ -118,21 +124,22 @@ 'Grids' => Array ( 'Default' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png', 0 => 'icon16_disabled.png'), 'Fields' => Array ( - 'BlockId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'BlockId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80), 'Title' => Array ('filter_block' => 'grid_like_filter'), - 'Status' => Array ('filter_block' => 'grid_options_filter'), - 'Priority' => Array ('title' => 'column:la_fld_Order', 'filter_block' => 'grid_range_filter'), - 'Sticky' => Array ('filter_block' => 'grid_options_filter'), - 'CSSClassName' => Array ('filter_block' => 'grid_options_filter'), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 80), + 'Priority' => Array ('title' => 'column:la_fld_Order', 'filter_block' => 'grid_range_filter', 'width' => 80), + 'Sticky' => Array ('filter_block' => 'grid_options_filter', 'width' => 80), +// 'CSSClassName' => Array ('filter_block' => 'grid_options_filter'), 'LinkType' => Array ('filter_block' => 'grid_options_filter'), - 'CategoryId' => Array ('title' => 'column:la_fld_Category', 'filter_block' => 'grid_options_filter'), - 'ExternalLink' => Array ('filter_block' => 'grid_like_filter'), - 'ScheduleFromDate' => Array ('title' => 'la_col_ScheduleFromDate', 'filter_block' => 'grid_date_range_filter'), - 'ScheduleToDate' => Array ('title' => 'la_col_ScheduleToDate', 'filter_block' => 'grid_date_range_filter'), + 'CategoryId' => Array ('title' => 'column:la_fld_Category', 'filter_block' => 'grid_options_filter', 'width' => 200), + 'ExternalLink' => Array ('filter_block' => 'grid_like_filter', 'width' => 200), + 'ScheduleFromDate' => Array ('title' => 'la_col_ScheduleFromDate', 'filter_block' => 'grid_date_range_filter', 'width' => 120), + 'ScheduleToDate' => Array ('title' => 'la_col_ScheduleToDate', 'filter_block' => 'grid_date_range_filter', 'width' => 120), 'NumberOfClicks' => Array ('filter_block' => 'grid_range_filter'), 'NumberOfViews' => Array ('filter_block' => 'grid_range_filter'), - 'ConversionPercent' => Array ('filter_block' => 'grid_range_filter'), + 'ConversionPercent' => Array ('filter_block' => 'grid_range_filter', 'width' => 80), ), ), ),