Fixed bug #65: Thumbnails in Element Browser are only displayed if fileSuffix is...
[Packages/TYPO3.CMS.git] / typo3 / class.browse_links.php
index 10de7d0..c81752c 100755 (executable)
@@ -234,14 +234,14 @@ class TBE_browser_recordList extends localRecordList {
        }
 
        /**
-        * Returns the title (based on $code) of a table ($table) without a link
+        * Local version that sets allFields to true to support userFieldSelect
         *
-        * @param       string          Table name
-        * @param       string          Table label
-        * @return      string          The linked table label
+        * @return      void
+        * @see fieldSelectBox
         */
-       function linkWrapTable($table,$code)    {
-               return $code;
+       function generateList() {
+               $this->allFields = true;
+               parent::generateList();
        }
 }
 
@@ -958,7 +958,7 @@ class browse_links {
 
                        // This is JavaScript especially for the TBE Element Browser!
                $formFieldName = 'data['.$pArr[0].']['.$pArr[1].']['.$pArr[2].']';
-               
+
                        // insertElement - Call check function (e.g. for uniqueness handling):
                if ($pArr[4] && $pArr[5]) {
                        $JScodeCheck = '
@@ -1013,7 +1013,7 @@ class browse_links {
                                        focusOpenerAndClose(close);
                        ';
                }
-               
+
                $JScode.='
                        var elRef="";
                        var targetDoc="";
@@ -1448,6 +1448,8 @@ class browse_links {
                $pagetree = t3lib_div::makeInstance('TBE_PageTree');
                $pagetree->thisScript=$this->thisScript;
                $pagetree->ext_pArrPages = !strcmp($pArr[3],'pages')?1:0;
+               $pagetree->ext_showNavTitle = $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.showNavTitle');
+               $pagetree->addField('nav_title');
                $tree=$pagetree->getBrowsableTree();
 
                        // Making the list of elements, if applicable:
@@ -1515,7 +1517,7 @@ class browse_links {
                        $_MCONF['name']='file_list';
                        $_MOD_SETTINGS = t3lib_BEfunc::getModuleData($_MOD_MENU, t3lib_div::_GP('SET'), $_MCONF['name']);
                        $addParams = '&act='.$this->act.'&mode='.$this->mode.'&expandFolder='.rawurlencode($path).'&bparams='.rawurlencode($this->bparams);
-                       $thumbNailCheck = t3lib_BEfunc::getFuncCheck('','SET[displayThumbs]',$_MOD_SETTINGS['displayThumbs'],$this->thisScript,$addParams).' '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.php:displayThumbs',1);
+                       $thumbNailCheck = t3lib_BEfunc::getFuncCheck('','SET[displayThumbs]',$_MOD_SETTINGS['displayThumbs'],$this->thisScript,$addParams,'id="checkDisplayThumbs"').' <label for="checkDisplayThumbs">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.php:displayThumbs',1).'</label>';
                } else {
                        $thumbNailCheck='';
                }
@@ -1735,6 +1737,12 @@ class browse_links {
 
                                //      Add the HTML for the record list to output variable:
                        $out.=$dblist->HTMLcode;
+
+                               // Add support for fieldselectbox in singleTableMode
+                       if ($dblist->table) {
+                               $out.= $dblist->fieldSelectBox($dblist->table);
+                       }
+
                        $out.=$dblist->getSearchBox();
                }
 
@@ -1890,7 +1898,7 @@ class browse_links {
                                $fI=pathinfo($filepath);
 
                                        // Thumbnail/size generation:
-                               if (t3lib_div::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'],$fI['extension']) && !$noThumbs)      {
+                               if (t3lib_div::inList(strtolower($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']),strtolower($fI['extension'])) && !$noThumbs)      {
                                        $imgInfo = $imgObj->getImageDimensions($filepath);
                                        $pDim = $imgInfo[0].'x'.$imgInfo[1].' pixels';
                                        $clickIcon = t3lib_BEfunc::getThumbNail($BACK_PATH.'thumbs.php',$filepath,'hspace="5" vspace="5" border="1"');
@@ -2284,7 +2292,7 @@ class browse_links {
 
                $code.='
                        <div id="c-override">
-                               <input type="checkbox" name="overwriteExistingFiles" value="1" /> '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:overwriteExistingFiles',1).'
+                               <input type="checkbox" name="overwriteExistingFiles" id="overwriteExistingFiles" value="1" /> <label for="overwriteExistingFiles">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:overwriteExistingFiles',1).'</label>
                        </div>
                ';