[FEATURE] Reports interface standardize
authorFelix Kopp <felix-source@phorax.com>
Sun, 5 Feb 2012 23:39:09 +0000 (00:39 +0100)
committerSteffen Ritter <info@rs-websystems.de>
Mon, 13 Feb 2012 08:23:59 +0000 (09:23 +0100)
Move extension name from docHeader function menu to module header.
Standardize font size and margins.

Change-Id: Ife66ae85889502e19db23cace75a020ed1019763
Fixes: #33695
Releases: 4.7
Reviewed-on: http://review.typo3.org/8853
Reviewed-by: Tolleiv Nietsch
Tested-by: Tolleiv Nietsch
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
typo3/sysext/reports/mod/index.php
typo3/sysext/reports/mod/mod_styles.css

index 4c6ca10..a12edcd 100644 (file)
@@ -126,8 +126,7 @@ class tx_reports_Module extends t3lib_SCbase {
                }
 
                        // compile document
                }
 
                        // compile document
-               $markers['FUNC_MENU'] = $GLOBALS['LANG']->getLL('choose_report')
-                       . t3lib_BEfunc::getFuncMenu(
+               $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu(
                                0,
                                'SET[function]',
                                $this->MOD_SETTINGS['function'],
                                0,
                                'SET[function]',
                                $this->MOD_SETTINGS['function'],
@@ -135,11 +134,13 @@ class tx_reports_Module extends t3lib_SCbase {
                        );
                $markers['CONTENT'] = $this->content;
 
                        );
                $markers['CONTENT'] = $this->content;
 
-                               // Build the <body> for the module
+                       // Build the <body> for the module
+
                $this->content = $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
                $this->content = $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
+
                        // Renders the module page
                $this->content = $this->doc->render(
                        // Renders the module page
                $this->content = $this->doc->render(
-                       $GLOBALS['LANG']->getLL('title'),
+                       '',
                        $this->content
                );
        }
                        $this->content
                );
        }
@@ -159,31 +160,31 @@ class tx_reports_Module extends t3lib_SCbase {
         * @return      void
         */
        protected function renderModuleContent() {
         * @return      void
         */
        protected function renderModuleContent() {
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
+
                $action  = (string) $this->MOD_SETTINGS['function'];
                $title   = '';
                $content = '';
 
                if ($action == 'index') {
                $action  = (string) $this->MOD_SETTINGS['function'];
                $title   = '';
                $content = '';
 
                if ($action == 'index') {
-                       $content = $this->indexAction();
-                       $title   = $GLOBALS['LANG']->getLL('reports_overview');
+                       $content .= $this->indexAction();
+                       $title = $GLOBALS['LANG']->getLL('reports_overview');
                } else {
                } else {
-                       $content = '';
                        list($extensionKey, $reportName) = explode('.', $action, 2);
 
                        $reportClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports'][$extensionKey][$reportName]['report'];
                        list($extensionKey, $reportName) = explode('.', $action, 2);
 
                        $reportClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports'][$extensionKey][$reportName]['report'];
-                       $title       = $GLOBALS['LANG']->sL($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports'][$extensionKey][$reportName]['title']);
+                       $title = $GLOBALS['LANG']->sL($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports'][$extensionKey][$reportName]['title']);
 
                        $reportInstance = t3lib_div::makeInstance($reportClass, $this);
 
                        if ($reportInstance instanceof tx_reports_Report) {
 
                        $reportInstance = t3lib_div::makeInstance($reportClass, $this);
 
                        if ($reportInstance instanceof tx_reports_Report) {
-                               $content = $reportInstance->getReport();
+                               $content .= $reportInstance->getReport();
                        } else {
                        } else {
-                               $content = $reportClass . ' does not implement the Report Interface which is necessary to be displayed here.';
+                               $content .= $reportClass . ' does not implement the Report Interface which is necessary to be displayed here.';
                        }
                }
 
                        }
                }
 
-               $this->content .= $this->doc->header($title);
-               $this->content .= $this->doc->section('', $content, FALSE, TRUE);
+               $this->content .= $this->doc->section($title, $content, FALSE, TRUE);
        }
 
        /**
        }
 
        /**
index d1bbcbf..b5d17f9 100644 (file)
@@ -4,7 +4,6 @@ body#ext-reports-mod-index-php {
 }
 
 #typo3-inner-docbody p.help {
 }
 
 #typo3-inner-docbody p.help {
-       font-size: 12px;
        margin-bottom: 10px;
 }
 
        margin-bottom: 10px;
 }
 
@@ -13,10 +12,9 @@ body#ext-reports-mod-index-php {
 /* status report */
 
 #ext-reports-mod-index-php h2.section-header {
 /* status report */
 
 #ext-reports-mod-index-php h2.section-header {
-       margin: 15px 0;
+       margin: 15px 0 10px 0;
        padding: 2px 0 0 20px;
        cursor: pointer;
        padding: 2px 0 0 20px;
        cursor: pointer;
-       height: 20px;
        clear: left;
 }
 #ext-reports-mod-index-php h2.collapsed {
        clear: left;
 }
 #ext-reports-mod-index-php h2.collapsed {