Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -r7ef3f5faff735c2971d66a3020a24ca9599ac9c8 -rcf287f7ea1db060353b818718271639d1c66a84a --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 7ef3f5faff735c2971d66a3020a24ca9599ac9c8) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision cf287f7ea1db060353b818718271639d1c66a84a) @@ -22,6 +22,7 @@ */ import org.lamsfoundation.lams.common. *; import org.lamsfoundation.lams.common.util. *; +import org.lamsfoundation.lams.common.dict.* import org.lamsfoundation.lams.common.ui. *; import org.lamsfoundation.lams.authoring. *; import org.lamsfoundation.lams.authoring.cv. *; @@ -79,12 +80,14 @@ private var _visibleWidth : Number; private var _tm : ThemeManager; private var _ddm : DesignDataModel; + private var _dictionary:Dictionary; function CanvasOptionalActivity () { optionalActivity_mc = this _ddm = new DesignDataModel (); _visible = false; _tm = ThemeManager.getInstance (); + _dictionary = Dictionary.getInstance(); _visibleHeight = container_pnl._height; _visibleWidth = container_pnl._width; //init(); @@ -166,9 +169,9 @@ panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE); setStyles () //write text - title_lbl.text = 'Optional Activities' + title_lbl.text = Dictionary.getValue('title_Opt_Activity'); //'Optional Activities' //_activity.title = 'Optional Activities'; - actCount_lbl.text = _children.length + " activities"; + actCount_lbl.text = _children.length + Dictionary.getValue('word_activities'); //" activities"; header_pnl.borderType = 'outset'; act_pnl.borderType = 'inset'; container_pnl.setStyle ("backgroundColor", 0x4289FF); Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -r6e5128d1a10792ae9fd879635409df1310202dc5 -rcf287f7ea1db060353b818718271639d1c66a84a --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 6e5128d1a10792ae9fd879635409df1310202dc5) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision cf287f7ea1db060353b818718271639d1c66a84a) @@ -22,7 +22,8 @@ */ import org.lamsfoundation.lams.common.*; -import org.lamsfoundation.lams.common.util.*; +import org.lamsfoundation.lams.common.util.*; +import org.lamsfoundation.lams.common.dict.* import org.lamsfoundation.lams.common.ui.*; import org.lamsfoundation.lams.authoring.*; import org.lamsfoundation.lams.authoring.cv.*; @@ -179,7 +180,7 @@ } //write text title_lbl.text = _activity.title; - actCount_lbl.text = _children.length+" activities"; + actCount_lbl.text = _children.length+ Dictionary.getValue('word_activities'); //" activities"; // _global.breakpoint(); @@ -218,7 +219,7 @@ }else{ padlockOpen_mc._visible = true; padlockClosed_mc._visible = false; - clickTarget_mc._height = 38; + clickTarget_mc._height = 45; } @@ -264,26 +265,6 @@ _canvasController.activityRelease (this); } - if (_locked) - { - _locked = false; - gotoAndStop('collapse') - //set the visibility to false - child1_mc._visible = false; - child2_mc._visible = false; - draw (); - - }else - { - _locked = true; - //set the visibility to true - child1_mc._visible = true; - child2_mc._visible = true; - gotoAndStop('expand') - draw (); - - } - } private function localOnReleaseOutside():Void{