Fixed bug #8153: [left frame-width] left frame too small for german users, credits...

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

diff --git a/ChangeLog b/ChangeLog
index bcef014..bb2bb63 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-22  Ingo Renner  <ingo@typo3.org>
+
+       * Fixed bug #8153: [left frame-width] left frame too small for german users, credits Steffen Kamper
+
 2008-04-22  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #8182: Fatal error on calling sysLog() of lock object if locking method is unknown

diff --git a/typo3/backend.php b/typo3/backend.php
index d4d31ba..b130931 100644 (file)
--- a/typo3/backend.php
+++ b/typo3/backend.php
@@ -59,6 +59,8 @@ class TYPO3backend {
        protected $js;
        protected $jsFiles;
        protected $toolbarItems;
+       private   $menuWithDefault = 160; // intentionally private as nobody should modify defaults
+       protected $menuWith;
 
        /**
         * Object for loading backend modules
@@ -111,6 +113,11 @@ class TYPO3backend {
 
                $this->toolbarItems = array();
                $this->initializeCoreToolbarItems();
+
+               $this->menuWith = $this->menuWithDefault;
+               if (isset($GLOBALS['TBE_STYLES']['dims']['leftMenuFrameW']) && $GLOBALS['TBE_STYLES']['dims']['leftMenuFrameW'] != (int) $this->menuWith) {
+                       $this->menuWith = $GLOBALS['TBE_STYLES']['dims']['leftMenuFrameW'];
+               }
        }
 
        /**
@@ -157,6 +164,19 @@ class TYPO3backend {
 
                $menu         = $this->moduleMenu->render();
 
+               if ($this->menuWith != $this->menuWithDefault) {
+                       $this->css .= '
+                               #typo3-logo,
+                               #typo3-side-menu {
+                                       width: ' . ($this->menuWith - 1) . 'px;
+                               }
+
+                               #typo3-top,
+                               #typo3-content {
+                                       margin-left: ' . $this->menuWith . 'px;
+                               }
+                       ';
+               }
 
                        // create backend scaffolding
                $backendScaffolding = '

diff --git a/typo3/sysext/t3skin/ext_tables.php b/typo3/sysext/t3skin/ext_tables.php
index a5443cd..23296cd 100644 (file)
--- a/typo3/sysext/t3skin/ext_tables.php
+++ b/typo3/sysext/t3skin/ext_tables.php
@@ -5,20 +5,23 @@ if (!defined ('TYPO3_MODE'))  die ('Access denied.');
 
 if (TYPO3_MODE=='BE')  {
 
-       $presetSkinImgs = is_array($TBE_STYLES['skinImg']) ? $TBE_STYLES['skinImg'] : array();  // Means, support for other extensions to add own icons...
+               // Support for other extensions to add own icons...
+       $presetSkinImgs = is_array($TBE_STYLES['skinImg']) ?
+               $TBE_STYLES['skinImg'] :
+               array();
 
        /**
         * Setting up backend styles and colors
         */
-       $TBE_STYLES['mainColors'] = Array (     // Always use #xxxxxx color definitions!
-       'bgColor'    => '#FFFFFF',              // Light background color
-       'bgColor2'   => '#FEFEFE',              // Steel-blue
-       'bgColor3'   => '#F1F3F5',              // dok.color
-       'bgColor4'   => '#E6E9EB',              // light tablerow background, brownish
-       'bgColor5'   => '#F8F9FB',              // light tablerow background, greenish
-       'bgColor6'   => '#E6E9EB',              // light tablerow background, yellowish, for section headers. Light.
-       'hoverColor' => '#FF0000',
-       'navFrameHL' => '#F8F9FB'
+       $TBE_STYLES['mainColors'] = array(      // Always use #xxxxxx color definitions!
+               'bgColor'    => '#FFFFFF',              // Light background color
+               'bgColor2'   => '#FEFEFE',              // Steel-blue
+               'bgColor3'   => '#F1F3F5',              // dok.color
+               'bgColor4'   => '#E6E9EB',              // light tablerow background, brownish
+               'bgColor5'   => '#F8F9FB',              // light tablerow background, greenish
+               'bgColor6'   => '#E6E9EB',              // light tablerow background, yellowish, for section headers. Light.
+               'hoverColor' => '#FF0000',
+               'navFrameHL' => '#F8F9FB'
        );
 
        $TBE_STYLES['colorschemes'][0] = '-|class-main1,-|class-main2,-|class-main3,-|class-main4,-|class-main5';
@@ -82,7 +85,7 @@ if (TYPO3_MODE=='BE') {
        $TBE_STYLES['stylesheets']['backend-style'] = $temp_eP.'stylesheets/backend-style.css';
 
                // Alternative dimensions for frameset sizes:
-       $TBE_STYLES['dims']['leftMenuFrameW'] = 140;            // Left menu frame width
+       $TBE_STYLES['dims']['leftMenuFrameW'] = 160;            // Left menu frame width
        $TBE_STYLES['dims']['topFrameH']      = 45;                     // Top frame heigth
        $TBE_STYLES['dims']['shortcutFrameH'] = 35;                     // Shortcut frame height
        $TBE_STYLES['dims']['selMenuFrame']   = 200;            // Width of the selector box menu frame
@@ -90,7 +93,7 @@ if (TYPO3_MODE=='BE') {
 
                // Setting roll-over background color for click menus:
                // Notice, this line uses the the 'scriptIDindex' feature to override another value in this array (namely $TBE_STYLES['mainColors']['bgColor5']), for a specific script "typo3/alt_clickmenu.php"
-       $TBE_STYLES['scriptIDindex']['typo3/alt_clickmenu.php']['mainColors']['bgColor5']='#F8F9FB';
+       $TBE_STYLES['scriptIDindex']['typo3/alt_clickmenu.php']['mainColors']['bgColor5'] = '#F8F9FB';
 
                // Setting up auto detection of alternative icons:
        $TBE_STYLES['skinImgAutoCfg'] = array(