Fixed bug #14553: topFrameH configuration option doesn't work anymore (Thanks to...

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

diff --git a/ChangeLog b/ChangeLog
index 235d40f..93f331d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 
 2010-05-31  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #14553: topFrameH configuration option doesn't work anymore (Thanks to Stefan Galinski)
        * Fixed bug #14530: Missing icons in new BE skin (sprites) v7
        * Fixed bug #14547: Flags in localization view (list view) have no title
        * Fixed bug #14530: Missing icons in new BE skin (sprites) v6

diff --git a/typo3/backend.php b/typo3/backend.php
index 62d0e44..f7db92c 100644 (file)
--- a/typo3/backend.php
+++ b/typo3/backend.php
@@ -373,6 +373,7 @@ class TYPO3backend {
                        'veriCode' => $GLOBALS['BE_USER']->veriCode(),
                        'denyFileTypes' => PHP_EXTENSIONS_DEFAULT,
                        'moduleMenuWidth' => $this->menuWidth - 1,
+                       'topBarHeight' => (int) $GLOBALS['TBE_STYLES']['dims']['topFrameH'],
                        'showRefreshLoginPopup' => isset($GLOBALS['TYPO3_CONF_VARS']['BE']['showRefreshLoginPopup']) ? intval($GLOBALS['TYPO3_CONF_VARS']['BE']['showRefreshLoginPopup']) : FALSE,
                );
                $t3LLLcore = array(

diff --git a/typo3/js/extjs/viewport.js b/typo3/js/extjs/viewport.js
index 072341f..e81c826 100644 (file)
--- a/typo3/js/extjs/viewport.js
+++ b/typo3/js/extjs/viewport.js
@@ -89,8 +89,10 @@ TYPO3.Viewport = Ext.extend(Ext.Viewport, {
         * @return void
         */
        initComponent: function() {
-               // adjust the width of module menu
+               // adjust the width of module menu and the height of the topbar
+               this.initialConfig.items[0].height = TYPO3.configuration.topBarHeight;
                this.initialConfig.items[1].width = TYPO3.configuration.moduleMenuWidth;
+
                // call parent constructor
                TYPO3.Viewport.superclass.initComponent.apply(this, arguments);
 

diff --git a/typo3/js/extjs/viewportConfiguration.js b/typo3/js/extjs/viewportConfiguration.js
index 8c61abc..6cb6a4c 100644 (file)
--- a/typo3/js/extjs/viewportConfiguration.js
+++ b/typo3/js/extjs/viewportConfiguration.js
@@ -37,8 +37,10 @@ TYPO3.Viewport.configuration = {
        renderTo: Ext.getBody(),
        border: false,
        items: [{
+               layout: 'absolute',
                region: 'north',
                id: 'typo3-topbar',
+               height: 42,
                contentEl: 'typo3-top-container',
                border: false
        }, {

diff --git a/typo3/stylesheets/structure/topbar.css b/typo3/stylesheets/structure/topbar.css
index 2093aa4..227c745 100644 (file)
--- a/typo3/stylesheets/structure/topbar.css
+++ b/typo3/stylesheets/structure/topbar.css
@@ -4,10 +4,6 @@ Topbar (whole upper area), containts Logo and toolbar
 $Id$
 - - - - - - - - - - - - - - - - - - - - - */
 
-#typo3-topbar {
-       height: 42px;
-}
-
 #typo3-logo {
        float: left;
 }
\ No newline at end of file

diff --git a/typo3/sysext/t3skin/ext_tables.php b/typo3/sysext/t3skin/ext_tables.php
index 5774373..13df89f 100644 (file)
--- a/typo3/sysext/t3skin/ext_tables.php
+++ b/typo3/sysext/t3skin/ext_tables.php
@@ -84,7 +84,7 @@ if (TYPO3_MODE == 'BE' || (TYPO3_MODE == 'FE' && isset($GLOBALS['BE_USER']) && $
 
                // Alternative dimensions for frameset sizes:
        $TBE_STYLES['dims']['leftMenuFrameW'] = 190;            // Left menu frame width
-       $TBE_STYLES['dims']['topFrameH']      = 45;                     // Top frame heigth
+       $TBE_STYLES['dims']['topFrameH']      = 42;                     // Top frame height
        $TBE_STYLES['dims']['navFrameWidth']  = 280;            // Default navigation frame width
 
                // Setting roll-over background color for click menus:

diff --git a/typo3/sysext/t3skin/stylesheets/structure/topbar.css b/typo3/sysext/t3skin/stylesheets/structure/topbar.css
index dabd473..b300b5d 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/structure/topbar.css
+++ b/typo3/sysext/t3skin/stylesheets/structure/topbar.css
@@ -5,7 +5,6 @@ $Id$
 - - - - - - - - - - - - - - - - - - - - - */
 
 #typo3-topbar {
-       height: 42px;
        z-index: 200;
 }