Index: branches/5.1.x/admin_templates/link_validation/link_validation_list.tpl
===================================================================
diff -u -r13550 -r13939
--- branches/5.1.x/admin_templates/link_validation/link_validation_list.tpl	(.../link_validation_list.tpl)	(revision 13550)
+++ branches/5.1.x/admin_templates/link_validation/link_validation_list.tpl	(.../link_validation_list.tpl)	(revision 13939)
@@ -127,7 +127,7 @@
 </inp2:m_DefineElement>
 
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="link-validation" IdField="ForeignLinkId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="link-validation" IdField="ForeignLinkId" grid="Default"/>
 <script type="text/javascript">
 	Grids['link-validation'].SetDependantToolbarButtons( new Array('validate', 'validate_reset', 'edit', 'approve', 'decline', 'delete') );
 </script>
Index: branches/5.1.x/units/links/links_config.php
===================================================================
diff -u -r13746 -r13939
--- branches/5.1.x/units/links/links_config.php	(.../links_config.php)	(revision 13746)
+++ branches/5.1.x/units/links/links_config.php	(.../links_config.php)	(revision 13939)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_config.php 13746 2010-06-09 17:35:19Z alex $
+* @version	$Id: links_config.php 13939 2010-09-14 09:14:25Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -377,24 +377,19 @@
 					),
 
 					'FilterMenu'		=>	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_hot'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_pop'), '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' => '%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'  ),
-													's1'	=>	Array (),
-													'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
-													'show_hot'	=>	Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
-													'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
-													'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
-												)
-											),
+						'Groups' => Array (													
+							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),
+						),
+						'Filters' => Array (
+							'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
+							'show_hot'	=>	Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
+							'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
+							'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
+						),
+					),
 
 					'TableName'			=>	TABLE_PREFIX.'Link',
 
Index: branches/5.1.x/admin_templates/links/links_reviews.tpl
===================================================================
diff -u -r13095 -r13939
--- branches/5.1.x/admin_templates/links/links_reviews.tpl	(.../links_reviews.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/links_reviews.tpl	(.../links_reviews.tpl)	(revision 13939)
@@ -106,7 +106,7 @@
 	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="l-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="l-rev" IdField="ReviewId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
 </script>
Index: branches/5.1.x/admin_templates/links/links_images.tpl
===================================================================
diff -u -r13095 -r13939
--- branches/5.1.x/admin_templates/links/links_images.tpl	(.../links_images.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/links_images.tpl	(.../links_images.tpl)	(revision 13939)
@@ -99,7 +99,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="l-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="l-img" IdField="ImageId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
 </script>
Index: branches/5.1.x/units/listings/listings_config.php
===================================================================
diff -u -r13579 -r13939
--- branches/5.1.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 13579)
+++ branches/5.1.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 13939)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_config.php 13579 2010-05-19 07:26:53Z alex $
+* @version	$Id: listings_config.php 13939 2010-09-14 09:14:25Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -147,20 +147,6 @@
 						'LinkOwner'	=>	Array ('type' => 'string'),
 					),
 
-					'FilterMenu'		=>	Array (
-												'Groups' => Array (
-													Array ('mode' => 'AND', 'filters' => Array (0,1,2), 'type' => WHERE_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array (3), 'type' => WHERE_FILTER),
-												),
-
-												'Filters' => Array (
-													0	=>	Array ('label' => 'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
-													1	=>	Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
-													2	=>	Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
-													3	=>	Array ('label' => 'la_PendingRenewal', 'on_sql' => '', 'off_sql' => '%1$s.PendingRenewal != 1'  ),
-												)
-											),
-
 					'Grids'	=> Array (
 						'Default' => Array (
 							'Icons' => Array (
@@ -181,6 +167,7 @@
 								'PendingRenewal' => Array ( 'title' => 'la_col_PendingRenewal', 'filter_block' => 'grid_options_filter', 'width' => 143, ),
 								'PurchasedOn' => Array ( 'title' => 'la_col_PurchasedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 								'ExpiresOn' => Array ( 'title' => 'la_col_ExpiresOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'Status' => Array ( 'title' => 'la_col_Status' , 'filter_block' => 'grid_options_filter'),
 							),
 						),
 					),
Index: branches/5.1.x/units/link_validation/link_validation_config.php
===================================================================
diff -u -r13157 -r13939
--- branches/5.1.x/units/link_validation/link_validation_config.php	(.../link_validation_config.php)	(revision 13157)
+++ branches/5.1.x/units/link_validation/link_validation_config.php	(.../link_validation_config.php)	(revision 13939)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_validation_config.php 13157 2010-02-23 20:12:11Z alex $
+* @version	$Id: link_validation_config.php 13939 2010-09-14 09:14:25Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -73,18 +73,6 @@
 			),
 		),
 
-		'FilterMenu' => Array (
-			'Groups' => Array(
-				Array('mode' => 'AND', 'filters' => Array('show_valid', 'show_invalid', 'show_not_validated'), 'type' => WHERE_FILTER),
-			),
-
-			'Filters' => Array (
-				'show_valid' => Array ('label' =>'la_Text_Valid', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_VALID . ' OR %1$s.ValidationStatus IS NULL'),
-				'show_invalid' => Array ('label' => 'la_Text_Invalid', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_INVALID . ' OR %1$s.ValidationStatus IS NULL'),
-				'show_not_validated' => Array ('label' => 'la_Text_Not_Validated', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_NOT_VALIDATED . ' OR %1$s.ValidationStatus IS NOT NULL'),
-			)
-		),
-
 		'ListSQLs' => Array (
 			'' => '	SELECT %1$s.* %2$s
 					FROM ' . TABLE_PREFIX . 'Link l
Index: branches/5.1.x/admin_templates/paid_listings/paid_listings_list.tpl
===================================================================
diff -u -r13095 -r13939
--- branches/5.1.x/admin_templates/paid_listings/paid_listings_list.tpl	(.../paid_listings_list.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/paid_listings/paid_listings_list.tpl	(.../paid_listings_list.tpl)	(revision 13939)
@@ -67,7 +67,7 @@
 	<a href="<inp2:LinkEditLink edit_template="in-link/links/links_edit"/>"><inp2:Field name="$field" /></a>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="ls" IdField="ListingId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="ls" IdField="ListingId" grid="Default"/>
 <script type="text/javascript">
 	Grids['ls'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
Index: branches/5.1.x/admin_templates/links/links_relations.tpl
===================================================================
diff -u -r13095 -r13939
--- branches/5.1.x/admin_templates/links/links_relations.tpl	(.../links_relations.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/links_relations.tpl	(.../links_relations.tpl)	(revision 13939)
@@ -92,7 +92,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="l-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="l-rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
Index: branches/5.1.x/admin_templates/links/links_files.tpl
===================================================================
diff -u -r13095 -r13939
--- branches/5.1.x/admin_templates/links/links_files.tpl	(.../links_files.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/links_files.tpl	(.../links_files.tpl)	(revision 13939)
@@ -78,7 +78,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="l-file" IdField="FileId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="l-file" IdField="FileId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-file'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>