Index: locallang_csh_pm.xml =================================================================== --- locallang_csh_pm.xml (revision 28405) +++ locallang_csh_pm.xml (working copy) @@ -16,6 +16,7 @@ + Index: mod1/class.tx_templavoila_mod1_localization.php =================================================================== --- mod1/class.tx_templavoila_mod1_localization.php (revision 28405) +++ mod1/class.tx_templavoila_mod1_localization.php (working copy) @@ -184,6 +184,23 @@ '; } + // enable/disable structure inheritance - see #7082 for details + if ($BE_USER->isAdmin() && $this->pObj->rootElementLangMode=='inheritance') { + $link = '\'index.php?'.$this->pObj->link_getParameters().'&SET[disablePageStructureInheritance]='.($this->pObj->MOD_SETTINGS['disablePageStructureInheritance']=='1'?'0':'1').'\''; + $output.= ' + + + '. t3lib_BEfunc::cshItem('_MOD_web_txtemplavoilaM1', 'disablePageStructureInheritance', $this->doc->backPath) .' + + '.$LANG->getLL ('pageLocalizationMode_inheritance.disableInheritance', 1).': + + + pObj->MOD_SETTINGS['disablePageStructureInheritance']=='1'?' checked="checked"':'').'/> + + + '; + } + $output .= ' Index: mod1/index.php =================================================================== --- mod1/index.php (revision 28405) +++ mod1/index.php (working copy) @@ -259,7 +259,8 @@ 'clip' => '', 'langDisplayMode' => '', 'recordsView_table' => '', - 'recordsView_start' => '' + 'recordsView_start' => '', + 'disablePageStructureInheritance' => '' ); // Hook: menuConfig_preProcessModMenu @@ -932,6 +933,14 @@ $langChildren = intval($elementContentTreeArr['ds_meta']['langChildren']); $langDisable = intval($elementContentTreeArr['ds_meta']['langDisable']); + //if page DS and the checkbox is not set use always langDisable in inheritance mode + //danielp + if ($elementContentTreeArr['el']['table']=='pages') { + if ($langDisable!=1 && $this->MOD_SETTINGS['disablePageStructureInheritance']!='1' && $langChildren==1) { + $langDisable=1; + } + } + $lKey = $langDisable ? 'lDEF' : ($langChildren ? 'lDEF' : 'l'.$languageKey); $vKey = $langDisable ? 'vDEF' : ($langChildren ? 'v'.$languageKey : 'vDEF'); Index: mod1/locallang.xml =================================================================== --- mod1/locallang.xml (revision 28405) +++ mod1/locallang.xml (working copy) @@ -50,6 +50,7 @@ +