0001290: Minor Improvements to Promo Blocks

Index: admin_templates/promo_blocks/promo_block_edit.tpl =================================================================== --- admin_templates/promo_blocks/promo_block_edit.tpl (revision 15359) +++ admin_templates/promo_blocks/promo_block_edit.tpl (working copy) @@ -79,8 +79,9 @@ <table class="edit-form"> <inp2:m_RenderElement name="inp_id_label" prefix="promo-block" field="BlockId" title="la_fld_Id"/> <inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="PromoBlockGroupId" title="la_fld_PromoBlockGroup" has_empty="1"/> ~~- <inp2:m_RenderElement name="inp_edit_box" prefix="promo-block" field="Title" maxlength="50"/>~~ + <inp2:m_RenderElement name="inp_edit_box_ml" prefix="promo-block" field="Title" maxlength="50"/> <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="promo-block" field="Html" title="la_fld_Text" control_options="{min_height: 60}" rows="4" cols="70"/> + <inp2:m_RenderElement name="inp_edit_box_ml" prefix="promo-block" field="ButtonText"/> <inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="Priority" title="la_fld_Order"/> <inp2:m_RenderElement name="inp_edit_radio" prefix="promo-block" field="Status"/> @@ -92,7 +93,7 @@ <inp2:lang_ListLanguages render_as="image_block" row_start_render_as="html:" row_end_render_as="html:"/> ~~- <inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="CSSClassName" has_empty="1"/>~~ +  <inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="LinkType" onchange="select_link_type()"/> <inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="CategoryId" title="la_fld_Category" style="width: 400px;" has_empty="1"/> <inp2:m_RenderElement name="inp_edit_box" prefix="promo-block" field="ExternalLink"/> Index: admin_templates/promo_blocks/promo_block_list.tpl =================================================================== --- admin_templates/promo_blocks/promo_block_list.tpl (revision 15359) +++ admin_templates/promo_blocks/promo_block_list.tpl (working copy) @@ -1,67 +1,138 @@ <inp2:m_include t="incs/header"/> ~~-<inp2:m_RenderElement name="combined_header" section="in-portal:promo_block_groups" prefix="promo-block" title_preset="promo_block_list" pagination="1"/>~~ +<inp2:m_RenderElement name="combined_header" section="in-portal:promo_block_groups" prefix="promo-block" title_preset="promo_block_list" additional_blue_bar_render_as="grid_ml_selector" pagination="1"/>  <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0"> <tbody> <tr> <td> ~~- <script type="text/javascript">~~ + <script type="text/javascript"> <inp2:m_include t="promo_block_groups/section_reload"/> + </script> + <script type="text/javascript"> //do not rename - this function is used in default grid for double click! ~~- function edit()~~ ~~- {~~ ~~- std_edit_item('promo-block', 'promo_blocks/promo_block_edit');~~ ~~- }~~ + function edit() { + std_edit_item('promo-block', 'promo_blocks/promo_block_edit'); + } ~~- var a_toolbar = new ToolBar();~~ ~~- a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',~~ ~~- function() {~~ + var a_toolbar = new ToolBar(); + + a_toolbar.AddButton( + new ToolBarButton( + 'new_item', + '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>', + function () { std_precreate_item('promo-block', 'promo_blocks/promo_block_edit'); ~~- } ) );~~ + } + ) + ); ~~- a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );~~ ~~- a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',~~ ~~- function() {~~ + a_toolbar.AddButton( + new ToolBarButton( + 'edit', + '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', + edit + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'delete', + '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>', + function () { std_delete_items('promo-block') ~~- } ) );~~ + } + ) + ); ~~- a_toolbar.AddButton( new ToolBarSeparator('sep1') );~~ + a_toolbar.AddButton(new ToolBarSeparator('sep1')); ~~- a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetSticky" escape="1"/>', function() {~~ + a_toolbar.AddButton( + new ToolBarButton( + 'setprimary', + '<inp2:m_phrase label="la_ToolTip_SetSticky" escape="1"/>', + function () { submit_event('promo-block', 'OnSetSticky'); } ~~- ) );~~ + ) + ); ~~- a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_ResetCounters" escape="1"/>', function() {~~ + a_toolbar.AddButton( + new ToolBarButton( + 'reset_edit', + '<inp2:m_phrase label="la_ToolTip_ResetCounters" escape="1"/>', + function () { submit_event('promo-block', 'OnResetCounters'); } ~~- ) );~~ + ) + ); ~~- a_toolbar.AddButton( new ToolBarSeparator('sep2') );~~ + a_toolbar.AddButton(new ToolBarSeparator('sep2')); ~~- a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {~~ ~~- submit_event('promo-block','OnMassMoveUp');~~ + a_toolbar.AddButton( + new ToolBarButton( + 'approve', + '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', + function () { + submit_event('promo-block', 'OnMassApprove'); } ~~- ) );~~ + ) + ); ~~- a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {~~ ~~- submit_event('promo-block','OnMassMoveDown');~~ + a_toolbar.AddButton( + new ToolBarButton( + 'decline', + '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', + function () { + submit_event('promo-block', 'OnMassDecline'); } ~~- ) );~~ + ) + ); ~~- a_toolbar.AddButton( new ToolBarSeparator('sep3') );~~ + a_toolbar.AddButton(new ToolBarSeparator('sep3')); ~~- a_toolbar.AddButton( new ToolBarButton('tools', '<inp2:m_phrase label="la_ToolTip_Settings" escape="1"/>', function() {~~ + a_toolbar.AddButton( + new ToolBarButton( + 'move_up', + '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', + function () { + submit_event('promo-block', 'OnMassMoveUp'); + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'move_down', + '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', + function () { + submit_event('promo-block', 'OnMassMoveDown'); + } + ) + ); + + a_toolbar.AddButton(new ToolBarSeparator('sep4')); + + a_toolbar.AddButton( + new ToolBarButton( + 'tools', + '<inp2:m_phrase label="la_ToolTip_Settings" escape="1"/>', + function () { direct_edit('promo-block', '<inp2:promo-block-group_EditLink edit_template="promo_block_groups/promo_block_group_edit" js_escape="1" no_amp="1"/>'); } ~~- ) );~~ + ) + ); ~~- a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {~~ ~~- show_viewmenu(a_toolbar,'view');~~ + a_toolbar.AddButton( + new ToolBarButton( + 'view', + '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', + function () { + show_viewmenu(a_toolbar, 'view'); } ~~- ) );~~ + ) + ); a_toolbar.Render(); @@ -83,6 +154,6 @@ <inp2:m_RenderElement name="grid" PrefixSpecial="promo-block" IdField="BlockId" grid="Default" grid_filters="1"/> <script type="text/javascript"> ~~- Grids['promo-block'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','reset_edit','move_up','move_down') );~~ + Grids['promo-block'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','reset_edit','approve','decline','move_up','move_down') ); </script> <inp2:m_include t="incs/footer"/> Index: install/install_schema.sql =================================================================== --- install/install_schema.sql (revision 15363) +++ install/install_schema.sql (working copy) @@ -1324,9 +1324,18 @@ CREATE TABLE PromoBlocks ( BlockId int(11) NOT NULL AUTO_INCREMENT, ~~- Title varchar(50) NOT NULL DEFAULT '',~~ + l1_Title varchar(50) NOT NULL DEFAULT '', + l2_Title varchar(50) NOT NULL DEFAULT '', + l3_Title varchar(50) NOT NULL DEFAULT '', + l4_Title varchar(50) NOT NULL DEFAULT '', + l5_Title varchar(50) NOT NULL DEFAULT '', + l1_ButtonText varchar(255) NOT NULL DEFAULT '', + l2_ButtonText varchar(255) NOT NULL DEFAULT '', + l3_ButtonText varchar(255) NOT NULL DEFAULT '', + l4_ButtonText varchar(255) NOT NULL DEFAULT '', + l5_ButtonText varchar(255) NOT NULL DEFAULT '', Priority int(11) NOT NULL DEFAULT '0', ~~- Status tinyint(1) NOT NULL DEFAULT '1',~~ + `Status` tinyint(1) NOT NULL DEFAULT '1', l1_Image varchar(255) NOT NULL DEFAULT '', l2_Image varchar(255) NOT NULL DEFAULT '', l3_Image varchar(255) NOT NULL DEFAULT '', @@ -1334,7 +1343,7 @@ l5_Image varchar(255) NOT NULL DEFAULT '', CSSClassName varchar(255) NOT NULL DEFAULT '', LinkType tinyint(1) NOT NULL DEFAULT '1', ~~- CategoryId INT(11) DEFAULT NULL,~~ + CategoryId int(11) DEFAULT NULL, ExternalLink varchar(255) NOT NULL DEFAULT '', OpenInNewWindow tinyint(3) unsigned NOT NULL DEFAULT '0', ScheduleFromDate int(11) DEFAULT NULL, @@ -1350,7 +1359,17 @@ PromoBlockGroupId int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (BlockId), KEY OpenInNewWindow (OpenInNewWindow), ~~- KEY PromoBlockGroupId (PromoBlockGroupId)~~ + KEY PromoBlockGroupId (PromoBlockGroupId), + KEY l1_Title (l1_Title(5)), + KEY l2_Title (l2_Title(5)), + KEY l3_Title (l3_Title(5)), + KEY l4_Title (l4_Title(5)), + KEY l5_Title (l5_Title(5)), + KEY l1_ButtonText (l1_ButtonText(5)), + KEY l2_ButtonText (l2_ButtonText(5)), + KEY l3_ButtonText (l3_ButtonText(5)), + KEY l4_ButtonText (l4_ButtonText(5)), + KEY l5_ButtonText (l5_ButtonText(5)) ); CREATE TABLE PromoBlockGroups ( Index: install/upgrades.php =================================================================== --- install/upgrades.php (revision 15359) +++ install/upgrades.php (working copy) @@ -2146,4 +2146,33 @@ return '$body' . "\n" . str_replace(Array ("\r\n", "\r"), "\n", $string); } + + /** + * Update to 5.2.0-RC1 + * + * @param string $mode when called mode {before, after) + */ + public function Upgrade_5_2_0_RC1($mode) + { + if ( $mode != 'before' ) { + return; + } + + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); + /* @var $ml_helper kMultiLanguageHelper */ + + $ml_helper->createFields('promo-block'); + + $table_name = $this->Application->getUnitOption('promo-block', 'TableName'); + $table_structure = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field'); + + if ( isset($table_structure['Title']) ) { + $sql = 'UPDATE ' . $table_name . ' + SET l' . $this->Application->GetDefaultLanguageId() . '_Title = Title'; + $this->Conn->Query($sql); + + $sql = 'ALTER TABLE ' . $table_name . ' DROP Title'; + $this->Conn->Query($sql); + } + } } \ No newline at end of file Index: install/upgrades.sql =================================================================== --- install/upgrades.sql (revision 15363) +++ install/upgrades.sql (working copy) @@ -2749,4 +2749,4 @@ # ===== v 5.2.0-RC1 ===== UPDATE LanguageLabels SET l<%PRIMARY_LANGUAGE%>_Translation = '<TITLE> Tag' WHERE PhraseKey = 'LA_FLD_PAGECONTENTTITLE'; ALTER TABLE EmailLog ADD EventType TINYINT(4) NULL AFTER EventName; ~~-DELETE FROM UserPersistentSessionData WHERE VariableName = 'email-log[Default]columns_.';~~ +DELETE FROM UserPersistentSessionData WHERE VariableName IN ('email-log[Default]columns_.', 'promo-block[Default]columns_.'); Index: units/promo_blocks/promo_block_eh.php =================================================================== --- units/promo_blocks/promo_block_eh.php (revision 15359) +++ units/promo_blocks/promo_block_eh.php (working copy) @@ -332,7 +332,7 @@ 'formatter' => 'kUploadFormatter', 'upload_dir' => IMAGES_PATH . 'promo_blocks/', 'multiple' => 1, 'thumb_format' => 'resize:100x100', 'file_types' => '*.jpg;*.gif;*.png', 'files_description' => '!la_hint_ImageFiles!', ~~- 'required' => 1, 'not_null' => 1, 'default' => '',~~ + 'not_null' => 1, 'default' => '', ); // get active languages @@ -340,10 +340,12 @@ FROM ' . TABLE_PREFIX . 'Languages'; $languages = $this->Conn->GetCol($sql); ~~- foreach ($languages AS $lang_id) {~~ + foreach ($languages as $lang_id) { $fields['l' . $lang_id . '_Image'] = $a_image; } + $fields['l' . $this->Application->GetDefaultLanguageId() . '_Image']['required'] = 1; + $this->Application->setUnitOption($event->Prefix, 'Fields', $fields); } } Index: units/promo_blocks/promo_blocks_config.php =================================================================== --- units/promo_blocks/promo_blocks_config.php (revision 15359) +++ units/promo_blocks/promo_blocks_config.php (working copy) @@ -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), ), ), ),

Issue History
Date Modified	Username	Field	Change
2012-07-25 05:30	alex	Note Added: 0004878
2012-07-25 05:30	alex	Status	resolved => closed
2012-05-30 05:32	alex	Note Added: 0004688
2012-05-30 05:32	alex	Status	reviewed and tested => resolved
2012-05-30 05:32	alex	Fixed in Version	=> 5.2.0-RC1
2012-05-30 05:32	alex	Resolution	open => fixed
2012-05-30 05:32	alex	Assigned To	!COMMUNITY => alex
2012-05-30 05:32	alex	Changeset attached	5.2.x r15373
2012-05-30 05:31	alex	Note Added: 0004687
2012-05-30 05:31	alex	Note Added: 0004686
2012-05-30 05:31	alex	Status	needs testing => reviewed and tested
2012-05-30 05:31	alex	Assigned To	=> !COMMUNITY
2012-05-30 05:31	alex	Developer	=> alex
2012-05-30 05:31	alex	Status	active => needs testing
2012-05-30 05:30	alex	File Added: promo_block_tuning.patch
2012-05-30 05:30	alex	Estimate Points	0 => 1
2012-05-17 17:59	Dmitry	Relationship added	child of 0001128
2012-05-17 17:58	Dmitry	New Issue
2012-05-17 17:58	Dmitry	Reference	=> https://groups.google.com/d/topic/in-portal-dev/huW9qzBVQiI/discussion
2012-05-17 17:58	Dmitry	Change Log Message	=> minor improvements to Promo Blocks
2012-05-17 17:58	Dmitry	Estimate Points	=> 0

Notes
(0004686) alex (manager) 2012-05-30 05:31	Will test all together later.

(0004687) alex (manager) 2012-05-30 05:31	Done additionally: 1. formatted javascript in promo block listing template 2. field CSSClassName hidden since no way to affect it's values 3. added status icon next to checkbox in promo block list 4. set width of columns in promo block list based on their content 5. added language dropdown in promo block list to see promo blocks on different languages 6. promo block image made non-required on non-primary language

(0004688) alex (manager) 2012-05-30 05:32	Fix committed to 5.2.x branch. Commit Message: Fixes 0001290: Minor Improvements to Promo Blocks

(0004878) alex (manager) 2012-07-25 05:30	Since 5.2.0/1.2.0 versions was released.

Related Changesets
In-Portal CMS: 5.2.x r15373 Timestamp: 2012-05-30 05:32:20 Author: alex [ Details ] [ Diff ]	Fixes 0001290: Minor Improvements to Promo Blocks
	mod - /in-portal/branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/admin_templates/promo_blocks/promo_block_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/install/install_schema.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/install/upgrades.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/units/promo_blocks/promo_block_eh.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/units/promo_blocks/promo_blocks_config.php	[ Diff ] [ File ]

In-Portal Issue Tracker