Index: branches/5.2.x/core/admin_templates/js/forms.js
===================================================================
diff -u -N -r15856 -r16570
--- branches/5.2.x/core/admin_templates/js/forms.js (.../forms.js) (revision 15856)
+++ branches/5.2.x/core/admin_templates/js/forms.js (.../forms.js) (revision 16570)
@@ -301,15 +301,17 @@
// alert('h after correction is '+h);
- /*
- // use this 2 lines, instead of next 3 lines, when scrolling without popups needed
- var w = $(window.document.body).outerWidth(false);
- w -= ($div.outerWidth() - $div.width());*/
+ if ( use_popups() && window.name.match(/[\d]+$/) ) {
+ window.document.body.style.width = '100%';
+ var w = (document.all ? window.document.body.offsetWidth : window.innerWidth);
- window.document.body.style.width = '100%';
- var w = (document.all ? window.document.body.offsetWidth : window.innerWidth);
+ w -= pos.left + ($div.outerWidth() - $div.width());
+ }
+ else {
+ var w = $(window.document.body).outerWidth(false);
- w -= pos.left + ($div.outerWidth() - $div.width());
+ w -= ($div.outerWidth() - $div.width());
+ }
scroller_height = this.MinWidth > w ? this.ScrollerH : 0; // width of 1st table in scroll_container is larger, then window width?
scroller_width = this.MinHeight > h - scroller_height ? this.ScrollerW : 0; // table height > total height - scroller_height -> vertical scroller is found
@@ -424,4 +426,4 @@
}
}
return used;
-};
\ No newline at end of file
+};
Index: branches/5.2.x/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -N -r16339 -r16570
--- branches/5.2.x/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 16339)
+++ branches/5.2.x/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 16570)
@@ -1,38 +1,27 @@
-
-
-
-
-
-
@@ -56,4 +39,4 @@