Fixed bug #16731: Fill the color gap between module menu and tree-less modules (Thank...
authorSteffen Kamper <info@sk-typo3.de>
Mon, 27 Dec 2010 17:09:01 +0000 (17:09 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Mon, 27 Dec 2010 17:09:01 +0000 (17:09 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9919 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/js/extjs/viewport.js
typo3/js/extjs/viewportConfiguration.js
typo3/js/modulemenu.js
typo3/sysext/t3skin/extjs/xtheme-t3skin.css

index b826778..d8b2b81 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-12-27  Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #16731: Fill the color gap between module menu and tree-less modules (Thanks to Steffen Gebert)
        * Removed sysext fal
        * Fixed bug #16399: Optimize stdWrap usage for TypoScript content element USER_INT (Thanks to Jo Hasenau)
        * Fixed bug #16400: Optimize stdWrap usage for TypoScript content element TEXT (Thanks to Jo Hasenau)
index e11ab18..66386ee 100644 (file)
@@ -70,6 +70,13 @@ TYPO3.Viewport = Ext.extend(Ext.Viewport, {
        NavigationContainer: null,
 
        /**
+        * Dummy panel, shown when no NavigationContainer is in use
+        *
+        * @var Ext.Panel
+        */
+       NavigationDummy: null,
+
+       /**
         * The iframe navigation component
         *
         * @var TYPO3.iframePanel
@@ -107,6 +114,7 @@ TYPO3.Viewport = Ext.extend(Ext.Viewport, {
 
                this.ContentContainer = Ext.getCmp('typo3-contentContainer');
                this.NavigationContainer = Ext.getCmp('typo3-navigationContainer');
+               this.NavigationDummy = Ext.getCmp('typo3-navigationDummy');
                this.NavigationIframe = Ext.getCmp('typo3-navigationIframe');
                this.Topbar = Ext.getCmp('typo3-topbar');
                this.ModuleMenuContainer = Ext.getCmp('typo3-module-menu');
index 77ab793..a141dba 100644 (file)
@@ -36,72 +36,97 @@ TYPO3.Viewport.configuration = {
        id: 'typo3-viewport',
        renderTo: Ext.getBody(),
        border: false,
-       items: [{
-               layout: 'absolute',
-               region: 'north',
-               id: 'typo3-topbar',
-               height: 42,
-               contentEl: 'typo3-top-container',
-               border: false
-       }, {
-               layout: 'fit',
-               region: 'west',
-               id: 'typo3-module-menu',
-               collapsible: false,
-               collapseMode: null,
-               floatable: true,
-               hideCollapseTool: true,
-               split: true,
-               border: false,
-               autoScroll: true
-       }, {
-               region: 'center',
-               layout: 'border',
-               border: false,
-               items: [{
-                       region: 'west',
+       items: [
+               {
+                       layout: 'absolute',
+                       region: 'north',
+                       id: 'typo3-topbar',
+                       height: 42,
+                       contentEl: 'typo3-top-container',
+                       border: false
+               },
+               {
                        layout: 'fit',
-                       id: 'typo3-navigationContainer',
-                       width: 300,
-                       minWidth: 20,
+                       region: 'west',
+                       id: 'typo3-module-menu',
+                       collapsible: false,
+                       collapseMode: null,
                        floatable: true,
-                       animCollapse: false,
-                       split: true,
-                       collapsible: true,
-                       collapseMode: 'mini',
                        hideCollapseTool: true,
-                       hidden: true,
+                       split: true,
                        border: false,
-                       name: 'navigation',
-                       autoScroll: true,
-                       items: [{
-                               id: 'typo3-navigationIframe',
-                               border: false,
-                               hidden: true,
-                               xtype: 'iframePanel'
-                       }]
-               }, {
+                       autoScroll: true
+               },
+               {
                        region: 'center',
-                       layout: 'fit',
-                       id: 'typo3-contentContainer',
-                       anchor: '100% 100%',
+                       layout: 'border',
                        border: false,
-                       xtype: 'iframePanel',
-                       name: 'content'
-               }]
-       }, {
-               region: 'south',
-               xtype: 'typo3DebugPanel',
-               collapsible: true,
-               collapseMode: 'mini',
-               collapsed: true,
-               hideCollapseTool: true,
-               animCollapse: false,
-               split: true,
-               autoScroll: true,
-               hidden: true,
-               height: 200,
-               id: 'typo3-debug-console',
-               border: false
-       }]
+                       items: [
+                               {
+                                       region: 'west',
+                                       layout: 'fit',
+                                       id: 'typo3-navigationContainer',
+                                       width: 300,
+                                       minWidth: 20,
+                                       floatable: true,
+                                       animCollapse: false,
+                                       split: true,
+                                       collapsible: true,
+                                       collapseMode: 'mini',
+                                       hideCollapseTool: true,
+                                       hidden: true,
+                                       border: false,
+                                       name: 'navigation',
+                                       autoScroll: true,
+                                       items: [
+                                               {
+                                                       id: 'typo3-navigationIframe',
+                                                       border: false,
+                                                       hidden: true,
+                                                       xtype: 'iframePanel'
+                                               }
+                                       ]
+                               },
+                               {
+                                       region: 'center',
+                                       layout: 'border',
+                                       items: [
+                                               {
+                                                       id: 'typo3-navigationDummy',
+                                                       region: 'west',
+                                                       layout: 'fit',
+                                                       border: false,
+                                                       hidden: true,
+                                                       floatable: true,
+                                                       xtime: 'iframePanel',
+                                                       width: 5
+                                               },
+                                               {
+                                                       id: 'typo3-contentContainer',
+                                                       region: 'center',
+                                                       anchor: '100% 100%',
+                                                       border: false,
+                                                       xtype: 'iframePanel',
+                                                       name: 'content'
+                                               }
+                                       ]
+                               },
+                               {
+                                       region: 'south',
+                                       xtype: 'typo3DebugPanel',
+                                       collapsible: true,
+                                       collapseMode: 'mini',
+                                       collapsed: true,
+                                       hideCollapseTool: true,
+                                       animCollapse: false,
+                                       split: true,
+                                       autoScroll: true,
+                                       hidden: true,
+                                       height: 200,
+                                       id: 'typo3-debug-console',
+                                       border: false
+                               }
+                       ]
+               }
+       ]
 };
index 9775879..5434537 100644 (file)
@@ -225,13 +225,17 @@ TYPO3.ModuleMenu.App = {
                var mod = record.name;
                if (record.navigationComponentId) {
                                this.loadNavigationComponent(record.navigationComponentId);
+                               TYPO3.Backend.NavigationDummy.hide();
                                TYPO3.Backend.NavigationIframe.getEl().parent().setStyle('overflow', 'auto');
                        } else if (record.navframe) {
+                               TYPO3.Backend.NavigationDummy.hide();
+                               TYPO3.Backend.NavigationContainer.show();
                                this.loadNavigationComponent('typo3-navigationIframe');
                                this.openInNavFrame(record.navframe);
                                TYPO3.Backend.NavigationIframe.getEl().parent().setStyle('overflow', 'hidden');
                        } else {
                                TYPO3.Backend.NavigationContainer.hide();
+                               TYPO3.Backend.NavigationDummy.show();
                        }
                        this.openInContentFrame(record.originalLink, params);
                        this.loadedModule = mod;
index 36df9b0..fe3791c 100644 (file)
@@ -2204,28 +2204,47 @@ body.x-body-masked .x-window-plain .x-window-mc {
        display: block;
 }
 
-#typo3-module-menu-xcollapsed:hover .x-layout-mini-west,
-#typo3-navigationContainer-xcollapsed:hover .x-layout-mini-west {
+#typo3-module-menu-xcollapsed:hover .x-layout-mini-west {
        left: 5px;
 }
 
-/* Collapsed tree frame is not invisible, but 5px wide */
-#typo3-navigationContainer-xcollapsed {
+/* Collapsed tree frame is not invisible, but 5px wide.
+   If no tree frame is in use, an empty container is shown instead */
+#typo3-navigationContainer-xcollapsed,
+#typo3-navigationDummy {
        background-color: #ebebeb;
        -moz-box-shadow: inset -2px 0 1px rgba(0, 0, 0, 0.15),
-               inset 0 22px #585858,
-               inset 0 49px #dadada;
+               inset 0 22px #585858;
        -ms-box-shadow: inset -2px 0 1px rgba(0, 0, 0, 0.15),
-               inset 0 22px #585858,
-               inset 0 49px #dadada;
+               inset 0 22px #585858;
        -webkit-box-shadow: inset -2px 0 1px rgba(0, 0, 0, 0.15),
-               inset 0 22px #585858,
-               inset 0 49px #dadada;
+               inset 0 22px #585858;
        box-shadow: inset -2px 0 1px rgba(0, 0, 0, 0.15),
-               inset 0 22px #585858,
-               inset 0 49px #dadada;
+               inset 0 22px #585858;
        overflow: visible;
-       width: 5px;
+}
+
+/**
+ * Shadow on the right side of the tree frame,
+ * fallback for missing box-shadow support.
+ *
+ * @see modernizr.js
+ */
+.no-boxshadow #typo3-navigationContainer-xcollapsed,
+.no-boxshadow #typo3-navigationDummy  {
+       background-image: url("data:image/png;base64,R0lGODlhAgABAIAAAMjIyLOzsyH5BAAAAAAALAAAAAACAAEAAAICRAoAOw==");
+       /* star-hack targets IE6+7 */
+       *background-image: url("../images/backgrounds/module-menu-right.png");
+       background-position: right;
+       background-repeat: repeat-y;
+}
+
+#typo3-navigationContainer-xcollapsed {
+       width: 10px !important;
+}
+
+#typo3-navigationContainer-xcollapsed:hover .x-layout-mini-west {
+       left: 10px;
 }
 
 /**