Minor changes in taskcenter, impexp taskcenter module adjusted to new taskcenter

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@527 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php b/typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php
index 98c2240..891d606 100755 (executable)
--- a/typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php
+++ b/typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php
@@ -69,7 +69,7 @@ class tx_impexp_modfunc1 extends mod_user_task {
         * @param       object          Parent object
         * @return      string          HTML for the task center overview listing.
         */
-       function overview_main(&$pObj)  {
+       function overview_main()        {
 
                        // Create preset links:
                $presets = $this->getPresets();
@@ -85,13 +85,17 @@ class tx_impexp_modfunc1 extends mod_user_task {
                                                <td>'.($presetCfg['user_uid']===$GLOBALS['BE_USER']->user['uid'] ? '[Own]' : '&nbsp;').'</td>
                                        </tr>';
                        }
-                       $presets = '<table border="0" cellpadding="0" cellspacing="1" class="lrPadding">'.implode('',$opt).'</table>';
+                       if(sizeof($opt)>0) {
+                               $presets = '<table border="0" cellpadding="0" cellspacing="1" class="lrPadding">'.implode('',$opt).'</table>';
+                       } else {
+                               $presets = '';
+                       }
 
                        $icon = '<img src="'.$this->backPath.t3lib_extMgm::extRelPath('impexp').'export.gif" width="18" height="16" class="absmiddle" alt="" />';
-                       $content.= $pObj->doc->section($icon.'&nbsp;'.$this->headLink('tx_impexp_modfunc1',0),$presets,1,1,0,1);
+                       $config= $this->mkMenuConfig($icon.$this->headLink('tx_impexp_modfunc1',1),'',$presets);
                }
 
-               return $content;
+               return $config;
        }
 
        /**

diff --git a/typo3/sysext/taskcenter/task/class.mod_user_task.php b/typo3/sysext/taskcenter/task/class.mod_user_task.php
index 2adc6d6..56a50de 100755 (executable)
--- a/typo3/sysext/taskcenter/task/class.mod_user_task.php
+++ b/typo3/sysext/taskcenter/task/class.mod_user_task.php
@@ -76,8 +76,6 @@
                * @return void
                */
                function mod_user_task_init($BE_USER) {
-                       debug($BE_USER,'$BE_USER',__LINE__,__FILE__);
-
                        $this->BE_USER = $BE_USER;
                        $this->perms_clause = $this->BE_USER->getPagePermsClause(1);
                }
@@ -101,8 +99,6 @@
                * @return string  link (HTML) / name of module (regular string)
                */
                function headLink($key, $dontLink = false, $params = '') {
-                       debug($this->BE_USER->uc,'$this->BE_USER->uc',__LINE__,__FILE__);
-
                        $str = $GLOBALS['SOBE']->MOD_MENU['function'][$key];
                        if (!$dontLink) $str = '<a href="index.php?SET[function]='.$key.$params.'" onClick="this.blur();">'.htmlspecialchars($str).'</a>';
                        return $str;
@@ -191,7 +187,7 @@
                * @return string        code that inserts the iframe (HTML)
                */
                function urlInIframe($url) {
-                       return '<iframe src="'.$url.'" width="100%" height="100%" style="width: 100%; height: 1200px; border: none;" />';
+                       return '<iframe onLoad="this.height=this.contentDocument.height+30;" scrolling="auto" width="100%" src="'.$url.'" name="list_frame" style="border: none;" />';
                }
                 
                 

diff --git a/typo3/sysext/taskcenter/task/index.php b/typo3/sysext/taskcenter/task/index.php
index 2d41deb..2e23291 100755 (executable)
--- a/typo3/sysext/taskcenter/task/index.php
+++ b/typo3/sysext/taskcenter/task/index.php
@@ -75,9 +75,8 @@
                */
                function main() {
                        global $BE_USER, $LANG, $BACK_PATH, $TCA_DESCR, $TCA, $CLIENT, $TYPO3_CONF_VARS;
-                       debug($this->extClassConf, '$this->extClassConf', __LINE__, __FILE__);
-                       debug($this->allExtClassConf, '$this->allExtClassConf', __LINE__, __FILE__);
-                        
+
+
                        /* Setup document template */
                        $this->doc = t3lib_div::makeInstance('noDoc');
                        $this->doc->docType = 'xhtml_trans';
@@ -103,9 +102,9 @@
                        /* content... */
                        $this->content = '';
                        $this->content .= $this->doc->startPage($this->MOD_MENU['function'][$this->MOD_SETTINGS['function']]);
-                       $this->content .= '<table style="width: 100%"><tr>';
+                       $this->content .= '<table style="width: 100%;"><tr>';
                        $this->content .= '<td valign="top" style="width: 20%;">'.$this->getleftHeader().$this->getDynTabMenu().'</td>';
-                       $this->content .= '<td valign="top">'.$mainContent.'</td>';
+                       $this->content .= '<td valign="top" style="height:100%">'.$mainContent.'</td>';
                        $this->content .= '</tr></table>';
                }