Skip to content

Commit

Permalink
Merge pull request #41 from se7enxweb/7x-responsive-redesign-admin-20…
Browse files Browse the repository at this point in the history
…240822-1055-bugfix

Updated: Bugfix for default menu state and how it is used to set the …
  • Loading branch information
se7enxweb authored Aug 23, 2024
2 parents 6083bf9 + fff6613 commit f083d0a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions design/admin3/templates/pagelayout.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
$content_edit = and( $ui_context_edit, eq( $ui_component, 'content' ) )
$hide_left_menu = first_set( $module_result.content_info.persistent_variable.left_menu, $content_edit|not )|not
$hide_right_menu = first_set( $module_result.content_info.persistent_variable.extra_menu, $ui_context_edit|not )|not
$edit_menu_collapsed = cond( ezpreference( 'admin_edit_menu_collapsed' ), 1, 1 )
$edit_menu_collapsed = cond( ezpreference( 'admin_edit_menu_collapsed' ), 1, 0 )
$collapse_left_menu = cond( ezpreference( 'admin_left_menu_show' ), 1, 1 )
$collapse_right_menu = ezpreference( 'admin_right_menu_show' )|not
$admin_left_size = ezpreference( 'admin_left_menu_size' )
Expand Down Expand Up @@ -129,7 +129,7 @@ YUI(YUI3_config).use('ezcollapsiblemenu', 'event', 'io-ez', function (Y) {
// workaround to http://yuilibrary.com/projects/yui3/ticket/2531641
// for IE, margin has to be set in px
fullStyle: {marginLeft: '-30px'},
collapsedStyle: {}
collapsedStyle: {marginLeft: '-30px'}
}],
callback: function () {
var p = 1;
Expand Down Expand Up @@ -244,7 +244,7 @@ YUI(YUI3_config).use('ezcollapsiblemenu', 'event', 'io-ez', function (Y) {
{if $hide_left_menu}
{include uri='design:page_mainarea.tpl'}
{else}
<div id="maincontent">
<div id="maincontent"{if $edit_menu_collapsed} style="margin-left: -34px; margin-right:-8px"{/if}>
<div id="maincontent-design" class="float-break"><div id="fix">
<div id="path">
Expand Down

0 comments on commit f083d0a

Please sign in to comment.