Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 Binary files differ Index: lams_flash/src/central/flash/lams_authoring.fla =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -362,8 +362,7 @@ var parentAct:Activity = canvasModel.getCanvas().ddm.getActivityByUIID(taParent); var maxActs:Number = 6; if (canvasModel.getCanvas().ddm.getComplexActivityChildren(taParent).length >= maxActs) { - //LFMessage.showMessageAlert("Cannot drop activity: "+actToAdd.title+" here. The reference activity permits a maximum of "+maxActs+" child activities.", null); - LFMessage.showMessageAlert(Dictionary.getValue("support_msg_max_children_reached", [actToAdd.title], [maxActs]), null); + LFMessage.showMessageAlert(Dictionary.getValue("support_msg_max_children_reached", [actToAdd.title, maxActs]), null); return; } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -297,7 +297,7 @@ referenceOnCanvas.updateChildren(newChildren); } else { //LFMessage.showMessageAlert("Cannot drop activity: "+ca.activity.title+" here. The reference activity permits a maximum of "+numChildrenActs+" child activities.", null); - LFMessage.showMessageAlert(Dictionary.getValue("support_msg_max_children_reached", [ca.activity.title], [6]), null); + LFMessage.showMessageAlert(Dictionary.getValue("support_msg_max_children_reached", [ca.activity.title, 6]), null); activitySnapBack(ca); } } @@ -590,7 +590,7 @@ Debugger.log('activityDoubleClick CanvasBranchActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick','CanvasController'); _canvasModel.openBranchActivityContent(ca, true); - Application.getInstance().getToolbar().setButtonState("reference_btn", false, false); + Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false); // invalidate design after opening tool content window _canvasModel.getCanvas().ddm.validDesign = false; @@ -737,7 +737,7 @@ _canvasModel.getCanvas().ddm.removeEntries(_canvasModel.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(ca.activity.activityUIID).all); if (ca.activity.isReferenceActivity()) { - Application.getInstance().getToolbar().setButtonState("reference_btn", true, false); + Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false); } _canvasModel.removeComplexActivity(ca); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -799,7 +799,7 @@ canvasModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null; if (canvasModel.currentBranchingActivity == null && canvasModel.getReferenceActivityOnCanvas() == null) { - Application.getInstance().getToolbar().setButtonState("reference_btn", true, false); + Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false); } if(canvasModel.activeView instanceof CanvasComplexView) Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -313,7 +313,7 @@ //_cv.ddm.referenceActivityUIID = referenceAct.activityUIID; // disable the reference activity button - Application.getInstance().getToolbar().setButtonState("reference_btn", false, false); + Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false); setDirty(); setSelectedItem(_activitiesDisplayed.get(referenceAct.activityUIID)); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as (.../ToolbarController.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as (.../ToolbarController.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -90,7 +90,7 @@ _app.getCanvas().toggleOptionalActivity(); }else if(tgt.indexOf("optional_seq") != -1){ _app.getCanvas().toggleOptionalSequenceActivity(); - }else if(tgt.indexOf("reference") != -1){ + }else if(tgt.indexOf("support") != -1){ _app.getCanvas().toggleReferenceTool(); }else if(tgt.indexOf("optional") != -1){ if (!isOptActive && !optionPanelVisible){ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as (.../ToolbarModel.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as (.../ToolbarModel.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -80,7 +80,7 @@ buttonArr[9] = ["preview_btn", "icon_preview", "preview_btn_click_target"]; buttonArr[10] = ["optional_act_btn", "icon_optional"]; buttonArr[11] = ["optional_seq_btn", "icon_optional"]; - buttonArr[12] = ["reference_btn", "icon_optional"]; + buttonArr[12] = ["support_act_btn", "icon_optional"]; buttonArr[13] = ["gate_btn", "icon_gate"]; buttonArr[14] = ["branch_btn", "icon_branch"]; @@ -96,7 +96,7 @@ buttonArr[8] = ["group_btn", "icon_group"]; buttonArr[9] = ["optional_act_btn", "icon_optional"]; buttonArr[10] = ["optional_seq_btn", "icon_optional"]; - buttonArr[11] = ["reference_btn", "icon_optional"]; + buttonArr[11] = ["support_act_btn", "icon_optional"]; buttonArr[12] = ["gate_btn", "icon_gate"]; buttonArr[13] = ["branch_btn", "icon_branch"]; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r9d5eeace842b7971ad47f350fef71c0e11a352c0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) @@ -57,7 +57,7 @@ private var optional_btn:Button; private var optional_act_btn:Button; private var optional_seq_btn:Button; - private var reference_btn:Button; + private var support_act_btn:Button; private var flow_btn:Button; private var gate_btn:Button; private var branch_btn:Button; @@ -130,7 +130,7 @@ public function showHideOptAssets(v:Boolean){ optional_act_btn.visible = v; optional_seq_btn.visible = v; - reference_btn.visible = v; + support_act_btn.visible = v; optional_bkg_pnl.visible = v; optional_bkg_pnl.setSize(Math.max(Math.max(optional_btn.width, optional_act_btn.width), Math.max(optional_btn.width, optional_seq_btn.width)) + 6, 126.5); @@ -165,7 +165,7 @@ gate_btn.addEventListener("click", controller); group_btn.addEventListener("click", controller); branch_btn.addEventListener("click", controller); - reference_btn.addEventListener("click", controller); + support_act_btn.addEventListener("click", controller); preview_btn.addEventListener("click", controller); preview_btn_click_target.addEventListener("click", controller); @@ -210,8 +210,8 @@ optional_seq_btn.onRollOver = Proxy.create(this,this['showToolTip'], optional_seq_btn, "optional_seq_btn_tooltip"); optional_seq_btn.onRollOut = Proxy.create(this,this['hideToolTip']); - reference_btn.onRollOver = Proxy.create(this,this['showToolTip'], optional_seq_btn, "support_act_btn_tooltip"); - reference_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + support_act_btn.onRollOver = Proxy.create(this,this['showToolTip'], optional_seq_btn, "support_act_btn_tooltip"); + support_act_btn.onRollOut = Proxy.create(this,this['hideToolTip']); group_btn.onRollOver = Proxy.create(this,this['showToolTip'], group_btn, "group_btn_tooltip"); group_btn.onRollOut = Proxy.create(this,this['hideToolTip']); @@ -250,7 +250,7 @@ gate_btn.label = Dictionary.getValue('gate_btn'); branch_btn.label = Dictionary.getValue('branch_btn'); flow_btn.label = Dictionary.getValue('flow_btn'); - reference_btn.label = Dictionary.getValue("support_act_btn"); + support_act_btn.label = Dictionary.getValue("support_act_btn"); group_btn.label = Dictionary.getValue('group_btn'); preview_btn.label = Dictionary.getValue('preview_btn'); apply_changes_btn.label = Dictionary.getValue('apply_changes_btn'); @@ -271,7 +271,7 @@ optional_btn.tabIndex = 208 optional_act_btn.tabIndex = 209 optional_seq_btn.tabIndex = 210 - reference_btn.tabIndex = 211 + support_act_btn.tabIndex = 211 flow_btn.tabIndex = 212 gate_btn.tabIndex = 213 branch_btn.tabIndex = 214 @@ -455,6 +455,7 @@ optional_act_btn.setStyle('styleName',styleObj); optional_seq_btn.setStyle('styleName',styleObj); gate_btn.setStyle('styleName',styleObj); + support_act_btn.setStyle('styleName',styleObj); flow_btn.setStyle('styleName',styleObj); branch_btn.setStyle('styleName',styleObj); group_btn.setStyle('styleName', styleObj);