diff --git a/ChangeLog b/ChangeLog
index b826778a780b4ef44f96e7d5449ba3d2279f44c4..d8b2b812d1bd28945964ac3283a8c68e36336751 100755
--- 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)
diff --git a/typo3/js/extjs/viewport.js b/typo3/js/extjs/viewport.js
index e11ab18064d6c2fde4b59cb63bfda989353c78c7..66386ee759ab6516f109896e5b5d213f64fe918a 100644
--- a/typo3/js/extjs/viewport.js
+++ b/typo3/js/extjs/viewport.js
@@ -69,6 +69,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
*
@@ -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');
diff --git a/typo3/js/extjs/viewportConfiguration.js b/typo3/js/extjs/viewportConfiguration.js
index 77ab7932440d3f4939a915d966f9346aa93e5d4b..a141dbab5cf123a13ec847cc4e2711e80b29da68 100644
--- a/typo3/js/extjs/viewportConfiguration.js
+++ b/typo3/js/extjs/viewportConfiguration.js
@@ -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
+ }
+ ]
+ }
+ ]
};
diff --git a/typo3/js/modulemenu.js b/typo3/js/modulemenu.js
index 9775879c05be8c811570e9b3b6c82a71d7565aeb..5434537aec6632121401ca90907b94082c867cb7 100644
--- a/typo3/js/modulemenu.js
+++ b/typo3/js/modulemenu.js
@@ -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;
diff --git a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
index 36df9b08a59b8ea2f0d34d620790624950eea457..fe3791c1f97131b39b536d2180eba196786f9041 100644
--- a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
+++ b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
@@ -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;
}
/**