Index: branches/5.2.x/admin_templates/links/review_edit.tpl =================================================================== diff -u -r14254 -r14570 --- branches/5.2.x/admin_templates/links/review_edit.tpl (.../review_edit.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/links/review_edit.tpl (.../review_edit.tpl) (revision 14570) @@ -17,6 +17,18 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('l-rev', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('l-rev', ''); + } + )); + a_toolbar.Render(); Index: branches/5.2.x/admin_templates/links/images_edit.tpl =================================================================== diff -u -r14254 -r14570 --- branches/5.2.x/admin_templates/links/images_edit.tpl (.../images_edit.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/links/images_edit.tpl (.../images_edit.tpl) (revision 14570) @@ -19,7 +19,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('l-img', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('l-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 -r14254 -r14570 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14254) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14570) @@ -115,4 +115,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/admin_templates/duplicate_checker.tpl =================================================================== diff -u -r14254 -r14570 --- branches/5.2.x/admin_templates/duplicate_checker.tpl (.../duplicate_checker.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/duplicate_checker.tpl (.../duplicate_checker.tpl) (revision 14570) @@ -15,7 +15,7 @@ open_popup('l.duplicates', 'OnStoreSelected', 'in-link/duplicate_checker/duplicate_link_view'); } - a_toolbar.AddButton( new ToolBarButton('edit', '::', edit) ); + a_toolbar.AddButton( new ToolBarButton('edit', '::', edit) ); a_toolbar.AddButton( new ToolBarSeparator('sep1') ); Index: branches/5.2.x/admin_templates/links/relations_edit.tpl =================================================================== diff -u -r14254 -r14570 --- branches/5.2.x/admin_templates/links/relations_edit.tpl (.../relations_edit.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/links/relations_edit.tpl (.../relations_edit.tpl) (revision 14570) @@ -17,7 +17,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('l-rel', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('l-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 -r14254 -r14570 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14254) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14570) @@ -113,18 +113,18 @@ INSERT INTO ItemTypes VALUES (4, 'In-Link', 'l', 'Link', 'Name', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_Links', 1, 'in-link/admin/addlink.php', 'clsLink', 'Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'la_PermName_Link.Add_desc', 'la_PermName_Link.Add_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'la_PermName_Link.View_desc', 'la_PermName_Link.View_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'la_PermName_Link.Add.Pending_desc', 'la_PermName_Link.Add.Pending_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'la_PermName_Link.Modify_desc', 'la_PermName_Link.Modify_desc', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'la_PermName_Link.Delete_desc', 'la_PermName_Link.Delete_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'la_PermName_Link.Rate_desc', 'la_PermName_Link.Rate_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'la_PermName_Link.Review_desc', 'la_PermName_Link.Review_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'la_PermName_Link.Review_Pending_desc', ' la_PermName_Link.Review_Pending_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'la_PermName_Link.Modify.Pending_desc', 'la_PermName_Link.Modify.Pending_desc', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'la_PermName_Link.Owner.Modify_desc', 'la_PermName_Link.Owner.Modify_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'la_PermName_Link.Owner.Modify.Pending_desc', 'la_PermName_Link.Owner.Modify.Pending_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'la_PermName_Link.Owner.Delete_desc', 'la_PermName_Link.Owner.Delete_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'la_PermName_Link.Add_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'la_PermName_Link.View_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'la_PermName_Link.Add.Pending_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'la_PermName_Link.Modify_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'la_PermName_Link.Delete_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'la_PermName_Link.Rate_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'la_PermName_Link.Review_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'la_PermName_Link.Review_Pending_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'la_PermName_Link.Modify.Pending_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'la_PermName_Link.Owner.Modify_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'la_PermName_Link.Owner.Modify.Pending_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'la_PermName_Link.Owner.Delete_desc', 'In-Link'); INSERT INTO SearchConfig VALUES ('Link', 'OrgId', 0, 0, 'lu_fielddesc_link_orgid', 'lu_field_orgid', 'In-Link', 'la_text_link', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO SearchConfig VALUES ('Link', 'NewItem', 0, 1, 'lu_fielddesc_link_newitem', 'lu_field_newitem', 'In-Link', 'la_text_link', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); Index: branches/5.2.x/admin_templates/links/file_edit.tpl =================================================================== diff -u -r14254 -r14570 --- branches/5.2.x/admin_templates/links/file_edit.tpl (.../file_edit.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/links/file_edit.tpl (.../file_edit.tpl) (revision 14570) @@ -17,7 +17,32 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { + go_to_id('l-file', ''); + } + )); + + a_toolbar.AddButton( new ToolBarButton('next', '', function() { + go_to_id('l-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 -r14254 -r14570 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14254) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14570) @@ -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/units/links/links_config.php =================================================================== diff -u -r14254 -r14570 --- branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 14254) +++ branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 14570) @@ -1,6 +1,6 @@ Array ('l-img' => '!la_title_Editing_Image!'), 'new_titlefield' => Array ('l-img' => '!la_title_New_Image!'), 'format' => "#l_status# '#l_titlefield#' - #l-img_status# '#l-img_titlefield#'", - 'toolbar_buttons' => Array ('select', 'cancel'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), ), 'file_edit' => Array ( @@ -236,23 +236,23 @@ 'edit_status_labels' => Array ('l-file' => '!la_title_EditingFile!'), 'new_titlefield' => Array ('l-file' => '!la_title_NewFile!'), 'format' => "#l_status# '#l_titlefield#' - #l-file_status# '#l-file_titlefield#'", - 'toolbar_buttons' => Array ('select', 'cancel'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), ), 'reviews_edit' => Array ( 'prefixes' => Array ('l', 'l-rev'), 'new_status_labels' => Array ('l-rev' =>"!la_title_Adding_Review! '!la_title_New_Review!'"), 'edit_status_labels' => Array ('l-rev' => '!la_title_Editing_Review!'), 'format' => "#l_status# '#l_titlefield#' - #l-rev_status#", - 'toolbar_buttons' => Array ('select', 'cancel'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), ), 'relations_edit' => Array ( 'prefixes' => Array ('l', 'l-rel'), 'new_status_labels' => Array ('l-rel' =>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"), 'edit_status_labels' => Array ('l-rel' => '!la_title_Editing_Relationship!'), 'format' => "#l_status# '#l_titlefield#' - #l-rel_status#", - 'toolbar_buttons' => Array ('select', 'cancel'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), ), 'links_export' => Array ('format' => '!la_title_LinksExport!'), @@ -436,7 +436,7 @@ 'ListSortings' => Array ( '' => Array ( - 'ForcedSorting' => Array ('Priority' => 'desc'), + 'ForcedSorting' => Array ('EditorsPick' => 'desc', 'Priority' => 'desc'), 'Sorting' => Array ('Name' => 'asc', 'Description' => 'desc'), ) ), @@ -463,7 +463,17 @@ 'CachedRating' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0), 'CachedVotesQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'not_null' => 1, 'default' => 0), 'CachedReviewsQty' => 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, + ), 'ModifiedById' => 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', 'default' => NULL), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( @@ -570,6 +580,7 @@ 'Fields' => Array ( 'LinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'Name' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ), + 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), 'Url' => Array ('title' => 'la_col_LinkUrl', 'width' => 200, ), 'Description' => Array ('title' => 'la_col_Description', 'first_chars' => 100, 'width' => 100, ), 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), @@ -593,6 +604,7 @@ 'Fields' => Array ( 'LinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'Name' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ), + 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), 'Url' => Array ('title' => 'la_col_LinkUrl', 'width' => 200, ), 'Description' => Array ('title' => 'la_col_Description', 'first_chars' => 100, 'width' => 100, ), 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),