Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -r6938 -r7021
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 6938)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7021)
@@ -43,6 +43,8 @@
 	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;
 }
@@ -56,7 +58,7 @@
 	this.LeftCells = 0;
 	this.LeftWidth = 0;
 
-	this.BottomOffset = 5;
+	this.BottomOffset = 0;
 
 	this.Width = w;
 	this.Height = h;
@@ -93,6 +95,13 @@
 
 	this.TheGrid.style.visibility = 'visible'
 	this.MainScroller.style.visibility = 'visible'
+
+	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);
+	}
 }
 
 GridScroller.prototype.SetReferences = function() {
@@ -170,7 +179,7 @@
 	{
 //		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_cf*count;
-//		alert('sum = '+header_widths[i]+' * '+header_cf+' * '+count+' + '+data_widths[i]+' * '+data_cf+' * '+count+' = '+sum)
+//		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)
@@ -181,7 +190,7 @@
 		total += target;
 	}
 	this.MinDataWidth = total;
-	this.SetRowWidths('header_'+this.GridId, widths, total);
+	this.SetWidths('header_'+this.GridId, widths, total);
 	this.SetWidths('data_'+this.GridId, widths, total);
 
 	if (this.LeftCells != 0) {
@@ -248,6 +257,7 @@
 	for (var col=0; col<table.rows[row].cells.length-1; col++)
 	{
 		table.rows[row].cells[col].innerHTML = '<div style="width: '+(widths[col]) +'px; overflow: hidden; background-color: inherit;">' + table.rows[row].cells[col].innerHTML + '</div>'
+//		alert('setting '+widths[col]+' for col '+col)
 		table.rows[row].cells[col].style.width =  widths[col]+'px';
 //		alert('set ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+widths[col])
 	}
@@ -302,7 +312,7 @@
 	for (var col=0; col<table.rows[0].cells.length; col++)
 	{
 		widths.push( table.rows[0].cells[col].clientWidth )
-//		alert('get ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+table.rows[0].cells[col].offsetWidth)
+//		alert('get ('+col+')'+table.rows[0].cells[col].innerHTML+' width '+table.rows[0].cells[col].offsetWidth)
 	}
 	return widths;
 }
@@ -314,8 +324,11 @@
 	var h = document.body.clientHeight;
 
 	var pos = findPos(this.MainOuter);
-	h -= pos[1] + this.BottomOffset;
 
+	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]
 }
 
@@ -413,9 +426,9 @@
 	w = this.Width;
 	h = this.Height;
 	var o = '';
-	o += this.CreateScroller( '<div id="main_scroller_'+this.GridId+'" style="background-color: green; 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;"><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="top: 0px; visibility: hidden; z-index: 10; width: auto; height: '+300+'px; position: absolute; overflow: hidden;">';
+	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 ) : '';
@@ -424,7 +437,7 @@
 		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="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>'
@@ -485,7 +498,18 @@
 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++) {
+			o += '<td class="grid-header-'+col+'">'+this.Header[row][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
 
+	var o = '';
+
 	o += '<tr class="grid-header-row">'
 	for (var col=0; col<this.LeftCells; col++) {
 		o += '<td class="grid-header-col-'+col+'">'+this.Header[col]+'</td>'
@@ -526,13 +550,24 @@
 
 GridScroller.prototype.GetHeaderCells = function()
 {
-	var o = '<tr class="grid-header-row">'
+	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++) {
+			o += '<td class="grid-header-'+col+'">'+this.Header[row][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
+
+	/*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
+	return o*/
 }