Index: lams_central/conf/flashxml/lams/defaultTheme.xml =================================================================== diff -u -r775fdedefed0e3a8ae170d1e82fe1a5a58437e28 -r99d83b79ade77d5fccbefe7ae488796cfa03e46b --- lams_central/conf/flashxml/lams/defaultTheme.xml (.../defaultTheme.xml) (revision 775fdedefed0e3a8ae170d1e82fe1a5a58437e28) +++ lams_central/conf/flashxml/lams/defaultTheme.xml (.../defaultTheme.xml) (revision 99d83b79ade77d5fccbefe7ae488796cfa03e46b) @@ -1 +1 @@ -
0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 Verdanabold \ No newline at end of file +
0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEE \ No newline at end of file Index: lams_central/conf/flashxml/rams/ramsTheme.xml =================================================================== diff -u --- lams_central/conf/flashxml/rams/ramsTheme.xml (revision 0) +++ lams_central/conf/flashxml/rams/ramsTheme.xml (revision 99d83b79ade77d5fccbefe7ae488796cfa03e46b) @@ -0,0 +1 @@ +0x33364810Verdana0xFFEBD00xFFEBD00xFFEBD0insetdefaultbutton0x3336489Verdana0xF98C3D0xF98C3D0xF98C3D0xF98C3Dlabel0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xF98C3D0xF98C3D0xF98C3Dinsettreeview0x33364814Verdana0xF98C3D0xF98C3D0xF98C3DElasticdatagrid0x33364814Verdana0xF98C3D0xF98C3D0xF98C3DElasticcombo0x33364811Verdana0xFFEEC80xFFEEC80xFFEEC8picombo0x3336489Verdana0xFFEEC80xF98C3D0xF98C3DLFMenuBar0x33364811Verdana0xF98C3D0xF98C3D0xF98C3DBGPaneloutset0xE3E3E3FlowPanelnone0xE3E3E3WZPaneloutset0xE3E3E3MHPanelnone0xE3E3E3TAPaneloutset0xE3E3E30x000000scrollpane0xE3E3E3textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xFFEBD0ACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0xFFEBD0OptActPanelnone0xE3E3E3parallelHeadPaneloutset0xE3E3E3OptHeadPaneloutset0xE3E3E3ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xA3A3A3CAHighlightBorder0x333648
\ No newline at end of file Index: lams_central/src/flash/lams_authoring.fla =================================================================== diff -u -r6563149ab60daa42a7f37c0486e1cd248cacb200 -r99d83b79ade77d5fccbefe7ae488796cfa03e46b Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rf72f7d0cf5aded9c288ed28df678bffaff596528 -r99d83b79ade77d5fccbefe7ae488796cfa03e46b --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision f72f7d0cf5aded9c288ed28df678bffaff596528) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 99d83b79ade77d5fccbefe7ae488796cfa03e46b) @@ -205,10 +205,14 @@ _selected_mc.removeMovieClip(); } _selected_mc = _base_mc.createEmptyMovieClip('_selected_mc',_base_mc.getNextHighestDepth()); - Draw.dashTo(_selected_mc,tl_x,tl_y,tr_x,tr_y,2,3,2,0x266DEE); - Draw.dashTo(_selected_mc,tr_x,tr_y,br_x,br_y,2,3,2,0x266DEE); - Draw.dashTo(_selected_mc,br_x,br_y,bl_x,bl_y,2,3,2,0x266DEE); - Draw.dashTo(_selected_mc,bl_x,bl_y,tl_x,tl_y,2,3,2,0x266DEE); + + var dashStyle:mx.styles.CSSStyleDeclaration = _tm.getStyleObject("CAHighlightBorder"); + var color:Number = dashStyle.getStyle("color"); + + Draw.dashTo(_selected_mc,tl_x,tl_y,tr_x,tr_y,2,3,2,color); + Draw.dashTo(_selected_mc,tr_x,tr_y,br_x,br_y,2,3,2,color); + Draw.dashTo(_selected_mc,br_x,br_y,bl_x,bl_y,2,3,2,color); + Draw.dashTo(_selected_mc,bl_x,bl_y,tl_x,tl_y,2,3,2,color); _isSelected = isSelected; Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r0d9ed62ea052e803ebcd6499ab55cfcffcc5ebac -r99d83b79ade77d5fccbefe7ae488796cfa03e46b --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 0d9ed62ea052e803ebcd6499ab55cfcffcc5ebac) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 99d83b79ade77d5fccbefe7ae488796cfa03e46b) @@ -197,8 +197,10 @@ Application.getInstance().getCanvas().getCanvasView().getController().canvasRelease(this); } bkg_pnl.useHandCursor = false; - setDesignTitle() + setDesignTitle(); + + styleTitleBar(); setStyles(); //Debugger.log('canvas view dispatching load event'+_canvas_mc,Debugger.GEN,'draw','CanvasView'); @@ -247,7 +249,6 @@ titleBar.rightCurve._x = bgWidth+27; titleBar.rightCurveShadow._x = titleBar.rightCurve._x+2 - } @@ -257,6 +258,26 @@ read_only._x = titleBar._x + 5; } + + private function styleTitleBar():Void { + + var titleBarBg:mx.styles.CSSStyleDeclaration = _tm.getStyleObject("BGPanel"); + var titleBarBgShadow:mx.styles.CSSStyleDeclaration = _tm.getStyleObject("BGPanelShadow"); + + var nameBGColor:Color = new Color(titleBar.nameBG); + var nameBGShadowColor:Color = new Color(titleBar.nameBGShadow); + var rightCurveColor:Color = new Color(titleBar.rightCurve); + var rightCurveShadowColor:Color = new Color(titleBar.rightCurveShadow); + + var bgColor:Number = titleBarBg.getStyle("backgroundColor"); + var bgShadowColor:Number = titleBarBgShadow.getStyle("backgroundColor"); + + nameBGColor.setRGB(bgColor); + nameBGShadowColor.setRGB(bgShadowColor); + rightCurveColor.setRGB(bgColor); + rightCurveShadowColor.setRGB(bgShadowColor); + + } public function initDrawTempTrans(){ Debugger.log("Initialising drawing temp. Transition", Debugger.GEN, "initDrawTempTrans", "CanvasView"); Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as =================================================================== diff -u -r6cb156a020a0428bd31ba7b988a582fde4602ce7 -r99d83b79ade77d5fccbefe7ae488796cfa03e46b --- lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as (.../TemplateActivity.as) (revision 6cb156a020a0428bd31ba7b988a582fde4602ce7) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as (.../TemplateActivity.as) (revision 99d83b79ade77d5fccbefe7ae488796cfa03e46b) @@ -301,30 +301,26 @@ public function setState(selected:Boolean):Void{ if(selected){ - - bkg_pnl.setStyle("backgroundColor",0x1B6BA7); - - + var _taSelectedPanelStyle = _tm.getStyleObject("TAPanelSelected"); + bkg_pnl.setStyle("styleName", _taSelectedPanelStyle); }else{ - rollOut() - + rollOut(); } } - private function select():Void{ - //Debugger.log('btn: '+this,4,'select','TemplateActivity'); - //Debugger.log('_toolkitView:'+_toolkitView.className(),4,'select','TemplateActivity'); + private function select():Void{ _toolkitView.hideToolTip(); var toolkitController = _toolkitView.getController(); toolkitController.selectTemplateActivity(this); } private function rollOver():Void{ - bkg_pnl.setStyle("backgroundColor",0xFFFFFF); - bkg_pnl.setStyle("borderStyle","outset"); + + var _taRolloverPanelStyle = _tm.getStyleObject("TAPanelRollover"); + + bkg_pnl.setStyle("styleName", _taRolloverPanelStyle); + var ttMessage:String = ""+_mainActivity.title+" \n"+_mainActivity.description; - //var ttHolder = Application.tooltip; - //Tip.DisplayToolTip(ttHolder, ttMessage); var ttypos = yPos + select_btn._height var ttxpos = 2 _toolkitView.showToolTip(ttMessage, ttxpos, ttypos);