From 230a70c02a55d971598b6e13baf7ea7012284316 Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Tue, 24 Mar 2009 08:23:09 +0000
Subject: [PATCH] merge open/modules/cms/branches/2.3 changeset 73452

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73582 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/ModelAdmin.css        | 2 +-
 javascript/LeftAndMain.js | 5 ++++-
 javascript/ModelAdmin.js  | 8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/css/ModelAdmin.css b/css/ModelAdmin.css
index 0c1b690d..56ea7ef9 100644
--- a/css/ModelAdmin.css
+++ b/css/ModelAdmin.css
@@ -98,7 +98,7 @@ body.ModelAdmin #right table.results td.active {
 }
 
 body.ModelAdmin #right .tab {
-	overflow: hidden;
+	overflow: auto;
 	padding-bottom: 20px;
 }
 
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index d7daa023..13520a7e 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -155,6 +155,9 @@ window.onresize = function(init) {
 
 	if(typeof fitToParent == 'function') {
 		fitToParent('right', 12);
+		if($('ModelAdminPanel')) {
+			fitToParent('ModelAdminPanel',-30);
+		}
 		if($('contentPanel')) {
 			fitToParent('contentPanel', 12);
 		}
@@ -172,7 +175,7 @@ window.onresize = function(init) {
 	}
 
 	if(typeof fitToParent == 'function') {
-		fitToParent('Form_EditForm');
+		fitToParent('Form_EditForm', -20);
 		if($('Form_EditorToolbarImageForm') && $('Form_EditorToolbarImageForm').style.display == "block") {
 			fitToParent('Form_EditorToolbarImageForm', 5);
 			fitToParent($('Form_EditorToolbarImageForm').getElementsByTagName('fieldset')[0]);
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index 7a9f7541..af6fb1a1 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -30,7 +30,13 @@ $(document).ready(function() {
 	 * Attach tabs plugin to the set of search filter and edit forms
 	 */
 	$('ul.tabstrip').livequery(function() {
-	    $(this).tabs();
+	    $(this).tabs({
+			// This show handler is necessary to get tabs working properly with the crappy old layout_helpers.js layout
+			// manager
+			show : function() {
+				if(window.onresize) window.onresize();
+			}
+		});
 	});
 
     /*