Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/forms.js
===================================================================
diff -u -r7735 -r7737
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/forms.js	(.../forms.js)	(revision 7735)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/forms.js	(.../forms.js)	(revision 7737)
@@ -52,34 +52,32 @@
 {
 	this.Div = document.getElementById(id);
 
+	for (var i in this.Controls) {
+		dim = getDimensions(document.getElementById(this.Controls[i]));
+		this.MinControlsHeight += dim.innerHeight;
+//		alert('adding element '+this.Controls[i]+' height: '+dim.innerHeight+' total: '+this.MinControlsHeight)
+	}
+
 	document.body.style.height = '100%';
 	document.body.style.overflow = 'hidden';
 	document.body.scroll = 'no'
 
-	if (this.Wrap) {
-		o += '<div style="position: relative; overflow: auto; width: 100%; height: 100%;">';
-		o += this.Div.innerHTML + '</div><script type="text/javascript">Form.Resize()</script>';
-		el.innerHTML = o;
-	}
+	var a_div = document.createElement('DIV');
+	a_div.style.position = 'relative';
+	a_div.style.overflow = 'auto';
+	a_div.style.width = '100%';
+	a_div.style.height = '100%';
 
+	a_div.appendChild(el.parentNode.replaceChild(a_div, el))
+
 	this.Table = this.Div.getElementsByTagName('table')[0];
 	this.Table.style.height = 'auto';
 	this.MinHeight = this.Table.offsetHeight;
 	this.MinWidth = this.Table.offsetWidth;
 
-	//we need to init form BEFORE executing JS, becasue JS adds controls to Form object
-	if (this.Wrap) {
-		execJS(el)
-	}
-	else {
-		this.Resize()
-	}
-
 	addEvent(window, 'resize', function() {Form.Resize()})
 
-	if (is.ie) {
-		this.Resize()
-	};
+	this.Resize()
 
 	if (isset(first_error)) {
 			for (var i in first_error) {
@@ -93,13 +91,8 @@
 }
 
 Form.addControl = function(id, coeff) {
-	if (this.Wrap && !this.Div) return;
-
 	this.Controls.push(id);
-	this.Coeffs[id] = coeff ? coeff : 1;
-	dim = getDimensions(document.getElementById(id));
-	this.MinControlsHeight += dim.innerHeight;
-//	alert('adding element '+id+' height: '+dim.innerHeight+' total: '+this.MinControlsHeight)
+	this.Coeffs[id] = coeff ? coeff : 1; // for future use
 }
 
 Form.Resize = function()