Index: branches/unlabeled/unlabeled-1.52.2/core/kernel/startup.php
===================================================================
diff -u -r7398 -r7725
--- branches/unlabeled/unlabeled-1.52.2/core/kernel/startup.php	(.../startup.php)	(revision 7398)
+++ branches/unlabeled/unlabeled-1.52.2/core/kernel/startup.php	(.../startup.php)	(revision 7725)
@@ -31,8 +31,8 @@
 
 	$vars = parse_portal_ini(FULL_PATH.'/config.php');
 
-	define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
-	define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
+	safeDefine('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
+	safeDefine('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
 
 	if (isset($vars['WriteablePath'])) {
 		define('WRITEABLE', FULL_PATH.$vars['WriteablePath']);
@@ -85,8 +85,8 @@
 			include_once(KERNEL_PATH.'/utility/debugger.php');
 			$debugger_end = getmicrotime();
 			if (isset($debugger) && constOn('DBG_PROFILE_INCLUDES')) {
-//				$debugger->profileStart('inc_globals', KERNEL_PATH.'/globals.php', $globals_start);
-//				$debugger->profileFinish('inc_globals', KERNEL_PATH.'/globals.php', $globals_end);
+				$debugger->profileStart('inc_globals', KERNEL_PATH.'/globals.php', $globals_start);
+				$debugger->profileFinish('inc_globals', KERNEL_PATH.'/globals.php', $globals_end);
 				$debugger->profilerAddTotal('includes', 'inc_globals');
 
 				$debugger->profileStart('inc_debugger', KERNEL_PATH.'/utility/debugger.php', $debugger_start);
Index: branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/debugger.php
===================================================================
diff -u -r7724 -r7725
--- branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 7724)
+++ branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 7725)
@@ -834,7 +834,7 @@
 				}
 				return 0;
 			}
-			
+
 			/**
 			 * Generates report
 			 *
@@ -884,13 +884,13 @@
 					$this->appendHTML('<b>Memory used by Objects:</b> '.round($this->ProfilerTotals['objects'] / 1024, 2).'Kb');
 				}
 
-				/*if ($this->constOn('DBG_INCLUDED_FILES')) {
+				if ($this->constOn('DBG_INCLUDED_FILES')) {
 					$files = get_included_files();
 					$this->appendHTML('<b>Included files:</b>');
 					foreach ($files as $file) {
 						$this->appendHTML($this->getFileLink($this->getLocalFile($file)).' ('.round(filesize($file) / 1024, 2).'Kb)');
 					}
-				}*/
+				}
 
 				/*if ($this->constOn('DBG_PROFILE_INCLUDES')) {
 					$this->appendHTML('<b>Included files statistics:</b>'.( $this->constOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)':''));
@@ -959,7 +959,7 @@
 						$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
 						$Debugger.EditorPath = '<?php echo defined('DBG_EDITOR') ? addslashes(DBG_EDITOR) : '' ?>';
 						$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator.'&path='.urlencode($dbg_path); ?>';
-						
+
 						<?php
 							if ($this->IsFatalError || DBG_RAISE_ON_WARNINGS) {
 								echo '$Debugger.Toggle();';
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -r7701 -r7725
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 7701)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 7725)
@@ -3,58 +3,13 @@
 		var o = '';
 		var el = document.getElementById('scroll_container');
 		if (el) {
-			document.body.style.overflow = 'hidden';
 			document.body.style.height = '100%';
+			document.body.style.overflow = 'hidden';
 			document.body.scroll = 'no'
-			o += '<div style="position: relative; overflow: auto; width: 100%; height: 100%;">';
-			o += el.innerHTML + '</div>';
-			el.innerHTML = o;
-			execJS(el)
-			MakeHeight100();
-			addEvent(window, 'resize', function() {MakeHeight100()})
-		}
 
-		function MakeHeight100(id)
-		{
-			if (!id) id = 'scroll_container';
-			AdjustTextAreas(true); // reseting textareas to minimal size
-			var el = document.getElementById(id);
-			var h = (document.all ? window.document.body.offsetHeight : window.innerHeight) - el.offsetTop + 'px';
-			var w = (document.all ? window.document.body.offsetWidth : window.innerWidth) - el.offsetLeft + 'px';
-//			alert('h: '+h)
-			el.style.height = h;
-//			el.style.width=w;
-			AdjustTextAreas(); // adjusting textarea height
+			addLoadEvent(function() {Form.Init('scroll_container')});
 		}
 
-		function AdjustTextAreas(reset)
-		{
-			var tmp;
-			var sizes = new Array();
-			if (isset(textareas100)) {
-				// we need separate cycle to get heights, because if we set the height in the same cycle
-				// it will recursively affect heights of other textareas
-				for (var i in textareas100) {
-					tmp = document.getElementById(textareas100[i]);
-					sizes[tmp.name] = tmp.parentNode.offsetHeight;
-				}
-				for (var i in textareas100) {
-					tmp = document.getElementById(textareas100[i]);
-					tmp.style.height = reset ? '70px' : (sizes[tmp.name] - 18) + 'px';
-				}
-			}
-		}
-
-		if (isset(first_error)) {
-			for (var i in first_error) {
-				if (first_error[i] != false) {
-//					show_form_error(i, first_error[i][0]);
-					document.getElementById(first_error[i][1]).focus();
-//					alert('focused on '+first_error[i][1])
-				}
-			}
-		}
-
 	</script>
 <inp2:m_else/>
 	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/header.tpl
===================================================================
diff -u -r7648 -r7725
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 7648)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 7725)
@@ -23,6 +23,7 @@
 <script type="text/javascript" src="js/in-portal.js"></script>
 <script type="text/javascript" src="js/toolbar.js"></script>
 <script type="text/javascript" src="js/grid.js"></script>
+<script type="text/javascript" src="js/forms.js"></script>
 <script type="text/javascript" src="js/calendar.js"></script>
 <script language="javascript">
 var t = '<inp2:m_get param="t"/>';
Index: branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php
===================================================================
diff -u -r7649 -r7725
--- branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 7649)
+++ branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 7725)
@@ -538,8 +538,14 @@
 			array_push($unique_fields,$field);
 			foreach($unique_fields as $unique_field)
 			{
-				$where[] = '`'.$unique_field.'` = '.$this->Conn->qstr( $this->GetDBField($unique_field) );
+				// if field is not empty or if it is required - we add where condition
+				if ($this->GetDBField($unique_field) != '' || $this->Fields[$unique_field]['required']) {
+					$where[] = '`'.$unique_field.'` = '.$this->Conn->qstr( $this->GetDBField($unique_field) );
+				}
 			}
+			// This can ONLY happen if all unique fields are empty and not required.
+			// In such case we return true, because if unique field is not required there may be numerous empty values
+			if (!$where) return true;
 
 			$sql = 'SELECT COUNT(*) FROM %s WHERE ('.implode(') AND (',$where).') AND ('.$this->IDField.' <> '.(int)$this->ID.')';
 
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -r7648 -r7725
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7648)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7725)
@@ -65,43 +65,8 @@
 	alert(p)
 }
 
-function findPos(obj) {
-	var curleft = curtop = 0;
-	if (obj.offsetParent) {
-		curleft = obj.offsetLeft
-		curtop = obj.offsetTop
-		while (obj = obj.offsetParent) {
-			curleft += obj.offsetLeft
-			curtop += obj.offsetTop
-		}
-	}
-	return [curleft,curtop];
-}
-
 var startTime,endTime;
 
-function getDimensions(obj) {
-	var style
-	if (obj.currentStyle) {
-		style = obj.currentStyle;
-	}
-	else {
-		style = getComputedStyle(obj,'');
-	}
-	padding = [parseInt(style.paddingTop), parseInt(style.paddingRight), parseInt(style.paddingBottom), parseInt(style.paddingLeft)]
-	border = [parseInt(style.borderTopWidth), parseInt(style.borderRightWidth), parseInt(style.borderBottomWidth), parseInt(style.borderLeftWidth)]
-	for (var i in padding)  if ( isNaN( padding[i] ) ) padding[i] = 0
-	for (var i in border)  if ( isNaN( border[i] ) ) border[i] = 0
-
-	var result = new Object();
-	result.innerHeight = obj.clientHeight - padding[0] - padding[2];
-	result.innerWidth = obj.clientWidth - padding[1] - padding[3];
-	result.padding = padding;
-	result.borders = border;
-
-	return result;
-}
-
 var profile = 0;
 var profile_total = 0;
 var startTime = new Date().getTime();
@@ -123,20 +88,6 @@
 	profile_total = 0;
 }
 
-function addLoadEvent(func) {
-  var oldonload = window.onload;
-  if (typeof window.onload != 'function') {
-    window.onload = func;
-  } else {
-    window.onload = function() {
-      if (oldonload) {
-        oldonload();
-      }
-      func();
-    }
-  }
-}
-
 function GridScroller(grid_id, w, h)
 {
 	this.GridId = grid_id
@@ -203,10 +154,10 @@
 		getFrame('head').ScrollerH = this.ScrollerH
 	}
 
-
 //	Profile('Up to col widths',1);
 	if (!this.UpdateColWidths()) return;
 
+
 	if (this.Width == 'auto') {
 		this.Resize( this.GetAutoSize() );
 	}
@@ -295,49 +246,6 @@
 	this.TheGrid.style.left = (pos[0])+ 'px'
 	this.TheGrid.style.top = (pos[1]) + 'px'
 
-//	alert('MinWidths: '+this.MinWidths.length + ' vs Data ' + this.Header[0].length)
-	if (this.MinWidths.length < this.Header[0].length) {
-		var widths = new Array();
-		var total = 0;
-
-		StyleManager.ChangeStyle('td.grid-header-last-cell', 'width', '123px')
-		StyleManager.ChangeStyle('td.grid-data-last-cell', 'width', 'auto')
-		if (this.HasFooter()) {
-			StyleManager.ChangeStyle('td.grid-footer-last-cell', 'width', 'auto')
-		}
-
-		if (this.LeftCells) {
-			widths.push(this.LeftHeaderTable.clientWidth)
-		}
-
-		var header_widths = this.GetWidths('header_'+this.GridId);
-//		print_pre(header_widths)
-		var data_widths = this.GetWidths('data_'+this.GridId);
-//		print_pre(data_widths)
-
-		for (var i=0; i<header_widths.length; i++)
-		{
-			target = data_widths[i] ? data_widths[i] : header_widths[i];
-			if (target < header_widths[i]+20) target = header_widths[i]+20;
-			widths.push(target);
-			total += target;
-		}
-
-		this.MinWidths = widths;
-
-//		print_pre(this.MinWidths)
-
-		StyleManager.ChangeStyle('td.grid-header-last-cell', 'width', '100%')
-		StyleManager.ChangeStyle('td.grid-data-last-cell', 'width', '100%')
-		if (this.HasFooter()) {
-			StyleManager.ChangeStyle('td.grid-footer-last-cell', 'width', '100%')
-		}
-
-//		this.Render();
-
-		return false;
-	}
-
 	if (this.LeftCells != 0) {
 		this.SetHeights('left_header_'+this.GridId, this.GetHeights('header_'+this.GridId));
 		this.SetHeights('left_data_'+this.GridId, this.GetHeights('data_'+this.GridId));
@@ -411,17 +319,13 @@
 GridScroller.prototype.GetWidths = function(table_id)
 {
 	var table = document.getElementById(table_id);
-	table.style.width = 'auto'
-	var w = document.all ? window.document.body.offsetWidth : window.innerWidth
-	if (table.offsetWidth < screen.width * 0.8) {
-		table.style.width = Math.round( screen.width * 0.8 ) + 'px'
-	}
 	var widths = new Array();
-	var style;
 	if (!table.rows[0]) return [];
 	for (var col=0; col<table.rows[0].cells.length; col++)
 	{
-		widths.push( table.rows[0].cells[col].offsetWidth )
+		var tmp = getDimensions(table.rows[0].cells[col]);
+		widths.push( tmp.innerWidth )
+//		widths.push( table.rows[0].cells[col].offsetWidth )
 		if (table_id.match(/^header_/)) {
 //		alert('get ('+col+')'+table.rows[0].cells[col].innerHTML+' width '+table.rows[0].cells[col].offsetWidth)
 		}
@@ -468,15 +372,23 @@
 	if (w) this.Width = w;
 	if (h) this.Height = h;
 
-
+	var x,y;
 	pos = findPos(this.Dot)
+	x = pos[0];
+	y = pos[1];
 
-	this.TheGrid.style.left = (pos[0])+ 'px'
-	this.TheGrid.style.top = (pos[1]) + 'px'
+	this.TheGrid.style.left = (x)+ 'px'
+	this.TheGrid.style.top = (y) + 'px'
+//	alert('moved');
 
+//	alert('0');
+
 	this.MainOuter.style.height = (this.Height)+'px'
 	this.MainOuter.style.width = (this.Width)+'px'
 
+
+//	alert('1');
+
 	scroller_height = this.HeaderWidth > this.Width ? this.ScrollerH : 0;
 	scroller_width =  this.DataTotalHeight > this.Height - scroller_height ? this.ScrollerW : 0;
 	scroller_height = this.HeaderWidth > this.Width - scroller_width ? this.ScrollerH : 0;
@@ -486,6 +398,13 @@
 	this.HeadOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 	this.DataOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 
+//	alert('1.2');
+
+	this.TheGrid.style.width = (this.Width - scroller_width) + 'px';
+	this.TheGrid.style.height = (this.Height - scroller_height) + 'px';
+
+//	alert('1.5');
+
 	if (this.LeftCells != 0) {
 		this.LeftHeaderOuter.style.width = (this.LeftWidth) + 'px'
 		this.LeftDataOuter.style.width = (this.LeftWidth) + 'px'
@@ -494,6 +413,8 @@
 		}
 	}
 
+//	alert('2');
+
 	if (this.HasFooter()) {
 		this.FooterOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 	}
@@ -510,11 +431,13 @@
 		this.LeftDataOuter.style.height = adjusted_data_height + 'px'
 	}
 
+//	alert('3');
+
 	this.MainScroller.style.width = (this.HeadTable.offsetWidth + this.LeftWidth)+'px'
 	this.MainScroller.style.height = ( this.DataHeight + this.HeadHeight + this.FooterHeight)+'px'
 
-	this.TheGrid.style.width = (this.Width - scroller_width) + 'px';
-	this.TheGrid.style.height = (this.Height - scroller_height) + 'px';
+//	alert('4');
+
 }
 
 GridScroller.prototype.SyncScroll = function()
@@ -535,7 +458,7 @@
 {
 	var o = '';
 
-	o += this.CreateScroller( '<div id="main_scroller_'+this.GridId+'" style="background-color: inherit; position: relative; width: auto; z-index: 20;"><img src="'+this.Spacer+'" id="dot_'+this.GridId+'" width="200" height="200"><br/><br/></div>', 100, 100, 'main_'+this.GridId, false, 1 );
+	o += this.CreateScroller( '<div id="main_scroller_'+this.GridId+'" style="background-color: inherit; position: relative; width: auto; z-index: 20;"><img src="'+this.Spacer+'" id="dot_'+this.GridId+'" width="100" height="200"><br/><br/></div>', 100, 100, 'main_'+this.GridId, false, 1 );
 
 	o += '<div id="'+this.GridId+'" class="grid-container" style="background-color: inherit; top: 0px; visibility: hidden; z-index: 10; width: auto; height: '+300+'px; position: absolute; overflow: hidden;">';
 
@@ -578,6 +501,9 @@
 GridScroller.prototype.PrepareWidths = function()
 {
 	cache = getFrame('head').grid_widths_cache;
+	if (!isset(cache)) {
+		cache = new Object
+	}
 
 	if (this.MinWidths.length == this.Header[0].length) {
 		var has_all_widths = true;
@@ -592,16 +518,21 @@
 	}
 
 	if (cache[this.GridId+'_'+this.PickerCRC]) {
-		return cache[this.GridId+'_'+this.PickerCRC]
+		// return cache[this.GridId+'_'+this.PickerCRC]
 	}
 
+//	print_pre(this.MinWidths)
 	var o = '';
 	data = this.Header.concat(this.Data).concat(this.Footer);
 	o += this.GetTableCells(this.Header, [0,0,this.Header[0].length,this.Header.length], 'header', null, null, false, true)[0];
 	if (this.Data.length) {
-		o += this.GetTableCells(this.Data, [0,0,this.Data[0].length,this.Data.length], 'data', null, null, false, true)[0];
+		var data= this.GetTableCells(this.Data, [0,0,this.Data[0].length,this.Data.length], 'data', null, null, false, true)[0];
+		o += data;
 	}
-	o = '<table style="visibility: hidden; width: auto; border-collapse: collapse" id="tmp_'+this.GridId+'">'+o+'</table>'
+	var w = document.all ? window.document.body.offsetWidth : window.innerWidth
+	var table_width = w < 500 ? '1024px' : 'auto';
+//	console.log('tmp table width: %s (window width: %s)', table_width, w)
+	o = '<table style="visibility: hidden; width: '+table_width+'; border-collapse: collapse" id="tmp_'+this.GridId+'">'+o+'</table>'
 
 	document.write(o)
 	widths = this.GetWidths('tmp_'+this.GridId);
@@ -619,7 +550,8 @@
 	var tmp = this.GetIdAndClassName(class_mode);
 	var id = tmp[1];
 	var cells = this.GetTableCells(source, dim, class_mode, even_class, id_prefix);
-	return this.CreateScroller('<table style="width: 100%" id="'+id+'_'+this.GridId+'">'+cells[0]+'</table>', cells[1], 100, id+'_'+this.GridId, true, 5);
+	// var cells = this.GetTableCells(source, dim, class_mode, even_class, id_prefix, false, true);
+	return this.CreateScroller('<table style="table-layout: fixed; width: 100%;" id="'+id+'_'+this.GridId+'">'+cells[0]+'</table>', cells[1], 100, id+'_'+this.GridId, true, 5);
 }
 
 GridScroller.prototype.GetIdAndClassName = function(class_mode)
@@ -651,33 +583,40 @@
 	if (id_prefix==null) id_prefix = id;
 	var needs_last = needs_last == null ? (end_col == source[0].length) : needs_last;
 	var total_width = 0;
+	var width_printed =  false;
 	for (var row=start_row; row<end_row; row++) {
 		var rh = '';
 		var row_id = this.IDs[row] ? 'id="'+id_prefix+this.IDs[row]+'"' : '';
-		rh +='<tr '+row_id+' class="grid-'+class_name+'-row '+(even ? even_class : '')+' grid-'+class_name+'-row-'+row+'" sequence="'+(row+1)+'">'
+		rh +='<tr '+row_id+' class="grid-'+class_name+'-row '+(even ? even_class : '')+' grid-'+class_name+'-row-'+row+'" sequence="'+(row+1)+'">'+"\n"
 		even = !even;
 
 		total_width = 0;
 		for (var col=start_col; col<end_col; col++) {
 			if (is.gecko && id.match(/^header/)) {
-				var cursor_workaround = ['<div style="width: '+this.MinWidths[col]+'px; overflow: auto;">', '</div>'];
+				var cursor_workaround = ['<div style="width: '+(this.MinWidths[col])+'px; overflow: auto;">', '</div>'];
 			}
 			else {
 				var cursor_workaround = ['','']
 			}
-			width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-			total_width += this.MinWidths[col];
-			if (no_inner_div) {
-				rh += '<td class="grid-'+class_name+'-col-'+col+'">'+cursor_workaround[0]+source[row][col]+cursor_workaround[1]+'</td>'
+			if (!width_printed) {
+				var width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
+				total_width += this.MinWidths[col];
+//			if (no_inner_div) {
+				rh += "\t"+'<td style="width: '+width+';" class="grid-'+class_name+'-col-'+col+'">'+cursor_workaround[0]+source[row][col]+cursor_workaround[1]+'</td>'+"\n"
+//			}
+//			else {
+//				rh += '<td class="grid-'+class_name+'-col-'+col+'">'+cursor_workaround[0]+'<div class="grid-cell-div" style="width: '+width+';">'+source[row][col]+cursor_workaround[1]+'</div></td>'
+//			}
 			}
 			else {
-				rh += '<td class="grid-'+class_name+'-col-'+col+'">'+cursor_workaround[0]+'<div class="grid-cell-div" style="width: '+width+';">'+source[row][col]+cursor_workaround[1]+'</div></td>'
+				rh += "\t"+'<td class="grid-'+class_name+'-col-'+col+'">'+cursor_workaround[0]+source[row][col]+cursor_workaround[1]+'</td>'+"\n"
 			}
 		}
+		width_printed = true;
 		if (needs_last) {
-			rh += '<td class="grid-'+class_name+'-last-cell"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
+			rh += "\t"+'<td class="grid-'+class_name+'-last-cell"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'+"\n"
 		}
-		rh += '</tr>'
+		rh += '</tr>'+"\n"
 		o += rh;
 	}
 	return [o, total_width];
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/js/script.js
===================================================================
diff -u -r7701 -r7725
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7701)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7725)
@@ -1319,40 +1319,51 @@
 	return x1 + x2;
 }
 
-var last_shown_error = false;
-var errors = new Object();
-var first_error = new Object();
-var fields = new Object();
-var textareas100 = new Array();
-function show_form_error(prefix, field, sticky)
-{
-	if (isset(errors[prefix]) && isset(errors[prefix][field])) {
-		span = document.getElementById('error_msg_'+prefix);
-		span.innerHTML = fields[prefix][field] + ' - ' + errors[prefix][field];
-		if (sticky) last_shown_error = field;
+function getDimensions(obj) {
+	var style
+	if (obj.currentStyle) {
+		style = obj.currentStyle;
 	}
-}
-function hide_form_error(prefix)
-{
-	span = document.getElementById('error_msg_'+prefix);
-	if (!span) return;
-	span.innerHTML = '<br/>';
-	if (typeof(last_shown_error) != 'undefined' && last_shown_error) {
-		show_form_error(prefix, last_shown_error);
+	else {
+		style = getComputedStyle(obj,'');
 	}
+	padding = [parseInt(style.paddingTop), parseInt(style.paddingRight), parseInt(style.paddingBottom), parseInt(style.paddingLeft)]
+	border = [parseInt(style.borderTopWidth), parseInt(style.borderRightWidth), parseInt(style.borderBottomWidth), parseInt(style.borderLeftWidth)]
+	for (var i in padding)  if ( isNaN( padding[i] ) ) padding[i] = 0
+	for (var i in border)  if ( isNaN( border[i] ) ) border[i] = 0
+
+	var result = new Object();
+	result.innerHeight = obj.clientHeight - padding[0] - padding[2];
+	result.innerWidth = obj.clientWidth - padding[1] - padding[3];
+	result.padding = padding;
+	result.borders = border;
+
+	return result;
 }
-function add_form_error(prefix, field, element, error_msg) {
-	if (error_msg != '') {
-		if (typeof(errors[prefix]) == 'undefined') {
-			errors[prefix] = new Object();
+
+function findPos(obj) {
+	var curleft = curtop = 0;
+	if (obj.offsetParent) {
+		curleft = obj.offsetLeft
+		curtop = obj.offsetTop
+		while (obj = obj.offsetParent) {
+			curleft += obj.offsetLeft
+			curtop += obj.offsetTop
 		}
-		errors[prefix][field] = error_msg;
-		document.getElementById(element).onfocus = function() {
-			show_form_error(prefix, field, true)
-		};
-		document.getElementById(element).onblur = function() {last_shown_error = false};
-		if (typeof(first_error[prefix]) == 'undefined' || first_error[prefix] == false) {
-			first_error[prefix] = [field, element];
-		}
 	}
+	return [curleft,curtop];
+}
+
+function addLoadEvent(func) {
+  var oldonload = window.onload;
+  if (typeof window.onload != 'function') {
+    window.onload = func;
+  } else {
+    window.onload = function() {
+      if (oldonload) {
+        oldonload();
+      }
+      func();
+    }
+  }
 }
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r7701 -r7725
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7701)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7725)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="564" height="352"/>
+<inp2:adm_SetPopupSize width="550" height="425"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="0" prefix="u" title_preset="admins_edit"/>
 <!-- ToolBar --->
Index: branches/unlabeled/unlabeled-1.170.2/core/kernel/application.php
===================================================================
diff -u -r7643 -r7725
--- branches/unlabeled/unlabeled-1.170.2/core/kernel/application.php	(.../application.php)	(revision 7643)
+++ branches/unlabeled/unlabeled-1.170.2/core/kernel/application.php	(.../application.php)	(revision 7725)
@@ -1013,7 +1013,7 @@
 
 	function ProcessParsedTag($prefix, $tag, $params)
 	{
-		
+
 		$a_tag = new Tag('',$this->Parser);
 		$a_tag->Tag = $tag;
 		$tmp=$this->Application->processPrefix($prefix);
@@ -1664,7 +1664,7 @@
 	}
 
 
-	
+
 	function LoadCache() {
 		$cache_key = $this->GetVar('t').$this->GetVar('m_theme').$this->GetVar('m_lang').$this->IsAdmin();
 		$query = sprintf("SELECT PhraseList, ConfigVariables FROM %s WHERE Template = %s",
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r7698 -r7725
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7725)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="564" height="352"/>
+<inp2:adm_SetPopupSize width="550" height="400"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit"/>
 
@@ -61,14 +61,15 @@
 <inp2:u_ErrorWarning name="form_error_warning"/>
 <input type="hidden" name="user_group" value="11"/>
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table class="edit-form">
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
 		<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"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>
 
Index: branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r7701 -r7725
--- branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 7701)
+++ branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 7725)
@@ -105,7 +105,7 @@
 			$block_params['label'] = addslashes( $this->Application->Phrase($filter_params['label']) );
 			if (getArrayValue($view_filter,$filter_key)) {
 				$submit = 0;
-				if ($params['old_style']) {
+				if (isset($params['old_style'])) {
 					$status = $group_params['element_type'] == 'checkbox' ? 1 : 2;
 				}
 				else {
@@ -151,13 +151,32 @@
 			$block_params['sort_field'] = isset($options['sort_field']) ? $options['sort_field'] : $field;
 			$block_params['filter_field'] = isset($options['filter_field']) ? $options['filter_field'] : $field;
 
+			if (isset($options['filter_width'])) {
+				$block_params['filter_width'] = $options['filter_width'];
+			}
+			elseif (isset($options['width'])) {
+				if (preg_match('/range/', $options['filter_block'])) {
+					if ($options['width'] < 60) {
+						$options['width'] = 60;
+						$block_params['filter_width'] = 20;
+					}
+					else {
+						$block_params['filter_width'] = $options['width'] - 40;
+					}
+				}
+				else {
+					$block_params['filter_width'] = max($options['width']-10, 20);
+				}
+			}
+			if (isset($block_params['filter_width'])) $block_params['filter_width'] .= 'px';
+
 			$field_options = $this->Application->getUnitOption($this->Prefix.'.'.$field, 'Fields');
 			if (isset($field_options['use_phrases'])) {
 				$block_params['use_phrases'] = $field_options['use_phrases'];
 			}
 
 			$block_params['is_last'] = ($i == count($grid_config));
-			$block_params = array_merge($std_params, $block_params, $options);
+			$block_params = array_merge($std_params, $options, $block_params);
 			$o.= $this->Application->ParseBlock($block_params, 1);
 		}
 		return $o;