Index: branches/5.1.x/core/admin_templates/regional/languages_list.tpl =================================================================== diff -u -r12657 -r13941 --- branches/5.1.x/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 12657) +++ branches/5.1.x/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 13941) @@ -66,7 +66,7 @@ - + Index: branches/5.1.x/core/admin_templates/users/admins_list.tpl =================================================================== diff -u -r13545 -r13941 --- branches/5.1.x/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 13545) +++ branches/5.1.x/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 13941) @@ -61,7 +61,7 @@ - + Index: branches/5.1.x/core/admin_templates/user_selector.tpl =================================================================== diff -u -r13086 -r13941 --- branches/5.1.x/core/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 13086) +++ branches/5.1.x/core/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 13941) @@ -53,7 +53,7 @@ - + Index: branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -r13867 -r13941 --- branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 13867) +++ branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 13941) @@ -39,20 +39,7 @@ $Menus[''+'_filter_menu'].addSeparator(); - - - // sorting menu - $Menus[''+'_sorting_menu'] = menuMgr.createMenu(rs('.sorting.menu')); - $Menus[''+'_sorting_menu'].applyBorder(false, false, false, false); - $Menus[''+'_sorting_menu'].dropShadow("none"); - $Menus[''+'_sorting_menu'].showIcon = true; - $Menus[''+'_sorting_menu'].addItem(rs('.sort.asc'), '','javascript:direct_sort_grid("","","asc",null,);',['img/menu_dot.gif']); - $Menus[''+'_sorting_menu'].addItem(rs('.sort.desc'), '','javascript:direct_sort_grid("","","desc",null,);',['img/menu_dot.gif']); - $Menus[''+'_sorting_menu'].addSeparator(); - $Menus[''+'_sorting_menu'].addItem(rs('.sort.def'), '','javascript:reset_sorting("", );'); - - - + // per page menu $Menus[''+'_perpage_menu'] = menuMgr.createMenu(rs('.perpage.menu')); @@ -66,17 +53,6 @@ $Menus[''+'_perpage_menu'].addItem(rs('.perpage.500'), '500','javascript:set_per_page("",500,);',['img/check_on.gif']); - - // select menu - $Menus[''+'_select_menu'] = menuMgr.createMenu(rs('.select.menu')); - $Menus[''+'_select_menu'].applyBorder(false, false, false, false); - $Menus[''+'_select_menu'].dropShadow("none"); - $Menus[''+'_select_menu'].showIcon = true; - $Menus[''+'_select_menu'].addItem(rs('.select.all'), '','javascript:Grids[""].SelectAll();'); - $Menus[''+'_select_menu'].addItem(rs('.unselect'), '','javascript:Grids[""].ClearSelection();'); - $Menus[''+'_select_menu'].addItem(rs('.invert'), '','javascript:Grids[""].InvertSelection();'); - - $Menus[''+'_view_menu'] = menuMgr.createMenu(rs(''+'_view_menu')); $Menus[''+'_view_menu'].applyBorder(false, false, false, false); $Menus[''+'_view_menu'].dropShadow("none"); @@ -97,16 +73,11 @@ $Menus[''+'_view_menu'].addItem(rs('.filters'), '', 'javascript:void()', null, true, null, rs('.filter.menu'), null); - - $Menus[''+'_view_menu'].addItem(rs('.sorting'), '', 'javascript:void()', null, true, null, rs('.sorting.menu'), null); - + $Menus[''+'_view_menu'].addItem(rs('.perpage'), '', 'javascript:void()', null, true, null, rs('.perpage.menu'), null); - - $Menus[''+'_view_menu'].addItem(rs('.select'), '', 'javascript:void()', null, true, null, rs('.select.menu'), null); - - + $MenuNames[''+'_view_menu'] = ''; Application.processHooks(':OnCreateViewMenu'); Index: branches/5.1.x/core/admin_templates/themes/themes_list.tpl =================================================================== diff -u -r12657 -r13941 --- branches/5.1.x/core/admin_templates/themes/themes_list.tpl (.../themes_list.tpl) (revision 12657) +++ branches/5.1.x/core/admin_templates/themes/themes_list.tpl (.../themes_list.tpl) (revision 13941) @@ -54,7 +54,7 @@ - + Index: branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl =================================================================== diff -u -r12657 -r13941 --- branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl (.../categories_edit_relations.tpl) (revision 12657) +++ branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl (.../categories_edit_relations.tpl) (revision 13941) @@ -94,7 +94,7 @@ - + Index: branches/5.1.x/core/units/related_searches/related_searches_config.php =================================================================== diff -u -r13545 -r13941 --- branches/5.1.x/core/units/related_searches/related_searches_config.php (.../related_searches_config.php) (revision 13545) +++ branches/5.1.x/core/units/related_searches/related_searches_config.php (.../related_searches_config.php) (revision 13941) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ), - ) - ), + 'CalculatedFields' => Array ( + '' => Array ( + ), + ), - 'CalculatedFields' => Array( - '' => Array( - - ), - ), - 'ListSQLs' => Array( ''=> 'SELECT %1$s.* %2$s FROM %1$s', ), // key - special, value - list select sql Index: branches/5.1.x/core/units/relationship/relationship_config.php =================================================================== diff -u -r13545 -r13941 --- branches/5.1.x/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 13545) +++ branches/5.1.x/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 13941) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_recip','show_oneway'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ), - 's1' => Array(), - 'show_recip' => Array('label' => 'la_Reciprocal', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ), - 'show_oneway' => Array('label' => 'la_OneWay', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ), - ) - ), + 'CalculatedFields' => Array ( + '' => Array ( + 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', + 'ItemType' => '#ITEM_TYPES#', + ), + ), - 'CalculatedFields' => Array( - '' => Array( - 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', - 'ItemType' => '#ITEM_TYPES#', - ), - ), - 'ListSQLs' => Array( ''=> 'SELECT %1$s.RelationshipId, %1$s.Priority, %1$s.Type, %1$s.Enabled %2$s FROM %1$s #ITEM_JOIN#', ), // key - special, value - list select sql Index: branches/5.1.x/core/units/themes/themes_config.php =================================================================== diff -u -r13545 -r13941 --- branches/5.1.x/core/units/themes/themes_config.php (.../themes_config.php) (revision 13545) +++ branches/5.1.x/core/units/themes/themes_config.php (.../themes_config.php) (revision 13941) @@ -1,6 +1,6 @@ TABLE_PREFIX.'Theme', 'SubItems' => Array('theme-file'), - - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array( - 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ), - 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ), - ) - ), - + 'AutoDelete' => true, 'AutoClone' => true, Index: branches/5.1.x/core/units/images/images_config.php =================================================================== diff -u -r13899 -r13941 --- branches/5.1.x/core/units/images/images_config.php (.../images_config.php) (revision 13899) +++ branches/5.1.x/core/units/images/images_config.php (.../images_config.php) (revision 13941) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ), - ) - ), - 'CalculatedFields' => Array( - '' => Array( - 'Preview' => '0', - ), - ), + '' => Array ( + 'Preview' => '0', + ), + ), 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', ), 'ListSortings' => Array( - '' => Array( - 'ForcedSorting' => Array('Priority' => 'desc'), - 'Sorting' => Array('Name' => 'asc'), - ) - ), + '' => Array( + 'ForcedSorting' => Array('Priority' => 'desc'), + 'Sorting' => Array('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'ImageId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), Index: branches/5.1.x/core/units/categories/categories_config.php =================================================================== diff -u -r13894 -r13941 --- branches/5.1.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 13894) +++ branches/5.1.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 13941) @@ -1,6 +1,6 @@ Array ( 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), ), 'Filters' => Array ( - 'show_active' => Array ('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1'), - 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2'), - 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0'), - 's1' => Array (), 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'), 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '`EditorsPick` != 1'), ) @@ -444,6 +439,7 @@ 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70), 'CreatedBySystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100), ), ), @@ -470,6 +466,7 @@ 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), 'CreatedBySystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100), ), ), @@ -496,6 +493,7 @@ 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), 'CreatedBySystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100), ), ), Index: branches/5.1.x/core/units/email_events/email_events_config.php =================================================================== diff -u -r13899 -r13941 --- branches/5.1.x/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 13899) +++ branches/5.1.x/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 13941) @@ -1,6 +1,6 @@ Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_enabled', 'show_disabled', 'show_frontonly'), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array ( - 'show_enabled' => Array ('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ), - 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ), - 'show_frontonly' => Array ('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ), - ) - ), - 'TableName' => TABLE_PREFIX . 'Events', 'ListSQLs' => Array ( Index: branches/5.1.x/core/admin_templates/categories/categories_edit_images.tpl =================================================================== diff -u -r12657 -r13941 --- branches/5.1.x/core/admin_templates/categories/categories_edit_images.tpl (.../categories_edit_images.tpl) (revision 12657) +++ branches/5.1.x/core/admin_templates/categories/categories_edit_images.tpl (.../categories_edit_images.tpl) (revision 13941) @@ -101,7 +101,7 @@ - + Index: branches/5.1.x/core/admin_templates/reviews/reviews_tab.tpl =================================================================== diff -u -r12127 -r13941 --- branches/5.1.x/core/admin_templates/reviews/reviews_tab.tpl (.../reviews_tab.tpl) (revision 12127) +++ branches/5.1.x/core/admin_templates/reviews/reviews_tab.tpl (.../reviews_tab.tpl) (revision 13941) @@ -20,7 +20,7 @@ - + Grids[''].AddAlternativeGrid('', true); @@ -34,7 +34,7 @@ #separator# - + Index: branches/5.1.x/core/units/reviews/reviews_config.php =================================================================== diff -u -r13581 -r13941 --- branches/5.1.x/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 13581) +++ branches/5.1.x/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 13941) @@ -1,6 +1,6 @@ Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array ( - 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - ) - ), - 'CalculatedFields' => Array ( '' => Array ( 'ReviewedBy' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Login )', Index: branches/5.1.x/core/units/languages/languages_config.php =================================================================== diff -u -r13545 -r13941 --- branches/5.1.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 13545) +++ branches/5.1.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 13941) @@ -1,6 +1,6 @@ TABLE_PREFIX.'Language', + 'TableName' => TABLE_PREFIX . 'Language', - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array( - 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ), - 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ), - ) - ), - 'AutoDelete' => true, 'AutoClone' => true, Index: branches/5.1.x/core/admin_templates/users/users_list.tpl =================================================================== diff -u -r13545 -r13941 --- branches/5.1.x/core/admin_templates/users/users_list.tpl (.../users_list.tpl) (revision 13545) +++ branches/5.1.x/core/admin_templates/users/users_list.tpl (.../users_list.tpl) (revision 13941) @@ -91,7 +91,7 @@ - + Index: branches/5.1.x/core/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -r13151 -r13941 --- branches/5.1.x/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 13151) +++ branches/5.1.x/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 13941) @@ -70,7 +70,7 @@ - + Index: branches/5.1.x/core/admin_templates/modules/modules_list.tpl =================================================================== diff -u -r13086 -r13941 --- branches/5.1.x/core/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 13086) +++ branches/5.1.x/core/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 13941) @@ -72,7 +72,7 @@ - + Index: branches/5.1.x/core/units/users/users_config.php =================================================================== diff -u -r13890 -r13941 --- branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 13890) +++ branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 13941) @@ -1,6 +1,6 @@ Array('addr', 'u-cdata', 'u-ug', 'u-img', 'fav', 'user-profile'), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled','show_pending'), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - ) - ), /** * Required for depricated public profile templates to work */ @@ -443,6 +432,7 @@ 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'), 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'), 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -461,6 +451,7 @@ 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ), 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -477,6 +468,7 @@ 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), Index: branches/5.1.x/core/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -r12127 -r13941 --- branches/5.1.x/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 12127) +++ branches/5.1.x/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 13941) @@ -60,7 +60,7 @@ - + Index: branches/5.1.x/core/units/files/files_config.php =================================================================== diff -u -r13750 -r13941 --- branches/5.1.x/core/units/files/files_config.php (.../files_config.php) (revision 13750) +++ branches/5.1.x/core/units/files/files_config.php (.../files_config.php) (revision 13941) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'FilterMenu' => Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_active','show_disabled'), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - ) - ), - 'ListSQLs' => Array ( '' => 'SELECT * FROM %s', ), Index: branches/5.1.x/core/admin_templates/users/user_selector.tpl =================================================================== diff -u -r12127 -r13941 --- branches/5.1.x/core/admin_templates/users/user_selector.tpl (.../user_selector.tpl) (revision 12127) +++ branches/5.1.x/core/admin_templates/users/user_selector.tpl (.../user_selector.tpl) (revision 13941) @@ -43,7 +43,7 @@ - + Index: branches/5.1.x/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r13159 -r13941 --- branches/5.1.x/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 13159) +++ branches/5.1.x/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 13941) @@ -1,6 +1,6 @@ TABLE_PREFIX.'Stylesheets', 'SubItems' => Array('selectorsbase', 'selectorsblock'), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER), - ), + 'AutoDelete' => true, - 'Filters' => Array( - 0 => Array('label' => 'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1'), - 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'), - ), - ), - - 'AutoDelete' => true, - 'AutoClone' => true, 'ListSQLs' => Array( Index: branches/5.1.x/core/admin_templates/languages/language_list.tpl =================================================================== diff -u -r12657 -r13941 --- branches/5.1.x/core/admin_templates/languages/language_list.tpl (.../language_list.tpl) (revision 12657) +++ branches/5.1.x/core/admin_templates/languages/language_list.tpl (.../language_list.tpl) (revision 13941) @@ -41,7 +41,7 @@ - +