Index: branches/5.0.x/admin/system_presets/simple/ban_rules_ban-rule.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/ban_rules_ban-rule.php (.../ban_rules_ban-rule.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/ban_rules_ban-rule.php (.../ban_rules_ban-rule.php) (revision 12494) @@ -15,7 +15,7 @@ // toolbar buttons $remove_buttons = Array ( // list of all email templates (direct list) -// 'ban_rule_list' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), +// 'ban_rule_list' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), // edit email body direct // 'ban_rule_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), Index: branches/5.0.x/admin/system_presets/simple/languages_lang.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/languages_lang.php (.../languages_lang.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/languages_lang.php (.../languages_lang.php) (revision 12494) @@ -12,9 +12,16 @@ 'in-portal:configure_lang', ); + // toolbar buttons + $remove_buttons = Array ( + 'languages_list' => Array ('new_item', 'edit', 'delete', 'export', 'import', 'setprimary', 'refresh', 'view', 'dbl-click'), + ); + + + Index: branches/5.0.x/admin/system_presets/simple/users_u.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/users_u.php (.../users_u.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/users_u.php (.../users_u.php) (revision 12494) @@ -34,7 +34,7 @@ // 'user_edit_images' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), // "Groups" tab during user/admin adding/editing -// 'user_edit_groups' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'edit', 'delete', 'primary_group', 'view', 'dbl-click'), +// 'user_edit_groups' => Array ('select', 'cancel', 'prev', 'next', 'selec_user', 'edit', 'delete', 'primary_group', 'view', 'dbl-click'), // "Items" tab during user/admin adding/editing // 'user_edit_items' => Array ('select', 'cancel', 'prev', 'next', 'edit', 'delete', 'view', 'dbl-click'), Index: branches/5.0.x/admin/system_presets/simple/themes_theme.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/themes_theme.php (.../themes_theme.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/themes_theme.php (.../themes_theme.php) (revision 12494) @@ -15,7 +15,7 @@ // toolbar buttons $remove_buttons = Array ( // list of themes; -// 'themes_list' => Array ('new_theme', 'edit', 'delete', 'primary_theme', 'rescan_themes', 'view', 'dbl-click'), +// 'themes_list' => Array ('new_item', 'edit', 'delete', 'setprimary', 'refresh', 'view', 'dbl-click'), // "General" tab during adding/editing // 'themes_edit_general' => Array ('select', 'cancel', 'prev', 'next'), Index: branches/5.0.x/admin/system_presets/simple/forms_form.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/forms_form.php (.../forms_form.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/forms_form.php (.../forms_form.php) (revision 12494) @@ -15,7 +15,7 @@ // toolbar buttons $remove_buttons = Array ( // list of forms -// 'forms_list' => Array ('new_form', 'edit', 'delete', 'view', 'dbl-click'), +// 'forms_list' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), // editing form // 'forms_edit' => Array ('select', 'cancel', 'prev', 'next'), Index: branches/5.0.x/admin/system_presets/simple/visits_visits.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/visits_visits.php (.../visits_visits.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/visits_visits.php (.../visits_visits.php) (revision 12494) @@ -15,10 +15,10 @@ // toolbar buttons $remove_buttons = Array ( // list of visits; section: Visits -// 'visits_list' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + 'visits_list' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'), // list of visits when In-Commerce installed; section: Visits - 'visits.incommerce_list' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + 'visits.incommerce_list' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'), ); // fields to hide Index: branches/5.0.x/admin/system_presets/simple/skins_skin.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/skins_skin.php (.../skins_skin.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/skins_skin.php (.../skins_skin.php) (revision 12494) @@ -15,7 +15,7 @@ // toolbar buttons $remove_buttons = Array ( // list of skins; -// 'skin_list' => Array ('new_item', 'edit', 'delete', 'primary_theme', 'clone', 'view', 'dbl-click'), +// 'skin_list' => Array ('new_item', 'edit', 'delete', 'setprimary', 'clone', 'view', 'dbl-click'), // General" tab during adding/editing // 'skin_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), Index: branches/5.0.x/admin/system_presets/simple/search_logs_search-log.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/search_logs_search-log.php (.../search_logs_search-log.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/search_logs_search-log.php (.../search_logs_search-log.php) (revision 12494) @@ -15,7 +15,7 @@ // toolbar buttons $remove_buttons = Array ( // list of sessions -// 'search_log_list' => Array ('refresh', 'clear_selected', 'reset', 'export', 'view', 'dbl-click'), +// 'search_log_list' => Array ('refresh', 'delete', 'reset', 'export', 'view', 'dbl-click'), ); // fields to hide Index: branches/5.0.x/admin/system_presets/simple/images_img.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/images_img.php (.../images_img.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/images_img.php (.../images_img.php) (revision 12494) @@ -29,7 +29,7 @@ // fields to make required $required_fields = Array ( - /* 'ImageId', */ 'Name', 'AltName', /* 'Url', 'ImageIndex', 'LocalImage', 'LocalPath', 'Enabled', 'Priority', 'DefaultImg', 'ThumbUrl', 'LocalThumb', 'SameImages', */ + /* 'ImageId', */ 'Name', /*'AltName', 'Url', 'ImageIndex', 'LocalImage', 'LocalPath', 'Enabled', 'Priority', 'DefaultImg', 'ThumbUrl', 'LocalThumb', 'SameImages', */ ); // virtual fields to make required Index: branches/5.0.x/admin/system_presets/simple/groups_g.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/groups_g.php (.../groups_g.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/groups_g.php (.../groups_g.php) (revision 12494) @@ -15,13 +15,13 @@ // toolbar buttons $remove_buttons = Array ( // "Select Group" on Groups tab when adding/editing User -// 'group_list' => Array ('new_group', 'edit', 'delete', 'e-mail', 'view', 'dbl-click'), +// 'group_list' => Array ('new_item', 'edit', 'delete', 'e-mail', 'view', 'dbl-click'), // "Select Group" on Groups tab when adding/editing User // 'groups_edit' => Array ('select', 'cancel', 'prev', 'next'), // edit users when adding/editing group -// 'groups_edit_users' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'delete', 'view'), +// 'groups_edit_users' => Array ('select', 'cancel', 'prev', 'next', 'select_user', 'delete', 'view'), // edit permission on permissions tab when adding/editing group // 'groups_edit_permissions' => Array ('select', 'cancel', 'prev', 'next'), Index: branches/5.0.x/admin/system_presets/simple/links_l.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/links_l.php (.../links_l.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/links_l.php (.../links_l.php) (revision 12494) @@ -65,7 +65,7 @@ // 'relations_edit' => Array ('select', 'cancel'), // duplicate links -// 'duplicate_links' => Array ('view_item', 'view', 'dbl-click'), +// 'duplicate_links' => Array ('edit', 'view', 'dbl-click'), // duplicate links -> view duplicates of the link // 'duplicate_links_view' => Array ('cancel', 'edit', 'delete', 'merge_links', 'view', 'dbl-click'), Index: branches/5.0.x/admin/system_presets/simple/categories_c.php =================================================================== diff -u -r12329 -r12494 --- branches/5.0.x/admin/system_presets/simple/categories_c.php (.../categories_c.php) (revision 12329) +++ branches/5.0.x/admin/system_presets/simple/categories_c.php (.../categories_c.php) (revision 12494) @@ -20,9 +20,9 @@ // toolbar buttons $remove_buttons = Array ( - 'catalog' => Array (/*'select', 'cancel', 'upcat', 'homecat', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_item', 'edit', 'delete',*/ 'approve', 'decline', /*'cut', 'copy', 'paste', 'move_up', 'move_down',*/ 'rebuild_cache', /*'view', 'dbl-click',*/ ), + 'catalog' => Array (/*'select', 'cancel', 'upcat', 'homecat', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_product', 'edit', 'delete',*/ 'approve', 'decline', /*'cut', 'copy', 'paste', 'move_up', 'move_down',*/ 'tools', /*'view', 'dbl-click',*/ ), - 'advanced_view' => Array (/*'select', 'cancel', 'new_cat', 'edit', 'delete',*/ 'approve', 'decline', /*'view', 'dbl-click' */), + 'advanced_view' => Array (/*'select', 'cancel', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_product', 'edit', 'delete',*/ 'approve', 'decline', /*'view', 'dbl-click' */), // 'categories_relations' => Array ('select', 'cancel', 'prev', 'next', 'new_relation', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), // 'categories_propertiries' => Array ('select', 'cancel', 'prev', 'next'),