Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rbc3decc1dd698c458a75fdff33f8b0eddfeb521d -re0a5c95ceeae8d27329703f1629da4dbf58f2aeb --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision bc3decc1dd698c458a75fdff33f8b0eddfeb521d) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision e0a5c95ceeae8d27329703f1629da4dbf58f2aeb) @@ -54,6 +54,7 @@ private var _canvasView:CanvasView; private var _monitorController:MonitorController; private var _monitorView; + private var _canvasModel:CanvasModel; private var _tm:ThemeManager; //TODO:This should be ToolActivity private var _activity:Activity; @@ -128,6 +129,7 @@ _activity = initObj.activity; } + _canvasModel = CanvasModel(_canvasController.getModel()); showAssets(false); @@ -500,6 +502,8 @@ */ private function setStyles() { var my_color:Color = new Color(this); + var styleObj; + var transNegative = {ra:-100, ga:-100, ba:-100, rb:255, gb:255, bb:255}; var transPositive = {ra:100, ga:100, ba:100, rb:0, gb:0, bb:0}; title_lbl.setStyle('textAlign', 'center'); @@ -508,14 +512,20 @@ }else if(bgNegative == "false"){ my_color.setTransform(transPositive); }else if(bgNegative == "original"){ - var styleObj = _tm.getStyleObject('label'); + styleObj = _tm.getStyleObject('label'); title_lbl.setStyle('styleName',styleObj); - styleObj = _tm.getStyleObject('ACTPanel') - act_pnl.setStyle('styleName',styleObj); - } - - + if (this.activity.parentUIID != null || this.activity.parentUIID != undefined){ + var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(this.activity.parentUIID) + if(parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){ + styleObj = _tm.getStyleObject('OptActPanel') + act_pnl.setStyle('styleName',styleObj); + } + }else { + styleObj = _tm.getStyleObject('ACTPanel') + act_pnl.setStyle('styleName',styleObj); + } + } }