Index: branches/5.2.x/units/topics/topics_config.php =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/units/topics/topics_config.php (.../topics_config.php) (revision 14252) +++ branches/5.2.x/units/topics/topics_config.php (.../topics_config.php) (revision 14568) @@ -1,6 +1,6 @@ Array ( '' => Array ( - 'ForcedSorting' => Array ('Priority' => 'desc'), + 'ForcedSorting' => Array ('EditorsPick' => 'desc', 'Priority' => 'desc'), 'Sorting' => Array ('TopicText' => 'asc'), ) ), @@ -390,7 +390,7 @@ 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), - 'required' => 1, 'default' => NULL, + 'sample_value' => 'Guest', 'required' => 1, 'default' => NULL, ), 'ModifiedById' => Array ( 'type' => 'int', @@ -517,6 +517,7 @@ 'Fields' => Array ( 'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ), + 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), 'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), @@ -537,6 +538,7 @@ 'Fields' => Array ( 'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ), + 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), 'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), Index: branches/5.2.x/admin_templates/topics/review_edit.tpl =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/admin_templates/topics/review_edit.tpl (.../review_edit.tpl) (revision 14252) +++ branches/5.2.x/admin_templates/topics/review_edit.tpl (.../review_edit.tpl) (revision 14568) @@ -17,6 +17,18 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('bb-rev', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('bb-rev', ''); + } + )); + a_toolbar.Render(); Index: branches/5.2.x/admin_templates/topics/images_edit.tpl =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/admin_templates/topics/images_edit.tpl (.../images_edit.tpl) (revision 14252) +++ branches/5.2.x/admin_templates/topics/images_edit.tpl (.../images_edit.tpl) (revision 14568) @@ -19,7 +19,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('bb-img', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('bb-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/english.lang =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 14252) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14568) @@ -107,6 +107,7 @@ RWRpdGluZyBDb21tZW50 RWRpdGluZyBQb2xs VG9waWNz + TmV3IENvbW1lbnQ= TmV3IFBvbGw= TmV3IFRvcGlj TmV3IEFuc3dlcg== Index: branches/5.2.x/admin_templates/topics/relations_edit.tpl =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/admin_templates/topics/relations_edit.tpl (.../relations_edit.tpl) (revision 14252) +++ branches/5.2.x/admin_templates/topics/relations_edit.tpl (.../relations_edit.tpl) (revision 14568) @@ -17,7 +17,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('bb-rel', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('bb-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/install_data.sql =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14252) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14568) @@ -83,24 +83,24 @@ INSERT INTO ItemTypes VALUES (3, 'In-Bulletin', 'bb', 'Topic', 'TopicText', 'OwnerId', 'Views', 'CachedRating', 'la_ItemTab_Topics', 1, '', 'clsTopic', 'Topic'); INSERT INTO ItemTypes VALUES (30, 'In-Bulletin', 'posting', 'Posting', 'Subject', 'CreatedById', NULL, NULL, 'la_ItemTab_Posts', 0, '', '', 'Post'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'la_PermName_Topic.View_desc', 'la_PermName_Topic.View_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'la_PermName_Topic.Add_desc', 'la_PermName_Topic.Add_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'la_PermName_Topic.Add.Pending_desc', 'la_PermName_Topic.Add.Pending_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'la_PermName_Topic.Delete_desc', 'la_PermName_Topic.Delete_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'la_PermName_Topic.Modify_desc', 'la_PermName_Topic.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'la_PermName_Topic.Reply.Delete_desc', 'la_PermName_Topic.Reply.Delete_desc', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'la_PermName_Topic.Reply.View_desc', 'la_PermName_Topic.Reply.View_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'la_PermName_Topic.Reply.Add_desc', 'la_PermName_Topic.Reply.Add_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'la_PermName_Topic.Reply.Modify_desc', 'la_PermName_Topic.Reply.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'la_PermName_Topic.Rate_desc', 'la_PermName_Topic.Rate_desc', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'la_PermName_Topic.Review_desc', 'la_PermName_Topic.Review_desc', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'la_PermName_Topic.Reply.Owner.Modify_desc', 'la_PermName_Topic.Reply.Owner.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'la_PermName_Topic.Reply.Owner.Delete_desc', 'la_PermName_Topic.Reply.Owner.Delete_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'la_PermName_Topic.Owner.Delete_desc', 'la_PermName_Topic.Owner.Delete_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'la_PermName_Topic.Modify.Pending_desc', 'la_PermName_Topic.Modify.Pending_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'la_PermName_Topic.Owner.Modify.Pending_desc', 'la_PermName_Topic.Owner.Modify.Pending_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'la_PermName_Topic.Owner.Modify_desc', 'la_PermName_Topic.Owner.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'la_PermName_Topic.Lock_desc', 'la_PermName_Topic.Lock_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'la_PermName_Topic.View_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'la_PermName_Topic.Add_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'la_PermName_Topic.Add.Pending_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'la_PermName_Topic.Delete_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'la_PermName_Topic.Modify_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'la_PermName_Topic.Reply.Delete_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'la_PermName_Topic.Reply.View_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'la_PermName_Topic.Reply.Add_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'la_PermName_Topic.Reply.Modify_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'la_PermName_Topic.Rate_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'la_PermName_Topic.Review_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'la_PermName_Topic.Reply.Owner.Modify_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'la_PermName_Topic.Reply.Owner.Delete_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'la_PermName_Topic.Owner.Delete_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'la_PermName_Topic.Modify.Pending_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'la_PermName_Topic.Owner.Modify.Pending_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'la_PermName_Topic.Owner.Modify_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'la_PermName_Topic.Lock_desc', 'In-Bulletin'); INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT count(*) FROM <%prefix%>Topic WHERE Status=1', NULL, 'la_prompt_ActiveTopics', 0, 1); INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT COUNT(*) AS TotalTopics FROM <%prefix%>Topic', NULL, 'la_prompt_TopicsTotal', 0, 2); Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14252) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14568) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.1-B2'), '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/install/upgrades.sql =================================================================== diff -u -N -r14252 -r14568 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14252) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14568) @@ -214,4 +214,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