Index: branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r7072 -r7073
--- branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7072)
+++ branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7073)
@@ -1294,6 +1294,17 @@
 
 		}
 
+		function OnReset(&$event)
+		{
+			//do nothing - should reset :)
+			if ($this->isNewItemCreate($event)) {
+				// just reset id to 0 in case it was create
+				$object =& $event->getObject( Array('skip_autoload' => true) );
+				$object->setID(0);
+				$this->Application->SetVar($event->getPrefixSpecial().'_id',0);
+			}
+		}
+
 		/**
 		 * Apply same processing to each item beeing selected in grid
 		 *
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl
===================================================================
diff -u -r6935 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 6935)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 7073)
@@ -70,7 +70,7 @@
 		$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"/>")');
+			$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">
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js
===================================================================
diff -u -r6905 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js	(.../ajax.js)	(revision 6905)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js	(.../ajax.js)	(revision 7073)
@@ -267,7 +267,7 @@
 	if (typeof this.ResponceFunction != 'function') {
 		alert ('Please define responce function first');
 	}
-	
+
 	if (!isset(this.PopupSizes[$template])) {
 //		alert('from ajax');
 		var $url = this.URL + '&type=GetPopupSize&template_name=' + $template;
@@ -287,14 +287,14 @@
 		window.location.href = $match_redirect[1];
 		return false;
 	}
-	
+
 	switch ($params[0]) {
 		case 'GetSize':
 			// store responce to cache for future use
 			$object.PopupSizes[ $params[1] ] = $responce;
 			break;
 	}
-	
+
 	$object.ResponceFunction($responce);
 	$object.ResponceFunction = null; // reset responce function
 }
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl
===================================================================
diff -u -r7071 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 7073)
@@ -24,14 +24,19 @@
 							}
 					 	) );
 
+					a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+							reset_form('adm', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						}
+				 	) );
+
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-					a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_MoveUp" escape="1"/>', function() {
 								move_options_up('picked_columns', 1)
 							}
 					 ) );
 
-					a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_MoveDown" escape="1"/>', function() {
 								move_options_down('picked_columns', 1)
 							}
 					 ) );
Index: branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r7072 -r7073
--- branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 7072)
+++ branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 7073)
@@ -525,9 +525,10 @@
 		function PrintColumns($params)
 		{
 			$picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+			$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
 			/* @var $picker_helper kColumnPickerHelper */
 
-			$main_prefix = $this->Application->GetVar('main_prefix');
+			$main_prefix = $this->Application->RecallVar('main_prefix');
 			$cols = $picker_helper->LoadColumns($main_prefix);
 
 			$o = '';
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -r7071 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 7073)
@@ -1,11 +1,11 @@
 <inp2:m_if check="adm_UsePopups">
 	<script type="text/javascript">
-		document.body.style.overflow = 'hidden';
-		document.body.style.height = '100%';
-		document.body.scroll = 'no'
 		var o = '';
 		var el = document.getElementById('scroll_container');
 		if (el) {
+			document.body.style.overflow = 'hidden';
+			document.body.style.height = '100%';
+			document.body.scroll = 'no'
 			o += '<div style="position: relative; overflow: auto; width: 100%; height: 100%;">';
 			o += el.innerHTML + '</div>';
 			el.innerHTML = o;
Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r7072 -r7073
--- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 7072)
+++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 7073)
@@ -131,7 +131,7 @@
 
 		$picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
 		/* @var $picker_helper kColumnPickerHelper */
-//		$picker_helper->ApplyPicker($this->getPrefixSpecial(), $grid_config);
+		$picker_helper->ApplyPicker($this->getPrefixSpecial(), $grid_config, $params['grid']);
 
 		$std_params['pass_params']='true';
 		$std_params['PrefixSpecial']=$this->getPrefixSpecial();
@@ -682,6 +682,16 @@
 		}
 	}
 
+	function ErrorWarning($params)
+	{
+		if (!isset($params['field'])) {
+			$params['field'] = 'any';
+		}
+		if ($this->HasError($params)) {
+			return $this->Application->ParseBlock($params);
+		}
+	}
+
 	function IsRequired($params)
 	{
 		$field = $params['field'];
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js
===================================================================
diff -u -r7071 -r7073
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7073)
@@ -410,6 +410,7 @@
 }
 
 function open_popup($prefix_special, $event, $t, $window_size) {
+//	alert('opening '+$prefix_special+' event: '+$event+' t:'+$t+' size: '+$window_size)
 	if (!$window_size) {
 		// if no size given, then query it from ajax
 		var $default_size = '750x400';
@@ -1203,4 +1204,11 @@
 //	 		alert('clearing IE')
 	 		document.selection.empty();
 	 	}
+	}
+
+	function reset_form(prefix, event, msg)
+	{
+		if (confirm(msg)) {
+			submit_event(prefix, event)
+		}
 	}
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.4.2/core/units/admin/admin_events_handler.php
===================================================================
diff -u -r7046 -r7073
--- branches/unlabeled/unlabeled-1.4.2/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 7046)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 7073)
@@ -31,12 +31,13 @@
 	{
 		$themes_helper =& $this->Application->recallObject('ThemesHelper');
 		/* @var $themes_helper kThemesHelper */
-		
+
 		$themes_helper->refreshThemes();
 	}
-	
+
 	function OnSaveColumns(&$event) {
 		$picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+		$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
 		/* @var $picker_helper kColumnPickerHelper */
 
 		$picked = trim($this->Application->GetVar('picked_str'), '|');
@@ -57,7 +58,7 @@
 	{
 		$event->SetRedirectParam('opener', 'u');
 	}
-	
+
 	/**
 	 * Occurs right after initialization of the kernel, used mainly as hook-to event
 	 *
@@ -67,15 +68,15 @@
 	{
 
 	}
-	
+
 	/**
 	 * Is called after tree was build (when not from cache)
 	 *
 	 * @param kEvent $event
 	 */
 	function OnAfterBuildTree(&$event)
 	{
-		
+
 	}
 
 }
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/col_picker_helper.php
===================================================================
diff -u -r6889 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 6889)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/col_picker_helper.php	(.../col_picker_helper.php)	(revision 7073)
@@ -1,6 +1,8 @@
 <?php
 
 class kColumnPickerHelper extends kHelper {
+	var $PickerData;
+	var $GridName;
 
 	function LoadColumns($prefix)
 	{
@@ -22,14 +24,20 @@
 		return $cols;
 	}
 
-	function ApplyPicker($prefix, &$fields)
+	function ApplyPicker($prefix, &$fields, $grid_name)
 	{
+		$this->SetGridName($grid_name);
 		$this->PickerData = $this->LoadColumns($prefix);
 
 		uksort($fields, array($this, 'CmpElems'));
 		$this->RemoveHiddenColumns($fields);
 	}
 
+	function SetGridName($grid_name)
+	{
+		$this->GridName = $grid_name;
+	}
+
 	function CmpElems($a, $b)
 	{
 		$a_index = array_search($a, $this->PickerData['order']);
@@ -67,11 +75,11 @@
 		$this->Application->StorePersistentVar($prefix.'_columns_.'.$view_name, serialize($cols));
 	}
 
-	function GetColumns($prefix, $grid_name='Default')
+	function GetColumns($prefix)
 	{
 		$splited = $this->Application->processPrefix($prefix);
 		$grids = $this->Application->getUnitOption($splited['prefix'], 'Grids');
-		$conf_fields = $grids[$grid_name]['Fields'];
+		$conf_fields = $grids[$this->GridName]['Fields'];
 
 		// we NEED to recall dummy here to apply fields changes imposed by formatters,
 		// such as replacing multilingual field titles etc.
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r7071 -r7073
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7073)
@@ -21,6 +21,11 @@
 						}
 				 ) );
 
+			 a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('u', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
@@ -55,6 +60,8 @@
 </table>
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
+<inp2:u_ErrorWarning name="form_error_warning"/>
+<div id="scroll_container">
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
@@ -65,5 +72,6 @@
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
 </table>
+</div>
 
 <inp2:m_include t="incs/footer"/>