mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
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
This commit is contained in:
parent
031b88d0f3
commit
230a70c02a
@ -98,7 +98,7 @@ body.ModelAdmin #right table.results td.active {
|
||||
}
|
||||
|
||||
body.ModelAdmin #right .tab {
|
||||
overflow: hidden;
|
||||
overflow: auto;
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
|
@ -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]);
|
||||
|
@ -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();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user