Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -r7089 -r7102
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7089)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7102)
@@ -147,17 +147,26 @@
 }
 
 var profile = 0;
+var profile_total = 0;
 var startTime = new Date().getTime();
 
 function Profile(message,force)
 {
 	if (profile || force) {
 		endTime = new Date().getTime();
-		alert(message+' took '+(endTime-startTime)+' ms?')
+		var tmp = (endTime-startTime);
+		profile_total += tmp;
+		alert(message+' took '+tmp+' ms of '+profile_total)
 		startTime = new Date().getTime();
 	}
 }
 
+function ResetStart()
+{
+	startTime = new Date().getTime();
+	profile_total = 0;
+}
+
 function GridScroller(grid_id, w, h)
 {
 	this.GridId = grid_id
@@ -181,13 +190,20 @@
 	this.IDs = [];
 
 	this.Rendered = false;
+
+	this.PickerCRC = '';
 }
 
 GridScroller.prototype.Render = function(id)
 {
-//	alert('rendering '+( id ? id : 'defulat'))
-	startTime = new Date().getTime();
-	html = this.GetHTML();
+	ResetStart();
+
+//	var widths = this.PrepareWidths();
+//	this.MinWidths = [40,null,null,250]
+	this.MinWidths = this.PrepareWidths(); // [50,70,90,150,150,110,70,111];
+
+	html = this.AltHTML();
+//	Profile('Getting HTML',1);
 	if (id && id != '') {
 		document.getElementById(id).innerHTML = '<div id="main_div_'+this.GridId+'">'+html+'</div>';
 		execJS(document.getElementById(id))
@@ -200,17 +216,26 @@
 		document.write('<div id="main_div_'+this.GridId+'">'+html+'</div>');
 	}
 	this.Rendered = true;
-	Profile('Preparing HTML and writing it')
+	this.SetReferences()
+
 	document.body.style.height = '100%';
 	document.body.style.overflow = 'hidden';
 	document.body.scroll = 'no'
-	this.SetReferences()
 
-	this.ScrollerW = this.MainInner.offsetWidth - this.MainInner.clientWidth
-	this.ScrollerH = this.MainInner.offsetHeight - this.MainInner.clientHeight
+	if (getFrame('head').ScrollerW) {
+		this.ScrollerW = getFrame('head').ScrollerW;
+		this.ScrollerH = getFrame('head').ScrollerH;
+	}
+	else {
+		this.ScrollerW = this.MainInner.offsetWidth - this.MainInner.clientWidth
+		this.ScrollerH = this.MainInner.offsetHeight - this.MainInner.clientHeight
+		getFrame('head').ScrollerW = this.ScrollerW
+		getFrame('head').ScrollerH = this.ScrollerH
+	}
 
+
+//	Profile('Up to col widths',1);
 	if (!this.UpdateColWidths()) return;
-//	Profile('UpdateColWidths');
 
 	if (this.Width == 'auto') {
 		this.Resize( this.GetAutoSize() );
@@ -219,18 +244,30 @@
 		this.Resize();
 	}
 
-//	Profile('Resizing');
-
 	this.TheGrid.style.visibility = 'visible'
 	this.MainScroller.style.visibility = 'visible'
+//	Profile('Finalizng', 1);
 
 	var the_grid = this;
 	if (document.all) {
 		$status = window.attachEvent('onresize', function(ev) { the_grid.AutoResize() });
 	} else {
 		$status = window.addEventListener('resize', function(ev) { the_grid.AutoResize() }, true);
 	}
-	Profile('Finalizng', 0);
+	if (document.all) {
+		this.DataScroller.onmousewheel = function(ev) {
+			var e = document.all ? window.event : ev;
+			this.TheGrid.MainInner.scrollTop += -e.wheelDelta/2
+			this.TheGrid.SyncScroll();
+		}
+	}
+	else {
+		this.DataScroller.addEventListener("DOMMouseScroll", function(ev) {
+			var e = document.all ? window.event : ev;
+			this.TheGrid.MainInner.scrollTop += e.detail*10
+			this.TheGrid.SyncScroll();
+		}, false);
+	}
 }
 
 
@@ -272,20 +309,18 @@
 
 	this.DataScroller.TheGrid = this;
 	this.MainInner.TheGrid = this;
-
 	this.Dot = document.getElementById('dot_'+this.GridId)
 
-	// this.MainOuter.style.border = '5px solid red';
-	// this.MainOuter.style.padding = '30px';
-
 	this.MainOuter.className = 'grid-scrollable'
 	if (!is.ie) {
 		this.MainOuter.style.marginLeft = '-1px';
 	}
-
 }
 
 GridScroller.prototype.UpdateColWidths = function() {
+	pos = findPos(this.Dot)
+	this.TheGrid.style.left = (pos[0])+ 'px'
+	this.TheGrid.style.top = (pos[1]) + 'px'
 
 	var data_cf = 1;
 	var count = 1;
@@ -309,7 +344,9 @@
 		}
 
 		var header_widths = this.GetWidths('header_'+this.GridId);
+//		print_pre(header_widths)
 		var data_widths = this.GetWidths('data_'+this.GridId);
+//		print_pre(data_widths)
 
 		/*if (this.HasFooter()) {
 			var footer_widths = this.GetWidths('footer_'+this.GridId);
@@ -320,63 +357,34 @@
 		for (var i=0; i<header_widths.length; i++)
 		{
 			target = data_widths[i] ? data_widths[i] : header_widths[i];
-			if (target < header_widths[i]) target = 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();
+//		this.Render();
 		return false;
 	}
 
-	/*for (var i=0; i<header_widths.length; i++)
-	{
-//		target = Math.max( Math.max(header_widths[i], data_widths[i]), footer_widths[i]);
-		var sum = header_widths[i]*header_cf*count + (data_widths[i] ? data_widths[i]*data_cf*count : header_widths[i]*data_cf*count);
-		alert('sum ('+i+') = '+header_widths[i]+' * '+header_cf+' * '+count+' + '+data_widths[i]+' * '+data_cf+' * '+count+' = '+sum)
-		if (this.HasFooter()) {
-			sum += footer_widths[i]*footer_cf*count;
-			alert('sum + '+footer_widths[i]+' * '+footer_cf+' * '+count+' = '+sum)
-		}
-		target = Math.round( sum / count )
-		widths.push(target);
-//		alert('target: '+target)
-		total += target;
-	}
-	*/
-
-	Profile('Getting widths');
-
-//	preg_print_pre(widths)
-//	this.MinDataWidth = total;
-//	this.SetWidths('header_'+this.GridId, widths, 0, -1);
-//	this.SetWidths('data_'+this.GridId, widths, 0, -1);
-
 	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));
 		if (this.HasFooter()) {
 			this.SetHeights('left_footer_'+this.GridId, this.GetHeights('footer_'+this.GridId));
 		}
-
-//		alert('setting left widths')
-//		this.SetWidths('left_header_'+this.GridId, [30], 0, 1);
-//		this.SetWidths('left_data_'+this.GridId, [30], 0, 1);
 	}
 
-//	this.HeadTable.style.width = '100%'
-
 	if (this.HasFooter()) {
-		this.SetRowWidths('footer_'+this.GridId, widths);
-		this.FooterTable.style.width = '100%'
 		this.FooterHeight = this.FooterTable.offsetHeight;
 		this.FooterOuter.style.height = this.FooterHeight + 'px'
 	}
@@ -403,90 +411,26 @@
 
 	this.MainOuter.style.width = 'auto'
 
-	if (document.all) {
-		this.DataScroller.onmousewheel = function(ev) {
-			var e = document.all ? window.event : ev;
-			this.TheGrid.MainInner.scrollTop += -e.wheelDelta/2
-			this.TheGrid.SyncScroll();
-		}
-	}
-	else {
-		this.DataScroller.addEventListener("DOMMouseScroll", function(ev) {
-			var e = document.all ? window.event : ev;
-			this.TheGrid.MainInner.scrollTop += e.detail*10
-			this.TheGrid.SyncScroll();
-		}, false);
-	}
+	this.HeaderWidth = this.HeadTable.offsetWidth + this.LeftWidth;
+	this.DataTotalHeight = this.DataHeight + this.HeadHeight + this.FooterHeight;
 
 	return true;
 }
 
-GridScroller.prototype.SetRowWidths = function(table_id, widths, row, from, to)
-{
-	if (!row) row = 0;
-	table = document.getElementById(table_id);
-	var inner_width = 0;
-	var final_width;
-	if (!from) from = 0;
-	if (!to) {
-		to = table.rows[row].cells.length;
-	}
-	else {
-		if (to < 0) {
-			to = table.rows[row].cells.length + to; // + because to is negative!
-		}
-	}
-	var min_offset = 0;
-	if (!table_id.match(/^left_/)) {
-		min_offset = this.LeftCells;
-	}
-//	alert('table: '+table_id+' min_offset: '+min_offset)
-//	alert('from: '+from+' to '+to)
-	for (var col=from; col < to; col++)
-	{
-		final_width = widths[col];
-
-//		alert('col: '+col)
-		if ( this.MinWidths[col+min_offset] && (final_width < this.MinWidths[col+min_offset])) {
-//			alert('correcting minwidth of '+col+': '+this.MinWidths[col]+ ' / '+final_width)
-			final_width = this.MinWidths[col+min_offset]
-		}
-		table.rows[row].cells[col].innerHTML = '<div style="width: '+(final_width) +'px; overflow: hidden; background-color: yellow;">' + table.rows[row].cells[col].innerHTML + '</div>'
-//		alert('setting '+widths[col]+' for col '+col)
-//		if (isNaN(final_width)) {
-//						alert('set '+table_id+'col '+col+' '+table.rows[0].cells[col].innerHTML+' to '+widths[col])
-//		}
-		table.rows[row].cells[col].style.width =  final_width+'px';
-
-//			alert('set ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+widths[col])
-	}
-}
-
 GridScroller.prototype.SetHeights = function(table_id, heights)
 {
 	var table = document.getElementById(table_id);
 	for (var row=0; row<table.rows.length; row++)
 	{
 		var width = this.MinWidths[0] ? this.MinWidths[0] + 'px' : 'auto';
-		table.rows[row].cells[0].innerHTML = '<div style="display: table-cell; line-height: '+(heights[row])+'px; height: '+(heights[row]) +'px; width: '+width+'; overflow: hidden; background-color: inherit;">' + table.rows[row].cells[0].innerHTML + '</div>'
+		table.rows[row].cells[0].innerHTML = '<div style="background-color: inherit; display: table-cell; line-height: '+(heights[row])+'px; height: '+(heights[row]) +'px; width: '+width+'; overflow: hidden; background-color: inherit;">' + table.rows[row].cells[0].innerHTML + '</div>'
 		table.rows[row].cells[0].style.height =  heights[row]+'px';
 //		heights.push( table.rows[0].cells[0].offsetHeight )
 //		alert('get ('+row+')'+table.rows[0].cells[0].innerHTML+' height '+table.rows[0].cells[0].offsetHeight)
 	}
 //	return heights;
 }
 
-GridScroller.prototype.SetWidths = function(table_id, widths, from, to)
-{
-	var table = document.getElementById(table_id);
-	table.style.layout = 'fixed'
-	for (var row=0; row<1; row++)
-	{
-		this.SetRowWidths(table_id, widths, row, from, to)
-	}
-	table.style.width = '100%'
-}
-
 GridScroller.prototype.GetHeights = function(table_id)
 {
 	var table = document.getElementById(table_id);
@@ -506,16 +450,19 @@
 {
 	var table = document.getElementById(table_id);
 	table.style.width = 'auto'
-	if (table.offsetWidth < document.body.clientWidth * 0.8) {
-		table.style.width = Math.round( document.body.clientWidth * 0.8 ) + 'px'
+	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 )
+		if (table_id.match(/^header_/)) {
 //		alert('get ('+col+')'+table.rows[0].cells[col].innerHTML+' width '+table.rows[0].cells[col].offsetWidth)
+		}
 	}
 	return widths;
 }
@@ -531,7 +478,6 @@
 	var dim = getDimensions(this.MainOuter);
 
 	h -= pos[1] + dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2] + this.BottomOffset;
-
 	return [w,h]
 }
 
@@ -553,36 +499,25 @@
 
 GridScroller.prototype.Resize = function(w,h)
 {
-	Profile('Resize 0')
 	if (typeof(w) == 'object') {
 		h = w[1];
 		w = w[0];
 	}
 	if (w) this.Width = w;
 	if (h) this.Height = h;
 
-	pos = findPos(this.Dot)
-
 	this.MainOuter.style.height = (this.Height)+'px'
 	this.MainOuter.style.width = (this.Width)+'px'
 
-	var data_width = this.DataTable.offsetWidth + this.LeftWidth;
-	var data_height = this.DataHeight + this.HeadHeight + this.FooterHeight;
+	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;
 
-	scroller_height = data_width > this.Width ? this.ScrollerH : 0;
-	scroller_width =  data_height > this.Height - scroller_height ? this.ScrollerW : 0;
-	scroller_height = data_width > this.Width - scroller_width ? this.ScrollerH : 0;
+//	alert('min: '+this.MinDataWidth+' pos: '+pos[0]+','+pos[1]+' scroller W x H: '+scroller_width+' x '+scroller_height+' will resize to '+this.Width+' x '+this.Height+' data: '+this.HeaderWidth+' x '+this.DataHeight)
 
-//	alert('min: '+this.MinDataWidth+' pos: '+pos[0]+','+pos[1]+' scroller W x H: '+scroller_width+' x '+scroller_height+' will resize to '+this.Width+' x '+this.Height+' data: '+data_width+' x '+data_height)
-
-	this.TheGrid.style.left = (pos[0])+ 'px'
-	this.TheGrid.style.top = (pos[1]) + 'px'
-
 	this.HeadOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 	this.DataOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 
-	Profile('Resize 0.3')
-
 	if (this.LeftCells != 0) {
 		this.LeftHeaderOuter.style.width = (this.LeftWidth) + 'px'
 		this.LeftDataOuter.style.width = (this.LeftWidth) + 'px'
@@ -591,42 +526,27 @@
 		}
 	}
 
-	Profile('Resize 1')
-
 	if (this.HasFooter()) {
 		this.FooterOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 	}
 
-	Profile('Resize 1.1')
-
-	if (data_height < this.Height - scroller_height) {
-		var adjusted_data_height = data_height - this.HeadHeight - this.FooterHeight
+	if (this.DataTotalHeight < this.Height - scroller_height) {
+		var adjusted_data_height = this.DataTotalHeight - this.HeadHeight - this.FooterHeight
 	}
 	else {
 		var adjusted_data_height = this.Height - this.HeadHeight - this.FooterHeight - scroller_height
 	}
 
-	Profile('Resize 1.2')
-
 	this.DataOuter.style.height = adjusted_data_height + 'px'
 	if (this.LeftCells != 0) {
 		this.LeftDataOuter.style.height = adjusted_data_height + 'px'
 	}
 
-	Profile('Resize 2')
-
 	this.MainScroller.style.width = (this.HeadTable.offsetWidth + this.LeftWidth)+'px'
-	this.MainScroller.style.height = ( this.DataTable.offsetHeight + this.HeadHeight + this.FooterHeight)+'px'
+	this.MainScroller.style.height = ( this.DataHeight + this.HeadHeight + this.FooterHeight)+'px'
 
-
-	Profile('Resize 0.1')
-
 	this.TheGrid.style.width = (this.Width - scroller_width) + 'px';
 	this.TheGrid.style.height = (this.Height - scroller_height) + 'px';
-
-	Profile('Resize 0.2')
-
-	Profile('Full resize')
 }
 
 GridScroller.prototype.SyncScroll = function()
@@ -643,28 +563,37 @@
 	}
 }
 
-GridScroller.prototype.GetHTML = function()
+GridScroller.prototype.AltHTML = function()
 {
-	w = this.Width;
-	h = this.Height;
 	var o = '';
-	o += this.CreateScroller( '<div id="main_scroller_'+this.GridId+'" style="background-color: inherit; position: relative; width: auto;"><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="200" 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;">';
-	var header = this.CreateScroller( this.CreateTable( this.GetHeaderCells(), 'header_'+this.GridId), 100, 10, 'header_'+this.GridId, true, 5 )
-	var data = this.CreateScroller( this.CreateTable( this.GetDataCells(), 'data_'+this.GridId ), 100, 10, 'data_'+this.GridId, true, 5  )
-	var footer = this.HasFooter() ? this.CreateScroller( this.CreateTable( this.GetFooterCells(), 'footer_'+this.GridId ), 100, 10, 'footer_'+this.GridId, true, 5 ) : '';
 
+	var header_rows = this.Header.length;
+	var cols = this.Header[0].length;
+	var data_rows = this.Data.length;
+	var header = this.GetTableWithScroller(this.Header, [this.LeftCells, 0, cols, header_rows], 'header')
+	var data = this.GetTableWithScroller(this.Data, [this.LeftCells, 0, cols, data_rows], 'data', 'grid-data-row-even', '')
+	var footer = this.HasFooter() ? this.GetTableWithScroller(this.Footer, [this.LeftCells], 'footer') : '';
+
+	var left_header = this.GetTableWithScroller(this.Header, [0,0,this.LeftCells, header_rows], ['header','left_header'])
+	var left_data = this.GetTableWithScroller(this.Data, [0,0,this.LeftCells, data_rows], ['data','left_data'], 'grid-data-row-even', 'left_')
+	var left_footer = this.GetTableWithScroller(this.Footer, [0,0,this.LeftCells], ['footer','left_footer'])
+
+	/*var css = '';
+	for (var i=0;i<this.Header[0].length; i++) {
+		css += '.width-adj-grid-col-'+i+' {} ';
+	}
+	o += '<style type="text/css">'+css+'</style>';*/
+
 	if (this.LeftCells != 0) {
-		var left_header = this.CreateScroller( this.CreateTable( this.GetLeftHeader(), 'left_header_'+this.GridId), 20, 10, 'left_header_'+this.GridId, true, 5 )
-		var left_data = this.CreateScroller( this.CreateTable( this.GetLeftData(), 'left_data_'+this.GridId), 20, 10, 'left_data_'+this.GridId, true, 5 )
-		var left_footer = this.CreateScroller( this.CreateTable( this.GetLeftFooter(), 'left_footer_'+this.GridId), 20, 10, 'left_footer_'+this.GridId, true, 5 )
-		o += '<table style="width: 100%; border-collapse: collapse;">'
+		o += '<table style="background-color: inherit; width: 100%; border-collapse: collapse;">'
 		o += '<tr><td style="vertical-align: top; margin: 0px; padding: 0px;">' + left_header + '</td>'
 		o += '<td style="vertical-align: top; margin: 0px; padding: 0px;">' + header + '</td></tr>'
 		o += '<tr><td style="vertical-align: top; margin: 0px; padding: 0px">' + left_data + '</td>'
 		o += '<td style="vertical-align: top; margin: 0px; padding: 0px">' + data + '</td></tr>'
-
 		if (this.HasFooter()) {
 			o += '<tr><td style="vertical-align: top; margin: 0px; padding: 0px">' + left_footer + '</td>'
 			o += '<td style="vertical-align: top; margin: 0px; padding: 0px">' + footer + '</td></tr>'
@@ -675,21 +604,110 @@
 		o += header + data + footer;
 	}
 	o += '</div>';
+	return o;
+}
 
-	return o
+GridScroller.prototype.PrepareWidths = function()
+{
+	cache = getFrame('head').grid_widths_cache;
+	if (cache[this.GridId+'_'+this.PickerCRC]) {
+		return cache[this.GridId+'_'+this.PickerCRC]
+	}
+
+	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];
+	}
+	o = '<table style="visibility: hidden; width: auto; border-collapse: collapse" id="tmp_'+this.GridId+'">'+o+'</table>'
+
+	document.write(o)
+	widths = this.GetWidths('tmp_'+this.GridId);
+//	print_pre(widths)
+
+	tmp_el = document.getElementById('tmp_'+this.GridId);
+	var p = tmp_el.parentNode;
+	p.removeChild(tmp_el);
+	cache[this.GridId+'_'+this.PickerCRC] = widths;
+	return widths;
 }
 
+GridScroller.prototype.GetTableWithScroller = function(source, dim, class_mode, even_class, id_prefix)
+{
+	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);
+}
 
-GridScroller.prototype.HasFooter = function()
+GridScroller.prototype.GetIdAndClassName = function(class_mode)
 {
-	return (this.Footer != false)
+	if (typeof(class_mode)=='object') {
+		var class_name = class_mode[0];
+		var id = class_mode[1]
+	}
+	else {
+		var class_name = class_mode;
+		var id = class_mode;
+	}
+	return [class_name, id]
 }
 
-GridScroller.prototype.CreateTable = function(content, id)
+GridScroller.prototype.GetTableCells = function(source, dim, class_mode, even_class, id_prefix, needs_last, no_inner_div)
 {
-	return '<table style="width: 100%" id="'+id+'">'+content+'</table>';
+	if (!source.length) return ['', 0];
+	var o = '';
+	var start_col = dim[0];
+	var start_row = dim[1];
+	var end_col = dim[2];
+	var end_row = dim[3];
+	var even = false;
+	if (!even_class) even_class = '';
+	var tmp = this.GetIdAndClassName(class_mode);
+	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 total_width = 0;
+	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)+'">'
+		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>'];
+			}
+			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>'
+			}
+			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>'
+			}
+		}
+		if (needs_last) {
+			rh += '<td class="grid-'+class_name+'-last-cell"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
+		}
+		rh += '</tr>'
+		o += rh;
+	}
+	return [o, total_width];
 }
 
+
+GridScroller.prototype.HasFooter = function()
+{
+	return (this.Footer != false)
+}
+
 GridScroller.prototype.CreateScroller = function(content, w, h, id, hidden, z)
 {
 	if (hidden) {
@@ -717,108 +735,6 @@
 	return o
 }
 
-GridScroller.prototype.GetLeftHeader = function()
-{
-	var o = '';
-	for (var row in this.Header) {
-		o +='<tr class="grid-header-row grid-header-row-'+row+'">'
-		for (var col=0; col<this.LeftCells; col++) {
-			width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-			o += '<td class="grid-header-col-'+col+'"><div class="grid-cell-div" style="width: '+width+';">'+this.Header[row][col]+'</div></td>'
-		}
-		o += '</tr>'
-	}
-	return o
-}
-
-GridScroller.prototype.GetLeftData = function()
-{
-	var o = '';
-	var even = false;
-	for (var row in this.Data) {
-		var id = this.IDs[row] ? 'id="left_'+this.IDs[row]+'"' : '';
-		o += even ? '<tr class="grid-row grid-row-even grid-row-'+row+'" '+id+'>' : '<tr class="grid-row grid-row-'+row+'" '+id+'>'
-		even = !even;
-		for (var col=0; col<this.LeftCells; col++) {
-			width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-			o += '<td class="grid-col-'+col+'"><div class="grid-cell-div" style="width: '+width+';">'+this.Data[row][col]+'</div></td>'
-		}
-		o += '</tr>'
-	}
-
-	return o
-}
-
-GridScroller.prototype.GetLeftFooter = function()
-{
-	var o = '';
-	if (this.HasFooter()) {
-		o += '<tr class="grid-footer-row">'
-		for (var col=0; col<this.LeftCells; col++) {
-			width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-			o += '<td class="grid-footer-col-'+col+'"><div class="grid-cell-div" style="width: '+width+';">'+this.Footer[col]+'</div></td>'
-		}
-		o += '</tr>'
-	}
-	return o
-}
-
-GridScroller.prototype.GetHeaderCells = function()
-{
-	var o = '';
-	for (var row in this.Header) {
-		o +='<tr class="grid-header-row grid-header-row-'+row+'">'
-		for (var col=this.LeftCells; col<this.Header[row].length; col++) {
-			width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-			o += '<td class="grid-header-col-'+col+'"><div style="width: '+width+'; overflow: auto;"><div class="grid-cell-div" style="background-color: inherit; width: '+width+';">'+this.Header[row][col]+'</div></div></td>'
-		}
-		o += '<td class="grid-header-last-cell"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
-		o += '</tr>'
-	}
-	return o
-
-	/*var o = '<tr class="grid-header-row">'
-	for (var col=this.LeftCells; col<this.Header.length; col++) {
-		o += '<td class="grid-header-col-'+col+'">'+this.Header[col]+'</td>'
-	}
-	o += '<td class="grid-header-last-cell" style="width: auto"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
-	o += '</tr>'
-	return o*/
-}
-
-
-GridScroller.prototype.GetDataCells = function()
-{
-	var o = '';
-	var even = false;
-	var width;
-
-	for (var row in this.Data) {
-		var id = this.IDs[row] ? 'id="'+this.IDs[row]+'"' : '';
-		o += even ? '<tr class="grid-row grid-row-even grid-row-'+row+'" '+id+' sequence="'+(row+1)+'">' : '<tr class="grid-row grid-row-'+row+'" '+id+' sequence="'+(row+1)+'">'
-		even = !even;
-		for (var col=this.LeftCells; col<this.Data[row].length; col++) {
-			width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-			o += '<td class="grid-col-'+col+'"><div class="grid-cell-div" style="width: '+width+';">'+this.Data[row][col]+'</div></td>'
-		}
-		o += '<td class="grid-data-last-cell"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
-		o += '</tr>'
-	}
-	return o
-}
-
-GridScroller.prototype.GetFooterCells = function()
-{
-	var o = '<tr class="grid-footer-row">'
-	for (var col=this.LeftCells; col<this.Footer.length; col++) {
-		width = this.MinWidths[col] ? this.MinWidths[col] + 'px' : 'auto';
-		o += '<td class="grid-footer-col-'+col+'">'+this.Footer[col]+'</td>'
-	}
-	o += '<td class="grid-footer-last-cell" style="width: 100%"><img src="'+this.Spacer+'" width="1" height="1" alt=""/></td>'
-	o += '</tr>'
-	return o
-}
-
 GridScroller.prototype.SetData = function(a_data)
 {
 	this.Data = a_data;