Index: branches/RC/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r9359 -r9969
--- branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 9359)
+++ branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 9969)
@@ -154,9 +154,8 @@
 
 	this.PickerCRC = '';
 
-//	this.FixedHeights = true;
-	this.FixedHeaderHeights = [50,30];
-	this.FixedRowHeight = 25;
+	this.MaxHeaderHeights = [50,30];
+	this.MaxRowHeight = 45;
 }
 
 GridScroller.prototype.Render = function(id)
@@ -228,6 +227,7 @@
 		this.Resize();
 	}
 
+	this.AdjustInputWidths();
 	this.TheGrid.style.visibility = 'visible'
 	this.MainScroller.style.visibility = 'visible'
 //	Profile('Finalizng', 1);
@@ -393,7 +393,8 @@
 		// reseting heights
 		table1.rows[row].cells[0].style.height =  'auto';
 		table2.rows[row].cells[0].style.height =  'auto';
-
+		table1.rows[row].style.height = 'auto';
+		table2.rows[row].style.height = 'auto';
 		var height1_div = document.getElementById(table1_id+'_left_height_'+row);
 		if (height1_div) {
 			height1_div.style.height = 'auto';
@@ -407,7 +408,6 @@
 
 GridScroller.prototype.SetHeights = function(table1_id, table2_id)
 {
-	if (this.FixedHeights) return;
 	var table1 = document.getElementById(table1_id);
 	var table2 = document.getElementById(table2_id);
 	var height1_div, height2_div;
@@ -439,12 +439,12 @@
 		else {
 			if (!is.ie) { // firefox needs div, but it can display it as table-cell
 				var width = table.rows[row].cells[0].clientWidth;
-				table.rows[row].cells[0].innerHTML = '<div id="'+id+'_left_height_'+row+'" style="display: table-cell; background-color: inherit; width: '+width+'px; height: '+(the_height) +'px; overflow: hidden;">' + table.rows[row].cells[0].innerHTML + '</div>'
+//				table.rows[row].cells[0].innerHTML = '<div id="'+id+'_left_height_'+row+'" style="display: table-cell; background-color: inherit; width: '+width+'px; height: '+(the_height) +'px; overflow: hidden;">' + table.rows[row].cells[0].innerHTML + '</div>'
 			}
 		}
 		// IE can't display div as table-cell, but it respects the tr height
 		table.rows[row].cells[0].style.height =  the_height+'px';
-//		table.rows[row].style.height =  the_height+'px';
+		table.rows[row].style.height = the_height+'px';
 	}
 }
 
@@ -455,8 +455,9 @@
 	var height
 	for (var row=0; row<table.rows.length; row++)
 	{
-			height = getDimensions( table.rows[row].cells[0] ).innerHeight
-			heights.push( height )
+		var dim = getDimensions( table.rows[row].cells[0] );
+		height = dim.innerHeight + (is.ie ? 0 : dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2]);
+		heights.push( height )
 //			alert('get ('+row+')'+table.rows[row].cells[0].innerHTML+' height (offset/client/computed (coorection)): '+table.rows[row].cells[0].offsetHeight + '/' + table.rows[row].cells[0].clientHeight + '/ ' +height + ' ('+correction+')')
 	}
 	return heights;
@@ -570,6 +571,33 @@
 	return this.MinWidths[col];
 }
 
+GridScroller.prototype.AdjustInputWidths = function()
+{
+	var elems = new Array();
+	var inputs = this.HeadTable.getElementsByTagName('INPUT');
+	for (var i=0; i<inputs.length; i++) {elems[elems.length] = inputs[i];}
+	var selects = this.HeadTable.getElementsByTagName('SELECT');
+	for (var i=0; i<selects.length; i++) {elems[elems.length] = selects[i];}
+	if (this.LeftCells > 0) {
+		var left_inputs = this.LeftHeaderTable.getElementsByTagName('INPUT');
+		for (var i=0; i<left_inputs.length; i++) {elems[elems.length] = left_inputs[i];}
+		var left_selects = this.LeftHeaderTable.getElementsByTagName('SELECT');
+		for (var i=0; i<left_selects.length; i++) {elems[elems.length] = left_selects[i];}
+	}
+	var widths = new Array()
+	for (var i=0; i<elems.length; i++) {
+		elems[i].style.width = '1px';
+	}
+	for (var i=0; i<elems.length; i++) {
+		var input_dim = getDimensions(elems[i]);
+		var parent_dim = getDimensions(elems[i].parentNode);
+		widths[i] = (parent_dim.innerWidth - parent_dim.borders[1] - parent_dim.borders[3] - input_dim.borders[1] - input_dim.borders[3] - 2)+'px';
+	}
+	for (var i=0; i<elems.length; i++) {
+		elems[i].style.width = widths[i];
+	}
+}
+
 GridScroller.prototype.SetColWidth = function(col, width)
 {
 	if (col >= this.LeftCells) {
@@ -610,6 +638,7 @@
 
 		this.SetLeftWidth(new_left_total_w+left_diff);
 	}
+	this.AdjustInputWidths();
 
 	this.MinWidths[col] = width;
 	this.SetLeftHeights();
@@ -817,9 +846,9 @@
 	var footer_rows = this.Footer.length;
 
 	var header_h = 80;
-	if (this.FixedHeights) {
-		for (var i=0; i<this.FixedHeaderHeights.length; i++) {header_h += this.FixedHeaderHeights[i]};
-		header_h += this.FixedHeaderHeightCorrection;
+	if (this.LimitedHeights) {
+		for (var i=0; i<this.MaxHeaderHeights.length; i++) {header_h += this.MaxHeaderHeights[i]};
+		header_h += this.MaxHeaderHeightCorrection;
 	}
 	data_h = h - header_h;
 
@@ -956,40 +985,51 @@
 	var class_name = tmp[0];
 	var id = tmp[1];
 	if (id_prefix==null) id_prefix = id;
-	var needs_last = needs_last == null ? (end_col == source[0].length) : needs_last;
+	var needs_last = needs_last == null ? (end_col == (source[0].data ? source[0].data.length : source[0].length)) : needs_last;
 	var total_width = 0;
 	var width_printed = false;
-
+	
 	for (var row=start_row; row<end_row; row++) {
+		row_data = source[row].data ? source[row].data : source[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)+'">'+"\n"
+		
+		var row_class = 'grid-'+class_name+'-row '+(even ? even_class : '')+' grid-'+class_name+'-row-'+row + (source[row].row_class ? ' '+source[row].row_class : '');
+		rh +='<tr '+row_id+' class="'+row_class+'" sequence="'+(row+1)+'">'+"\n"
 		even = !even;
 
 		total_width = 0;
 
-		if (this.FixedHeights) {
-			var height_style = id.match(/^(left_)?header/) ? 'height: '+this.FixedHeaderHeights[row]+'px;' : 'height: '+this.FixedRowHeight+'px;';
+		if (this.LimitedHeights) {
+			var row_height = id.match(/^(left_)?header/) ? this.MaxHeaderHeights[row]+'px;' : this.MaxRowHeight+'px;'
+			var height_style = id.match(/^(left_)?header/) ? 'height: '+this.MaxHeaderHeights[row]+'px;' : 'height: '+this.MaxRowHeight+'px;';
 		}
 		else {
+			var row_height = 'auto'
 			var height_style = '';
 		}
 
 		for (var col=start_col; col<end_col; col++) {
 			total_width += this.MinWidths[col]+12;
 
 			var cursor_workaround = ['',''];
-			if (id.match(/^(left_)?header/)) {
-				if (is.gecko) {
-					var cursor_workaround = ['<div id="cursor_work_around_A_'+col+'_'+row+'" style="'+height_style+' width: '+(this.MinWidths[col])+'px; overflow: auto;"><div id="cursor_work_around_B_'+col+'_'+row+'" style="width: '+(this.MinWidths[col])+'px; overflow: hidden;">', '</div></div>'];
+			if (id.match(/^(left_)?header/) && is.gecko) {
+				cursor_workaround = ['<div id="cursor_work_around_A_'+col+'_'+row+'" style="width: '+(this.MinWidths[col])+'px; overflow: auto;"><div id="cursor_work_around_B_'+col+'_'+row+'" style="width: '+(this.MinWidths[col])+'px; overflow: hidden;">', '</div></div>'];
+			}
+			else {
+				if (this.LimitedHeights) {
+					cursor_workaround = ['<div id="_clipper_'+col+'_'+row+'" style="'+(is.ie ? '' : 'display: table-cell; ')+'vertical-align: inherit; overflow: hidden; max-height: '+row_height+'"><div style="overflow: hidden; max-height: '+row_height+'">','</div></div>'];
 				}
-				/*else {
-					var cursor_workaround = ['<div id="grid_'+id+'_'+this.GridId+'_cell_'+row+'_'+(col >= this.LeftCells ? col-this.LeftCells : col)+'" style="'+height_style+' width: 100%; overflow: hidden; background-color: yellow">','</div>']
-				}*/
 			}
 
-			var width_style = width_printed ? '' : 'style="width: '+this.MinWidths[col]+'px;"'
-			rh += "\t"+'<td '+width_style+' class="grid-'+class_name+'-col-'+col+'">'+cursor_workaround[0]+source[row][col]+cursor_workaround[1]+'</td>'+"\n"
+			var width_style = width_printed ? '' : 'width: '+this.MinWidths[col]+'px;"'
+			var td_style = 'style="overflow: hidden; max-height: '+row_height+'; '+width_style+'"';
+			var td_class = 'grid-'+class_name+'-col-'+col;
+			if (this.FieldNames) {
+				td_class += ' '+this.FieldNames[col];
+			}
+			rh += "\t"+'<td '+td_style+' class="'+td_class+'">'+cursor_workaround[0]+row_data[col]+cursor_workaround[1]+'</td>'+"\n"
 		}
 		width_printed = true; // print widths in first row only
 		if (needs_last) {
@@ -1047,7 +1087,7 @@
 GridScroller.prototype.SetHeader = function(a_header)
 {
 	this.Header = a_header;
-	this.FixedHeaderHeightCorrection = (6*this.Header.length)+1;
+	this.MaxHeaderHeightCorrection = (6*this.Header.length)+1;
 }
 
 GridScroller.prototype.SetFooter = function(a_footer)