Index: trunk/core/admin_templates/img/calendar_icon.gif
===================================================================
diff -u -N -r6850 -r7404
Binary files differ
Index: trunk/core/admin_templates/js/nlsmenu.js
===================================================================
diff -u -N -r6815 -r7404
--- trunk/core/admin_templates/js/nlsmenu.js	(.../nlsmenu.js)	(revision 6815)
+++ trunk/core/admin_templates/js/nlsmenu.js	(.../nlsmenu.js)	(revision 7404)
@@ -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()); }
   }
@@ -511,7 +511,12 @@
       var trgt=this.items[itemId].target;
       if (trgt==null) trgt=this.target!=null?this.target:"_self";
       if (this.items[itemId].url!="") {
-        window.open(this.items[itemId].url, trgt);
+      	if (trgt=='_self') {
+      		window.location.href=this.items[itemId].url
+      	}
+      	else {
+        	window.open(this.items[itemId].url, trgt);
+      	}
       } else {
         return this.menuOnClick(ids[0], ids[1]);
       }
Index: trunk/core/admin_templates/incs/menu_blocks.tpl
===================================================================
diff -u -N -r6815 -r7404
--- trunk/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 6815)
+++ trunk/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 7404)
@@ -3,19 +3,22 @@
 <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"/>
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addSeparator();
 <inp2:m_blockend/>
 
-<inp2:m_block name="nlsmenu_declaration" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0"/>
+<inp2:m_block name="nlsmenu_declaration" menu_columns="yes" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0"/>
 	// define ViewMenu
 
 		<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();
@@ -66,6 +69,10 @@
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].dropShadow("none");
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].showIcon = true;
 
+		<inp2:m_if check="m_ParamEquals" name="menu_columns" value="yes">
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.columns'),'<inp2:m_Phrase label="la_SelectColumns" escape="1"/>','javascript:openSelector("<inp2:m_param name="PrefixSpecial"/>", "<inp2:m_t template="popups/column_picker" grid_name="$grid" no_amp="1"/>")');
+		</inp2:m_if>
+
 		<inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes">
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filters'), '<inp2:m_phrase name="la_Text_View" escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.filter.menu'), null);
 		</inp2:m_if>
@@ -79,6 +86,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