Index: branches/5.2.x/install/english.lang =================================================================== diff -u -N -r14571 -r14584 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 14571) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14584) @@ -1,4 +1,4 @@ - + QXV0aG9y @@ -7,18 +7,13 @@ SGl0cw== UmF0aW5n QXJ0aWNsZSBUaXRsZQ== - QXV0aG9y - QXJjaGl2YXRpb24gRGF0ZQ== - U2VjdGlvbiBMZWFk - U2l0ZSBMZWFk - U3RhcnQgRGF0ZQ== - QXV0aG9y + QXV0aG9y QXJ0aWNsZSBCb2R5 TmV3cyBJdGVtIFRlbXBsYXRl - QXJjaGl2YXRpb24gRGF0ZQ== + QXJjaGl2YXRpb24gRGF0ZQ== QXJ0aWNsZSBFeGNlcnB0 - U2VjdGlvbiBMZWFkIFN0b3J5 - U2l0ZSBMZWFkIFN0b3J5 + U2VjdGlvbiBMZWFkIFN0b3J5 + U2l0ZSBMZWFkIFN0b3J5 TWF4aW11bSBudW1iZXIgb2YgSE9UIGFydGljbGVz TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A= TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A= @@ -34,7 +29,6 @@ U291cmNlIFVSTA== VXBkYXRlIEludGVydmFs VXBkYXRlIEludGVydmFsIFR5cGU= - U3RhcnQgRGF0ZQ== SW4tTmV3cw== QXJ0aWNsZXM= TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5 Index: branches/5.2.x/install/install_data.sql =================================================================== diff -u -N -r14571 -r14584 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14571) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14584) @@ -25,7 +25,7 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_NewsReviews_Short', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.03, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_NewsReviews', '10', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_CategoryTemplate', '/in-news/designs/section', 'In-News', 'in-news:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_ItemTemplate', 'in-news/designs/detail', 'In-News', 'in-news:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_ItemTemplate', 'in-news/articles/article_detail', 'In-News', 'in-news:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_MaxImageCount', '5', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 40.01, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_ThumbnailImageWidth', '120', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 40.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_ThumbnailImageHeight', '120', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 40.03, 0, 0, NULL); @@ -183,4 +183,4 @@ INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1'); -INSERT INTO Modules VALUES ('In-News', 'modules/in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL); \ No newline at end of file +INSERT INTO Modules VALUES ('In-News', 'modules/in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL, NULL); \ No newline at end of file Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -N -r14571 -r14584 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14571) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14584) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.2-B1'), '5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'), '5.1.2' => Array ('Core' => '5.1.2'), + '5.1.3-B1' => Array ('Core' => '5.1.3-B2'), + '5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'), + '5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'), + '5.1.3' => Array ('Core' => '5.1.3'), ); } Index: branches/5.2.x/admin_templates/articles/articles_custom.tpl =================================================================== diff -u -N -r14256 -r14584 --- branches/5.2.x/admin_templates/articles/articles_custom.tpl (.../articles_custom.tpl) (revision 14256) +++ branches/5.2.x/admin_templates/articles/articles_custom.tpl (.../articles_custom.tpl) (revision 14584) @@ -1,7 +1,7 @@ - + @@ -49,14 +49,24 @@ - +
+ + + - +
+ + + + +
+
+ \ No newline at end of file Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -N -r14571 -r14584 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14571) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14584) @@ -105,4 +105,18 @@ # ===== v 5.1.2-RC1 ===== -# ===== v 5.1.2 ===== \ No newline at end of file +# ===== v 5.1.2 ===== + +# ===== v 5.1.3-B1 ===== + +# ===== v 5.1.3-RC1 ===== +UPDATE ConfigurationValues +SET VariableValue = 'in-news/articles/article_detail' +WHERE VariableName = 'n_ItemTemplate' AND VariableValue = 'in-news/designs/detail'; + +# ===== v 5.1.3-RC2 ===== + +# ===== v 5.1.3 ===== +UPDATE Phrase +SET `Module` = 'Core' +WHERE PhraseKey = 'LA_FLD_STARTDATE'; \ No newline at end of file Index: branches/5.2.x/admin_templates/catalog_tab.tpl =================================================================== diff -u -N -r14256 -r14584 --- branches/5.2.x/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 14256) +++ branches/5.2.x/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 14584) @@ -47,7 +47,8 @@ Grids[''].AddAlternativeGrid('', true); Grids[''].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6')); - $Catalog.reflectPasteButton(); + + $Catalog.setViewMenu(''); Grids[''].DblClick = function() {return false}; Index: branches/5.2.x/units/articles/articles_config.php =================================================================== diff -u -N -r14571 -r14584 --- branches/5.2.x/units/articles/articles_config.php (.../articles_config.php) (revision 14571) +++ branches/5.2.x/units/articles/articles_config.php (.../articles_config.php) (revision 14584) @@ -1,6 +1,6 @@ Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedById' => Array ( 'type' => 'int', - 'formatter' => 'kLEFTFormatter', + 'formatter' => 'kLEFTFormatter', 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), - 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser + 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', @@ -517,16 +517,16 @@ ), 'Fields' => Array ( - 'NewsId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), - 'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'LeadStory' => Array ('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ), - 'LeadCatStory' => Array ('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'EndOn' => Array ('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'NewsId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Title' => Array ('data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65), + 'UserName' => Array ('title' => 'column:la_fld_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'LeadStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ), + 'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), ), ), @@ -542,16 +542,16 @@ 'Selector' => 'radio', 'Fields' => Array ( - 'NewsId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), - 'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'LeadStory' => Array ('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ), - 'LeadCatStory' => Array ('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'EndOn' => Array ('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'NewsId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Title' => Array ('data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65), + 'UserName' => Array ('title' => 'column:la_fld_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'LeadStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ), + 'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), ), ), ),