Fix: compatibility with ecm layout

This commit is contained in:
Regis Houssin 2010-11-02 09:48:05 +00:00
parent 263827df1e
commit c8cee36b03
3 changed files with 29 additions and 29 deletions

View File

@ -320,9 +320,9 @@ html, body {
<SCRIPT type=\"text/javascript\"> <SCRIPT type=\"text/javascript\">
jQuery(document).ready(function () { jQuery(document).ready(function () {
jQuery('#containerlayout').layout({ jQuery('#containerlayout').layout({
center__paneSelector: \".ui-layout-center\" center__paneSelector: \"#ecm-layout-center\"
, north__paneSelector: \".ui-layout-north\" , north__paneSelector: \"#ecm-layout-north\"
, west__paneSelector: \".ui-layout-west\" , west__paneSelector: \"#ecm-layout-west\"
, resizable: true , resizable: true
, north__size: 34 , north__size: 34
, north__resizable: false , north__resizable: false
@ -335,9 +335,9 @@ html, body {
, useStateCookie: true , useStateCookie: true
}); });
jQuery('div.ui-layout-center').layout({ jQuery('#ecm-layout-center').layout({
center__paneSelector: \".ui-in-layout-center\" center__paneSelector: \".ecm-in-layout-center\"
, south__paneSelector: \".ui-in-layout-south\" , south__paneSelector: \".ecm-in-layout-south\"
, resizable: false , resizable: false
, south__minSize: 32 , south__minSize: 32
, south__resizable: false , south__resizable: false
@ -391,7 +391,7 @@ if ($conf->use_javascript_ajax)
{ {
?> ?>
<div id="containerlayout"> <div id="containerlayout">
<div class="pane ui-layout-north toolbar"> <div id="ecm-layout-north" class="pane toolbar">
<?php <?php
} }
else else
@ -431,7 +431,7 @@ if ($conf->use_javascript_ajax)
?> ?>
</div> </div>
<div class="pane ui-layout-west"> <div id="ecm-layout-west" class="pane">
<?php <?php
} }
else else
@ -793,9 +793,9 @@ if ($conf->use_javascript_ajax)
?> ?>
</div> </div>
<div class="pane ui-layout-center"> <div id="ecm-layout-center" class="pane">
<div class="pane-in ui-in-layout-center"> <div class="pane-in ecm-in-layout-center">
<?php <?php
} }
else else
@ -823,7 +823,7 @@ if ($conf->use_javascript_ajax)
{ {
?> ?>
</div> </div>
<div class="pane-in ui-in-layout-south"> <div class="pane-in ecm-in-layout-south">
<?php <?php
} }
else else
@ -850,9 +850,9 @@ if ($conf->use_javascript_ajax)
</div> </div>
</div> </div>
<!-- <div class="pane ui-layout-east"></div> --> <!-- <div class="pane ecm-layout-east"></div> -->
<!-- <div class="pane ui-layout-south"></div> --> <!-- <div class="pane ecm-layout-south"></div> -->
</div> </div>

View File

@ -666,7 +666,7 @@ td.photo {
/* /*
* PANES and CONTENT-DIVs * PANES and CONTENT-DIVs
*/ */
.ui-layout-pane { /* all 'panes' */ #containerlayout .ui-layout-pane { /* all 'panes' */
background: #FFF; background: #FFF;
border: 1px solid #BBB; border: 1px solid #BBB;
/* DO NOT add scrolling (or padding) to 'panes' that have a content-div, /* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
@ -676,7 +676,7 @@ td.photo {
overflow: auto; overflow: auto;
} }
/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */ /* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
.ui-layout-content { #containerlayout .ui-layout-content {
padding: 10px; padding: 10px;
position: relative; /* contain floated or positioned elements */ position: relative; /* contain floated or positioned elements */
overflow: auto; /* add scrolling to content-div */ overflow: auto; /* add scrolling to content-div */

View File

@ -650,7 +650,7 @@ td.photo {
/* /*
* PANES and CONTENT-DIVs * PANES and CONTENT-DIVs
*/ */
.ui-layout-pane { /* all 'panes' */ #containerlayout .ui-layout-pane { /* all 'panes' */
background: #FFF; background: #FFF;
border: 1px solid #BBB; border: 1px solid #BBB;
/* DO NOT add scrolling (or padding) to 'panes' that have a content-div, /* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
@ -660,7 +660,7 @@ td.photo {
overflow: auto; overflow: auto;
} }
/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */ /* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
.ui-layout-content { #containerlayout .ui-layout-content {
padding: 10px; padding: 10px;
position: relative; /* contain floated or positioned elements */ position: relative; /* contain floated or positioned elements */
overflow: auto; /* add scrolling to content-div */ overflow: auto; /* add scrolling to content-div */