Index: branches/5.2.x/admin_templates/articles/relations_edit.tpl =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/admin_templates/articles/relations_edit.tpl (.../relations_edit.tpl) (revision 14256) +++ branches/5.2.x/admin_templates/articles/relations_edit.tpl (.../relations_edit.tpl) (revision 14571) @@ -17,7 +17,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('n-rel', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('n-rel', ''); + } + )); + a_toolbar.Render(); + + + a_toolbar.HideButton('prev'); + a_toolbar.HideButton('next'); + a_toolbar.HideButton('sep1'); + + + a_toolbar.DisableButton('next'); + + + a_toolbar.DisableButton('prev'); + + Index: branches/5.2.x/install/english.lang =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 14256) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14571) @@ -84,6 +84,7 @@ QXJ0aWNsZXM= QWRkaW5nIEFydGljbGU= QXJ0aWNsZXM= + QXJ0aWNsZXMgRXhwb3J0 RWRpdGluZyBBcnRpY2xl SW1wb3J0IEFydGljbGVz TmV3cw== Index: branches/5.2.x/install/install_data.sql =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14256) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14571) @@ -60,18 +60,18 @@ INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'la_PermName_News.Add_desc', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'la_PermName_News.View_desc', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'la_PermName_News.Add.Pending_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'la_PermName_News.Modify_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'la_PermName_News.Delete_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'la_PermName_News.Rate_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'la_PermName_News.Review_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'la_PermName_News.Review.Pending_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'la_PermName_News.Modify.Pending_desc', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'la_PermName_News.Owner.Modify_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'la_PermName_News.Owner.Modify.Pending_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'la_PermName_News.Owner.Delete_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'In-News'); INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); Index: branches/5.2.x/admin_templates/articles/file_edit.tpl =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/admin_templates/articles/file_edit.tpl (.../file_edit.tpl) (revision 14256) +++ branches/5.2.x/admin_templates/articles/file_edit.tpl (.../file_edit.tpl) (revision 14571) @@ -17,7 +17,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('n-file', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('n-file', ''); + } + )); + a_toolbar.Render(); + + + a_toolbar.HideButton('prev'); + a_toolbar.HideButton('next'); + a_toolbar.HideButton('sep1'); + + + a_toolbar.DisableButton('next'); + + + a_toolbar.DisableButton('prev'); + + Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14256) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14571) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.1-B1'), '5.1.1-RC1' => Array ('Core' => '5.1.1-RC1'), '5.1.1' => Array ('Core' => '5.1.1'), + '5.1.2-B1' => Array ('Core' => '5.1.2-B1'), + '5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'), + '5.1.2' => Array ('Core' => '5.1.2'), ); } Index: branches/5.2.x/admin_templates/articles/review_edit.tpl =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/admin_templates/articles/review_edit.tpl (.../review_edit.tpl) (revision 14256) +++ branches/5.2.x/admin_templates/articles/review_edit.tpl (.../review_edit.tpl) (revision 14571) @@ -17,6 +17,18 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('n-rev', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('n-rev', ''); + } + )); + a_toolbar.Render(); Index: branches/5.2.x/admin_templates/articles/images_edit.tpl =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/admin_templates/articles/images_edit.tpl (.../images_edit.tpl) (revision 14256) +++ branches/5.2.x/admin_templates/articles/images_edit.tpl (.../images_edit.tpl) (revision 14571) @@ -19,7 +19,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('n-img', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('n-img', ''); + } + )); + a_toolbar.Render(); + + + a_toolbar.HideButton('prev'); + a_toolbar.HideButton('next'); + a_toolbar.HideButton('sep1'); + + + a_toolbar.DisableButton('next'); + + + a_toolbar.DisableButton('prev'); + + Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14256) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14571) @@ -99,4 +99,10 @@ # ===== v 5.1.1-RC1 ===== -# ===== v 5.1.1 ===== \ No newline at end of file +# ===== v 5.1.1 ===== + +# ===== v 5.1.2-B1 ===== + +# ===== v 5.1.2-RC1 ===== + +# ===== v 5.1.2 ===== \ No newline at end of file Index: branches/5.2.x/units/articles/articles_config.php =================================================================== diff -u -r14256 -r14571 --- branches/5.2.x/units/articles/articles_config.php (.../articles_config.php) (revision 14256) +++ branches/5.2.x/units/articles/articles_config.php (.../articles_config.php) (revision 14571) @@ -1,6 +1,6 @@ Array ( '' => Array ( - 'ForcedSorting' => Array ('Priority' => 'desc'), + 'ForcedSorting' => Array ('EditorsPick' => 'desc', 'Priority' => 'desc'), 'Sorting' => Array ('Title' => 'asc'), ) ), @@ -395,7 +395,17 @@ 'Hits' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), 'CachedRating' => Array ('type' => 'string', 'default' => 0), 'CachedVotesQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' => 1, 'default' => NULL), + 'CreatedById' => Array ( + 'type' => 'int', + 'formatter' => 'kLEFTFormatter', + 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), + 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser + WHERE `%s` = \'%s\'', + 'left_key_field' => 'PortalUserId', + 'left_title_field' => 'Login', + 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), + 'sample_value' => 'Guest', 'required' => 1, 'default' => NULL, + ), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( 'type' => 'int', @@ -509,10 +519,12 @@ '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, ), ), @@ -532,10 +544,12 @@ '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, ), ),