Commit 9ae23f54 authored by Bas Lijnse's avatar Bas Lijnse

Fixed displaying of panel titles

parent 5e42d83a
...@@ -9,9 +9,10 @@ itasks.Container = { ...@@ -9,9 +9,10 @@ itasks.Container = {
itasks.Panel = { itasks.Panel = {
cssCls: 'panel', cssCls: 'panel',
initDOMEl: function() { initDOMEl: function() {
var me = this; var me = this,
isTab = (me.parentCmp && me.parentCmp.xtype == 'TabSet');
//Create header //Create header
if(me.title) { if(me.title && !isTab) {
me.headerEl = document.createElement('div'); me.headerEl = document.createElement('div');
me.headerEl.classList.add(me.cssPrefix + 'header'); me.headerEl.classList.add(me.cssPrefix + 'header');
me.headerEl.innerHTML = '<span>' + me.title + '</span>'; me.headerEl.innerHTML = '<span>' + me.title + '</span>';
......
...@@ -14,9 +14,8 @@ where ...@@ -14,9 +14,8 @@ where
arrangeWithSideBar :: !Int !UISide !Int !Bool -> Layout arrangeWithSideBar :: !Int !UISide !Int !Bool -> Layout
arrangeWithSideBar index side size resize = sequenceLayouts arrangeWithSideBar index side size resize = sequenceLayouts
[wrapUI UIContainer //Push the current container down a level [wrapUI UIPanel //Push the current container down a level
,copyAttributes [0] [] //Keep the attributes from the original UI ,copyAttributes [0] [] //Keep the attributes from the original UI
,setNodeType UIPanel
,setAttributes (directionAttr direction) ,setAttributes (directionAttr direction)
,insertSubAt [sidePanelIndex] (ui UIComponent) //Make sure we have a target for the move ,insertSubAt [sidePanelIndex] (ui UIComponent) //Make sure we have a target for the move
,moveSubAt [mainPanelIndex,index] [sidePanelIndex,0] ,moveSubAt [mainPanelIndex,index] [sidePanelIndex,0]
......
...@@ -37,7 +37,7 @@ where ...@@ -37,7 +37,7 @@ where
[layoutSubAt [1] finalizeEditor [layoutSubAt [1] finalizeEditor
,copyAttributes [0] [] ,copyAttributes [0] []
,removeEmptyPrompt ,removeEmptyPrompt
,setNodeType UIContainer ,setNodeType UIPanel
] ]
removeEmptyPrompt = conditionalLayout emptyPrompt (removeSubAt [0]) removeEmptyPrompt = conditionalLayout emptyPrompt (removeSubAt [0])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment