Index: branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r6792 -r6820
--- branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 6792)
+++ branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 6820)
@@ -393,7 +393,7 @@
 				unset($params['mode']);
 			}
 
-			$params['t'] = 'item_selector/item_selector_'.$mode;
+			$params['t'] = 'in-portal/item_selector/item_selector_'.$mode;
 
 			$default_params = Array('no_amp' => 1, 'pass' => 'all,'.$params['prefix']);
 			unset($params['prefix']);
@@ -500,9 +500,9 @@
 		 * @param Array $params
 		 * @return int
 		 */
-		function IsSSL($params) 
-		{	
-			return (PROTOCOL == 'https://')? 1 : 0;		
+		function IsSSL($params)
+		{
+			return (PROTOCOL == 'https://')? 1 : 0;
 		}
 	}
 
Index: branches/unlabeled/unlabeled-1.21.4/core/kernel/db/dblist.php
===================================================================
diff -u -r6752 -r6820
--- branches/unlabeled/unlabeled-1.21.4/core/kernel/db/dblist.php	(.../dblist.php)	(revision 6752)
+++ branches/unlabeled/unlabeled-1.21.4/core/kernel/db/dblist.php	(.../dblist.php)	(revision 6820)
@@ -141,13 +141,13 @@
 		parent::kDBBase();
 		$this->OrderFields = Array();
 
-		
+
 		$filters = $this->getFilterStructure();
-		
+
 		foreach ($filters as $filter_params) {
 			$filter =& $this->$filter_params['type'];
 			$filter[ $filter_params['class'] ] =& $this->Application->makeClass('kMultipleFilter', $filter_params['join_using']);
-		}			
+		}
 
 		$this->PerPage = -1;
 	}
@@ -165,21 +165,21 @@
 							Array ('type' => 'WhereFilter', 'class' => FLT_SEARCH, 'join_using' => FLT_TYPE_OR),
 							Array ('type' => 'WhereFilter', 'class' => FLT_VIEW, 'join_using' => FLT_TYPE_AND),
 							Array ('type' => 'WhereFilter', 'class' => FLT_CUSTOM, 'join_using' => FLT_TYPE_AND),
-							
+
 							Array ('type' => 'HavingFilter', 'class' => FLT_SYSTEM, 'join_using' => FLT_TYPE_AND),
 							Array ('type' => 'HavingFilter', 'class' => FLT_NORMAL, 'join_using' => FLT_TYPE_OR),
 							Array ('type' => 'HavingFilter', 'class' => FLT_SEARCH, 'join_using' => FLT_TYPE_OR),
 							Array ('type' => 'HavingFilter', 'class' => FLT_VIEW, 'join_using' => FLT_TYPE_AND),
 							Array ('type' => 'HavingFilter', 'class' => FLT_CUSTOM, 'join_using' => FLT_TYPE_AND),
-							
+
 							Array ('type' => 'AggregateFilter', 'class' => FLT_SYSTEM, 'join_using' => FLT_TYPE_AND),
 							Array ('type' => 'AggregateFilter', 'class' => FLT_NORMAL, 'join_using' => FLT_TYPE_OR),
 							Array ('type' => 'AggregateFilter', 'class' => FLT_VIEW, 'join_using' => FLT_TYPE_AND),
 					);
-					
+
 		return $filters;
 	}
-	
+
 	/**
 	 * Adds new or replaces old filter with same name
 	 *
@@ -228,11 +228,11 @@
 	function clearFilters()
 	{
 		$filters = $this->getFilterStructure();
-		
+
 		foreach ($filters as $filter_params) {
 			$filter =& $this->$filter_params['type'];
 			$filter[ $filter_params['class'] ]->clearFilters();
-		}	
+		}
 	}
 
 	/**
@@ -415,7 +415,7 @@
 		$fields = $this->getCalculatedFields($aggregated);
 		if (is_array($fields) && count($fields) > 0) {
 			foreach ($fields as $field_name => $field_expression) {
-				$clause = preg_replace('/[,` ]{1}'.$field_name.'[` ]{1}/', ' '.$field_expression.' ', $clause);
+				$clause = preg_replace('/(([(]*)|[,` ]{1})'.$field_name.'[` ]{1}/', '$1 '.$field_expression.' ', $clause);
 			}
 		}
 		return $clause;
@@ -442,7 +442,7 @@
 				$search_w = ($search_w && $search_h) ? $search_w.' OR '.$search_h : $search_w.$search_h;
 				$where->addFilter('search_where', $search_w );
 			}
-			
+
 			// CUSTOM
 			$search_w = $this->WhereFilter[FLT_CUSTOM]->getSQL();
 			if ($search_w || $for_counting) { // move search_having to search_where in case search_where isset or we are counting
Index: branches/unlabeled/unlabeled-1.19.2/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -r6785 -r6820
--- branches/unlabeled/unlabeled-1.19.2/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6785)
+++ branches/unlabeled/unlabeled-1.19.2/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6820)
@@ -7,7 +7,7 @@
 Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
 Grids['c'].InitItems();
 Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-<inp2:c_ViewMenu block="viewmenu_declaration" grid="Default" no_special="1" menu_perpage="no" menu_filters="yes" ajax="1"/>
+<inp2:c_ViewMenu block="nlsmenu_declaration" grid="Default" no_special="1" menu_perpage="no" menu_filters="yes" ajax="1"/>
 
 <!-- substiture form action, like from was created from here -->
 document.getElementById('categories_form').action = '<inp2:m_t pass="all" js_escape="1"/>';
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/nlsmenu.js
===================================================================
diff -u -r6819 -r6820
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/nlsmenu.js	(.../nlsmenu.js)	(revision 6819)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/nlsmenu.js	(.../nlsmenu.js)	(revision 6820)
@@ -52,7 +52,7 @@
   if (plc && plc!="") {
     var d=NlsGetElementById(plc); var s="";
     for (it in this.menus) { s+=this.menus[it].renderMenu(); }
-    plc.innerHTML=s;
+    d.innerHTML=s;
   } else {
     for (it in this.menus) { document.write(this.menus[it].renderMenu()); }
   }
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js
===================================================================
diff -u -r6786 -r6820
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 6786)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 6820)
@@ -4,6 +4,7 @@
 	var $Menus = new Array();
 	var $ViewMenus = new Array();
 	var $nls_menus = new Array();
+	var $MenuNames = new Array();
 
 	var $form_name = 'kernel_form';
 	if(!$fw_menus) var $fw_menus = new Array();
@@ -550,7 +551,7 @@
 	return yPos;
 }
 
-function show_viewmenu($toolbar, $button_id)
+function show_viewmenu_old($toolbar, $button_id)
 {
 	var $img = $toolbar.GetButtonImage($button_id);
 	var $pos_x = getRealLeft($img) - ((document.all) ? 6 : -2);
@@ -588,6 +589,44 @@
 	}
 }
 
+var nlsMenuRendered = false;
+function show_viewmenu($toolbar, $button_id)
+{
+	if($ViewMenus.length == 1) {
+		$prefix_special = $ViewMenus[$ViewMenus.length-1];
+		menu_to_show = $prefix_special+'_view_menu';
+	}
+	else
+	{
+		mixed_menu = menuMgr.createMenu(rs('mixed_menu'));
+		mixed_menu.applyBorder(false, false, false, false);
+		mixed_menu.dropShadow("none");
+		mixed_menu.showIcon = true;
+
+		// merge menus into new one
+		for(var $i in $ViewMenus)
+		{
+			$prefix_special = $ViewMenus[$i];
+			mixed_menu.addItem( rs($prefix_special+'.view.menu.mixed'),
+													$MenuNames[$prefix_special+'_view_menu'],
+													'javascript:void()', null, true, null,
+													rs($prefix_special+'.view.menu'),$MenuNames[$prefix_special+'_view_menu'] );
+		}
+
+		menu_to_show = 'mixed_menu';
+	}
+
+	renderMenus();
+
+	nls_showMenu(rs(menu_to_show), $toolbar.GetButtonImage($button_id))
+}
+
+function renderMenus()
+{
+	menuMgr.renderMenus('nlsMenuPlace');
+	nlsMenuRendered = true;
+}
+
 function set_window_title($title)
 {
 	var $window = window;
@@ -1038,6 +1077,6 @@
 	// remove spaces and underscores from a string, used for nls_menu
 	function rs(str)
 	{
-		return str.replace(/[ _]+/g, '.');
+		return str.replace(/[ _\']+/g, '.');
 	}
 
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -r6788 -r6820
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6788)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6820)
@@ -14,10 +14,16 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+				<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+				<script type="text/javascript" src="js/nlsmenu.js"></script>
+				<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
 	  		<script type="text/javascript" src="js/ajax.js"></script>
 	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
+	  			var menuMgr = new NlsMenuManager("mgr");
+					menuMgr.timeout = 500;
+					menuMgr.flowOverFormElement = true;
+
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
 	  			Catalog.prototype.AfterInit = function() {
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r6734 -r6820
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6820)
@@ -23,7 +23,7 @@
 <inp2:m_blockend/>
 
 
-<inp2:m_block name="grid_pagination" SearchPrefixSpecial=""/>
+<inp2:m_block name="grid_pagination" SearchPrefixSpecial="" ajax="0"/>
 <table cellspacing="0" cellpadding="2" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>tableborder_full_kernel<inp2:m_else/>pagination_bar<inp2:m_endif/>">
 	<tbody>
 		<tr id="MY_ID">
@@ -271,6 +271,8 @@
 	}
 <inp2:m_blockend/>
 
+<inp2:m_include template="incs/menu_blocks"/>
+
 <inp2:m_block name="grid_save_warning" />
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>nobottom<inp2:m_else/>notop<inp2:m_endif/>">
   		<tr>
@@ -329,6 +331,17 @@
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
 		<inp2:m_if check="m_GetEquals" name="fw_menu_included" value="">
 			<script type="text/javascript" src="incs/fw_menu.js"></script>
+
+			<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+			<script type="text/javascript" src="js/nlsmenu.js"></script>
+			<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
+			<script type="text/javascript">
+				var menuMgr = new NlsMenuManager("mgr");
+				menuMgr.timeout = 500;
+				menuMgr.flowOverFormElement = true;
+			</script>
+
 			<inp2:m_set fw_menu_included="1"/>
 		</inp2:m_if>
 
@@ -347,7 +360,9 @@
 			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
 	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
   		</inp2:m_if>
-  		<inp2:m_ParseBlock name="viewmenu_declaration" pass_params="true"/>
+
+  		<inp2:m_RenderElement name="nlsmenu_declaration" pass_params="true"/>
+
   		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
 </inp2:m_DefineElement>
 
@@ -379,6 +394,17 @@
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
 		<inp2:m_if check="m_GetEquals" name="fw_menu_included" value="">
 			<script type="text/javascript" src="incs/fw_menu.js"></script>
+
+			<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+			<script type="text/javascript" src="js/nlsmenu.js"></script>
+			<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
+			<script type="text/javascript">
+				var menuMgr = new NlsMenuManager("mgr");
+				menuMgr.timeout = 500;
+				menuMgr.flowOverFormElement = true;
+			</script>
+
 			<inp2:m_set fw_menu_included="1"/>
 		</inp2:m_if>
 
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -r6787 -r6820
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6787)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6820)
@@ -1,7 +1,13 @@
 <script type="text/javascript" src="js/ajax.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+<script type="text/javascript" src="js/nlsmenu.js"></script>
+<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
 <script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 <script type="text/javascript">
+	var menuMgr = new NlsMenuManager("mgr");
+	menuMgr.timeout = 500;
+	menuMgr.flowOverFormElement = true;
+
 	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	var a_toolbar = new ToolBar();
 
Index: branches/unlabeled/unlabeled-1.23.2/index.php
===================================================================
diff -u -r6648 -r6820
--- branches/unlabeled/unlabeled-1.23.2/index.php	(.../index.php)	(revision 6648)
+++ branches/unlabeled/unlabeled-1.23.2/index.php	(.../index.php)	(revision 6820)
@@ -5,7 +5,7 @@
 define('FULL_PATH', realpath(dirname(__FILE__)));
 
 if (!file_exists(FULL_PATH.'/core/kernel/application.php')) {
-	die('Please re-checkout _inportal_kernel4 cvs module into the root directory ('.FULL_PATH.') and remove kernel/kernel4 folder');
+	die('Please re-checkout _inportal_kernel4 cvs module into the root directory ('.FULL_PATH.') and remove kernel/kernel4 folder. Make sure to checkout correct branch (RC or HEAD).');
 }
 include_once(FULL_PATH.'/core/kernel/startup.php');
 
Index: branches/unlabeled/unlabeled-1.25.2/admin/index.php
===================================================================
diff -u -r6649 -r6820
--- branches/unlabeled/unlabeled-1.25.2/admin/index.php	(.../index.php)	(revision 6649)
+++ branches/unlabeled/unlabeled-1.25.2/admin/index.php	(.../index.php)	(revision 6820)
@@ -4,6 +4,9 @@
 
 define('ADMIN', 1);
 define('FULL_PATH', realpath(dirname(__FILE__).'/..') );
+if (!file_exists(FULL_PATH.'/core/kernel/application.php')) {
+	die('Please re-checkout _inportal_kernel4 cvs module into the root directory ('.FULL_PATH.') and remove kernel/kernel4 folder. Make sure to checkout correct branch (RC or HEAD).');
+}
 include_once(FULL_PATH.'/core/kernel/startup.php');
 
 /*
Index: branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r6792 -r6820
--- branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 6792)
+++ branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 6820)
@@ -14,10 +14,17 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+				<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+				<script type="text/javascript" src="js/nlsmenu.js"></script>
+				<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
 	  		<script type="text/javascript" src="js/ajax.js"></script>
 	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
+  				var menuMgr = new NlsMenuManager("mgr");
+					menuMgr.timeout = 500;
+					menuMgr.flowOverFormElement = true;
+
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	  			var $is_catalog = true;
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl
===================================================================
diff -u -r6819 -r6820
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 6819)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 6820)
@@ -3,7 +3,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="nlsmenu_filter_block"/>
-	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('<inp2:m_param name="label"/>','<inp2:m_param name="filter_action"/>','<inp2:m_param name="filter_status"/>');
+	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filter.<inp2:m_param name="label" escape="1"/>'), '<inp2:m_param name="label" escape="1"/>', 'javascript:<inp2:m_param name="filter_action" escape="1"/>',<inp2:m_param name="filter_status"/>);
 <inp2:m_blockend/>
 
 <inp2:m_block name="nlsmenu_filter_separator"/>
@@ -16,6 +16,9 @@
 		<inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes">
 			// filtring menu
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'] = menuMgr.createMenu(rs('<inp2:m_param name="PrefixSpecial"/>.filter.menu'));
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].applyBorder(false, false, false, false);
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].dropShadow("none");
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].showIcon = true;
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filter.all'), 'All','javascript:filters_remove_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filter.none'), 'None','javasript:filters_apply_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addSeparator();
@@ -79,6 +82,8 @@
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.select'), '<inp2:m_phrase name="la_Text_Select" escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.select.menu'), null);
 		</inp2:m_if>
 
+		$MenuNames['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = '<inp2:$PrefixSpecial_GetItemName escape="1"/>';
+
 		processHooks('ViewMenu', hAFTER, '<inp2:m_param name="PrefixSpecial"/>');
 
 <inp2:m_blockend/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -r6734 -r6820
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 6820)
@@ -7,5 +7,8 @@
 <inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
 	<inp2:m_ParseBlock name="kernel_form_end"/>
 </inp2:m_if>
+
+<div id="nlsMenuPlace"></div>
+
 </body>
 </html>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php
===================================================================
diff -u -r6819 -r6820
--- branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 6819)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 6820)
@@ -114,7 +114,7 @@
 																						'parent'		=>	'in-portal:users',
 																						'icon'			=>	'in-portal:usergroups',
 																						'label'			=>	'la_tab_User_Groups',
-																						'url'			=>	Array('t' => 'groups/groups_list', 'pass' => 'm'),
+																						'url'			=>	Array('t' => 'in-portal/groups/groups_list', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'),
 																						'priority'		=>	2,
 																						'type'			=>	stTREE,
Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r6755 -r6820
--- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 6755)
+++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 6820)
@@ -105,11 +105,11 @@
 			$block_params['label'] = addslashes( $this->Application->Phrase($filter_params['label']) );
 			if (getArrayValue($view_filter,$filter_key)) {
 				$submit = 0;
-				$status = $group_params['element_type'] == 'checkbox' ? 1 : 2;
+				$status = $group_params['element_type'] == 'checkbox' ? '[\'img/check_on.gif\']' : '[\'img/menu_dot.gif\']';
 			}
 			else {
 				$submit = 1;
-				$status = 0;
+				$status = 'null';
 			}
 			$block_params['filter_action'] = 'set_filter("'.$prefix_special.'","'.$filter_key.'","'.$submit.'",'.$params['ajax'].');';
 			$block_params['filter_status'] = $status; // 1 - checkbox, 2 - radio, 0 - no image
@@ -743,10 +743,10 @@
 		$object =& $this->getObject($params);
 		$field = $params['field'];
 		$saved_value = $object->GetDBField($field);
-		
+
 		$object->SetDBField($field, $this->SearchField($params));
 		$custom_filter = $this->Application->RecallVar($this->getPrefixSpecial().'_custom_filter');
-		
+
 		$ret = $this->PredefinedOptions($params);
 		$object->SetDBField($field, $saved_value);
 		return $ret;
@@ -1416,11 +1416,11 @@
 		$field = $this->SelectParam($params, 'field,name');
 
 		$ret = 'custom_filters['.$this->getPrefixSpecial().']['.$params['grid'].']['.$field.']['.$params['filter_type'].']';
-		
+
 		if (isset($params['type'])) {
 			$ret .= '['.$params['type'].']';
 		}
-		
+
 		return $ret;
 	}
 
@@ -1444,7 +1444,7 @@
 			}
 			return $ret;
 		}
-		
+
 		return '';
 	}
 
Index: branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php
===================================================================
diff -u -r6819 -r6820
--- branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 6819)
+++ branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 6820)
@@ -114,7 +114,7 @@
 																						'parent'		=>	'in-portal:users',
 																						'icon'			=>	'in-portal:usergroups',
 																						'label'			=>	'la_tab_User_Groups',
-																						'url'			=>	Array('t' => 'groups/groups_list', 'pass' => 'm'),
+																						'url'			=>	Array('t' => 'in-portal/groups/groups_list', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'),
 																						'priority'		=>	2,
 																						'type'			=>	stTREE,
Index: branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r6792 -r6820
--- branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 6792)
+++ branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 6820)
@@ -14,10 +14,17 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+				<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+				<script type="text/javascript" src="js/nlsmenu.js"></script>
+				<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
 	  		<script type="text/javascript" src="js/ajax.js"></script>
 	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
+  				var menuMgr = new NlsMenuManager("mgr");
+					menuMgr.timeout = 500;
+					menuMgr.flowOverFormElement = true;
+
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	  			var $is_catalog = true;
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
Index: branches/unlabeled/unlabeled-1.19.2/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -r6785 -r6820
--- branches/unlabeled/unlabeled-1.19.2/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6785)
+++ branches/unlabeled/unlabeled-1.19.2/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6820)
@@ -7,7 +7,7 @@
 Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
 Grids['c'].InitItems();
 Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-<inp2:c_ViewMenu block="viewmenu_declaration" grid="Default" no_special="1" menu_perpage="no" menu_filters="yes" ajax="1"/>
+<inp2:c_ViewMenu block="nlsmenu_declaration" grid="Default" no_special="1" menu_perpage="no" menu_filters="yes" ajax="1"/>
 
 <!-- substiture form action, like from was created from here -->
 document.getElementById('categories_form').action = '<inp2:m_t pass="all" js_escape="1"/>';
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/blank.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/advanced_view.tpl
===================================================================
diff -u -r6788 -r6820
--- branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6788)
+++ branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6820)
@@ -14,10 +14,16 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+				<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+				<script type="text/javascript" src="js/nlsmenu.js"></script>
+				<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
 	  		<script type="text/javascript" src="js/ajax.js"></script>
 	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
+	  			var menuMgr = new NlsMenuManager("mgr");
+					menuMgr.timeout = 500;
+					menuMgr.flowOverFormElement = true;
+
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
 	  			Catalog.prototype.AfterInit = function() {
Index: branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -r6787 -r6820
--- branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6787)
+++ branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6820)
@@ -1,7 +1,13 @@
 <script type="text/javascript" src="js/ajax.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+<script type="text/javascript" src="js/nlsmenu.js"></script>
+<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
 <script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 <script type="text/javascript">
+	var menuMgr = new NlsMenuManager("mgr");
+	menuMgr.timeout = 500;
+	menuMgr.flowOverFormElement = true;
+
 	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	var a_toolbar = new ToolBar();