* Fixed bug #6961: Errors in link creation popup window
[Packages/TYPO3.CMS.git] / typo3 / alt_doc.php
index 1b85fbb..feb08e7 100755 (executable)
@@ -432,8 +432,7 @@ class SC_alt_doc {
                        // If empty string it's just a variable, that'll be saved.
                        // Values NOT in this array will not be saved in the settings-array for the module.
                $this->MOD_MENU = array(
-                       'showPalettes' => '',
-                       'showDescriptions' => ''
+                       'showPalettes' => ''
                );
 
                        // Setting virtual document name
@@ -538,7 +537,7 @@ class SC_alt_doc {
                        $this->tceforms->clipObj->initializeClipboard();        // Initialize - reads the clipboard content from the user session
 
                                // Setting external variables:
-                       if ($BE_USER->uc['edit_showFieldHelp']!='text' && $this->MOD_SETTINGS['showDescriptions'])      $this->tceforms->edit_showFieldHelp='text';
+                       $this->tceforms->edit_showFieldHelp = $BE_USER->uc['edit_showFieldHelp'];
 
                        if ($this->editRegularContentFromId)    {
                                $this->editRegularContentFromId();
@@ -965,7 +964,7 @@ class SC_alt_doc {
        <div id="typo3-docheader">
                <div id="typo3-docheader-row1">
                        <div class="buttonsleft">'.$btns['save'].$btns['save_view'].$btns['save_close'].$btns['save_new'].'</div>
-                       <div class="buttonsright">'.$docSel.$cMenu.$btns['delete'].$btns['shortcut'].$btns['history'].$btns['undo'].$btns['close'].'</div>
+                       <div class="buttonsright">'.$docSel.$cMenu.$btns['delete'].$btns['shortcut'].$btns['history'].$buttons['columns_only'].$btns['undo'].$btns['close'].'</div>
                </div>
                ';
 
@@ -1035,21 +1034,12 @@ class SC_alt_doc {
         * @return      string          HTML for function menus.
         */
        function functionMenus()        {
-               global $BE_USER,$LANG;
-
-               $funcMenus = '';
+               global $LANG;
 
                        // Show palettes:
-               $funcMenus.= '<br /><br />'.t3lib_BEfunc::getFuncCheck('','SET[showPalettes]',$this->MOD_SETTINGS['showPalettes'],'alt_doc.php',t3lib_div::implodeArrayForUrl('',array_merge($this->R_URL_getvars,array('SET'=>''))),'id="checkShowPalettes"').'<label for="checkShowPalettes">'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPalettes',1).'</label>';
-
-                       // Show descriptions/help texts:
-               if ($BE_USER->uc['edit_showFieldHelp']!='text') {
-                       $funcMenus.= '<br />'.t3lib_BEfunc::getFuncCheck('','SET[showDescriptions]',$this->MOD_SETTINGS['showDescriptions'],'alt_doc.php',t3lib_div::implodeArrayForUrl('',array_merge($this->R_URL_getvars,array('SET'=>''))),'id="checkShowDescriptions"').'<label for="checkShowDescriptions">'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showDescriptions',1).'</label>';
-               }
-
                return '
                                <!-- Function menus (checkboxes for selecting options): -->
-                               '.$funcMenus;
+                               <br /><br />'.t3lib_BEfunc::getFuncCheck('','SET[showPalettes]',$this->MOD_SETTINGS['showPalettes'],'alt_doc.php',t3lib_div::implodeArrayForUrl('',array_merge($this->R_URL_getvars,array('SET'=>''))),'id="checkShowPalettes"').'<label for="checkShowPalettes">'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPalettes',1).'</label>';
        }