Index: trunk/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r7635 -r7855
--- trunk/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7635)
+++ trunk/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 7855)
@@ -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,7 +154,6 @@
 		getFrame('head').ScrollerH = this.ScrollerH
 	}
 
-
 //	Profile('Up to col widths',1);
 	if (!this.UpdateColWidths()) return;
 
@@ -295,49 +245,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 +318,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 +371,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 +397,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 +412,8 @@
 		}
 	}
 
+//	alert('2');
+
 	if (this.HasFooter()) {
 		this.FooterOuter.style.width = (this.Width -scroller_width -this.LeftWidth)+ 'px';
 	}
@@ -510,11 +430,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 +457,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 +500,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 +517,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 +549,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 +582,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 style="width: '+(this.MinWidths[col])+'px; overflow: hidden;">', '</div></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];