Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r117c4e193eaf487e272a10672fd8c4b5ca8398f4 -r24a933e2927a758498ae27341b19baeb90ca0db3 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r117c4e193eaf487e272a10672fd8c4b5ca8398f4 -r24a933e2927a758498ae27341b19baeb90ca0db3 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r24a933e2927a758498ae27341b19baeb90ca0db3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as (.../BranchingActivity.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as (.../BranchingActivity.as) (revision 24a933e2927a758498ae27341b19baeb90ca0db3) @@ -87,7 +87,7 @@ if(_endXCoord) dto.endXCoord = _endXCoord; if(_endYCoord) dto.endYCoord = _endYCoord; if(_toolActivityUIID) dto.toolActivityUIID = _toolActivityUIID; - if(_defaultBranch) dto.defaultBranch = _defaultBranch.sequenceActivity.activityUIID; + if(_defaultBranch) dto.defaultActivityUIID = _defaultBranch.sequenceActivity.activityUIID; return dto; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as =================================================================== diff -u -rba18cd74878b427e043766eddab093b34c75a8b5 -r24a933e2927a758498ae27341b19baeb90ca0db3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as (.../BranchMappingDialog.as) (revision ba18cd74878b427e043766eddab093b34c75a8b5) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as (.../BranchMappingDialog.as) (revision 24a933e2927a758498ae27341b19baeb90ca0db3) @@ -104,16 +104,16 @@ themeManager = ThemeManager.getInstance(); //Set the text for buttons - close_btn.label = "Done"; + close_btn.label = Dictionary.getValue("al_done"); //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager fm = _container.getFocusManager(); fm.enabled = true; //work out offsets from bottom RHS of panel xOkOffset = panel._width - close_btn._x; - yOkOffset = panel._height - close_btn._y; - + yOkOffset = panel._height - close_btn._y; + //Register as listener with StyleManager and set Styles themeManager.addEventListener('themeChanged',this); setStyles(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r24a933e2927a758498ae27341b19baeb90ca0db3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as (.../ConditionMatchingDialog.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as (.../ConditionMatchingDialog.as) (revision 24a933e2927a758498ae27341b19baeb90ca0db3) @@ -77,7 +77,7 @@ //Set the labels conditions_label.text = Dictionary.getValue('condmatch_dlg_cond_lst_lbl'); branches_label.text = Dictionary.getValue('groupmatch_dlg_branches_lst_lbl'); - match_dgd_lbl.text = Dictionary.getValue('groupmatch_dlg_match_dgd_lbl'); + match_dgd_lbl.text = Dictionary.getValue('branch_mapping_dlg_match_dgd_lbl'); //EVENTS //Add event listeners for ok, cancel and close buttons @@ -109,10 +109,12 @@ branches_lst.maxHPosition = 200; var column_sequence:DataGridColumn = new DataGridColumn("sequenceName"); - column_sequence.headerText = "Branch"; + column_sequence.headerText = Dictionary.getValue("branch_mapping_dlg_branch_col_lbl"); + column_sequence.width = match_dgd.width/2; var column_condition:DataGridColumn = new DataGridColumn("displayName"); - column_condition.headerText = "Condition"; + column_condition.headerText = Dictionary.getValue("branch_mapping_dlg_condition_col_lbl"); + column_condition.width = match_dgd.width/2; match_dgd.addColumn(column_sequence); match_dgd.addColumn(column_condition); @@ -158,7 +160,7 @@ // check for any remaining conditions if(conditions_lst.length > 0) { - LFMessage.showMessageAlert("All remaining conditions will be mapped to the default branch", Proxy.create(this, cleanupUnmappedConditions)); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_auto_condition_msg"), Proxy.create(this, cleanupUnmappedConditions)); } else { //close popup _container.deletePopUp(); @@ -199,7 +201,7 @@ setupMatch(conditions_lst.getItemAt(conditions_lst.selectedIndices[i]), branches_lst.selectedItem); selectedConditions.push(conditions_lst.selectedIndices[i]); } else { - LFMessage.showMessageAlert("No branch selected"); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_no_branch_msg")); return; } @@ -212,7 +214,7 @@ } else { - LFMessage.showMessageAlert("No condition selected"); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_no_condition_msg")); } } @@ -238,7 +240,7 @@ app.getCanvas().ddm.removeBranchMapping(rItem.entryUIID); } else { - LFMessage.showMessageAlert("No match selected"); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_no_branch_msg")); } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r24a933e2927a758498ae27341b19baeb90ca0db3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision 24a933e2927a758498ae27341b19baeb90ca0db3) @@ -75,7 +75,7 @@ //Set the labels groups_label.text = Dictionary.getValue('groupmatch_dlg_groups_lst_lbl'); branches_label.text = Dictionary.getValue('groupmatch_dlg_branches_lst_lbl'); - match_dgd_lbl.text = Dictionary.getValue('groupmatch_dlg_match_dgd_lbl'); + match_dgd_lbl.text = Dictionary.getValue('branch_mapping_dlg_match_dgd_lbl'); //EVENTS //Add event listeners for ok, cancel and close buttons @@ -107,10 +107,12 @@ branches_lst.maxHPosition = 200; var column_sequence:DataGridColumn = new DataGridColumn("sequenceName"); - column_sequence.headerText = "Branch"; + column_sequence.headerText = Dictionary.getValue("branch_mapping_dlg_branch_col_lbl"); + column_sequence.width = match_dgd.width/2; var column_name:DataGridColumn = new DataGridColumn("groupName"); - column_name.headerText = "Group"; + column_name.headerText = Dictionary.getValue("branch_mapping_dlg_group_col_lbl"); + column_name.width = match_dgd.width/2; match_dgd.addColumn(column_sequence); match_dgd.addColumn(column_name); @@ -168,7 +170,7 @@ setupMatch(groups_lst.getItemAt(groups_lst.selectedIndices[i]), branches_lst.selectedItem); selectedGroups.push(groups_lst.selectedIndices[i]); } else { - LFMessage.showMessageAlert("No branch selected"); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_no_branch_msg")); return; } @@ -181,7 +183,7 @@ } else { - LFMessage.showMessageAlert("No groups selected"); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_no_groups_msg")); } } @@ -207,7 +209,7 @@ app.getCanvas().ddm.removeBranchMapping(rItem.entryUIID); } else { - LFMessage.showMessageAlert("No match selected"); + LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_no_mapping_msg")); } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as =================================================================== diff -u -r117c4e193eaf487e272a10672fd8c4b5ca8398f4 -r24a933e2927a758498ae27341b19baeb90ca0db3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as (.../ToolOutputConditionsDialog.as) (revision 117c4e193eaf487e272a10672fd8c4b5ca8398f4) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as (.../ToolOutputConditionsDialog.as) (revision 24a933e2927a758498ae27341b19baeb90ca0db3) @@ -159,13 +159,13 @@ } private function setLabels(){ - _condition_range_lbl.text = "Set Range:"; - _condition_from_lbl.text = "From:"; - _condition_to_lbl.text = "To:"; + _condition_range_lbl.text = Dictionary.getValue("to_conditions_dlg_range_lbl"); + _condition_from_lbl.text = Dictionary.getValue("to_conditions_dlg_from_lbl"); + _condition_to_lbl.text = Dictionary.getValue("to_conditions_dlg_to_lbl"); - add_btn.label = "+ Add"; - clear_all_btn.label = "Clear All"; - remove_item_btn.label = "- Remove"; + add_btn.label = Dictionary.getValue("to_conditions_dlg_add_btn_lbl"); + clear_all_btn.label = Dictionary.getValue("to_conditions_dlg_clear_all_btn_lbl"); + remove_item_btn.label = Dictionary.getValue("to_conditions_dlg_remove_item_btn_lbl"); //Set the text for buttons close_btn.label = Dictionary.getValue('al_done'); @@ -211,10 +211,12 @@ var column_name:DataGridColumn = new DataGridColumn("conditionName"); column_name.headerText = "Name"; column_name.editable = true; + column_name.width = _condition_item_dgd.width*0.4; var column_value:DataGridColumn = new DataGridColumn("conditionValue"); column_value.headerText = "Condition"; column_value.editable = false; + column_value.width = _condition_item_dgd.width*0.6; _condition_item_dgd.addColumn(column_name); _condition_item_dgd.addColumn(column_value); @@ -276,9 +278,9 @@ switch(condition.type) { case ToolOutputDefinition.LONG : if(condition.startValue != null && condition.endValue != null) - _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.startValue) + " TO " + String(condition.endValue), data: condition}); + _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value", [String(condition.startValue), String(condition.endValue)]), data: condition}); else - _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: "exact(" + String(condition.exactMatchValue) + ")", data: condition}); + _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_exact", [String(condition.exactMatchValue)]), data: condition}); break; case ToolOutputDefinition.BOOL: @@ -415,10 +417,20 @@ public function setSize(w:Number,h:Number):Void{ //Size the panel _bgpanel.setSize(w,h); - - //Buttons - close_btn.move(w-xOkOffset,h-yOkOffset); + + _condition_item_dgd._width = w - 2*_condition_item_dgd._x; + _condition_item_dgd.getColumnAt(0).width = _condition_item_dgd.width*0.4; + _condition_item_dgd.getColumnAt(1).width = _condition_item_dgd.width*0.6; + + _toolOutputDefin_cmb._width = w - 2*_toolOutputDefin_cmb._x; + + //Buttons + remove_item_btn._x = _condition_item_dgd._x + _condition_item_dgd.width - remove_item_btn.width; + clear_all_btn._x = remove_item_btn._x - clear_all_btn.width - 5; + close_btn.move(w-xOkOffset,h-yOkOffset); + cancel_btn.move(close_btn._x - cancel_btn.width - 5, h-yOkOffset); + } //Gets+Sets Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -r24a933e2927a758498ae27341b19baeb90ca0db3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 24a933e2927a758498ae27341b19baeb90ca0db3) @@ -196,9 +196,9 @@ _group_naming_btn.label = Dictionary.getValue('pi_group_naming_btn_lbl'); _tool_output_match_btn.label = Dictionary.getValue('pi_tomatch_btn_lbl'); _conditions_setup_btn.label = Dictionary.getValue('pi_condmatch_btn_lbl'); - + // Branch - _pi_defaultBranch_cb.label = Dictionary.getValue("_pi_defaultBranch_cb_lbl"); + _pi_defaultBranch_cb.label = Dictionary.getValue("pi_defaultBranch_cb_lbl"); //populate the synch type combo: gateType_cmb.dataProvider = Activity.getGateActivityTypes(); @@ -207,6 +207,7 @@ //Call to apply style to all the labels and input fields setStyles(); + setButtonSizes(); //fire event to say we have loaded delete this.onEnterFrame; @@ -226,6 +227,28 @@ showGeneralInfo(true); dispatchEvent({type:'load',target:this}); + } + + private function setButtonSizes():Void { + var offset:Number = 10; + this.createTextField("btn_text", this.getNextHighestDepth(), -100, -100, 10, 18); + var btn_text = this["btn_text"] + btn_text.autoSize = true; + btn_text.html = true; + + btn_text.htmlText = _group_match_btn.label; + _group_match_btn.setSize(btn_text.textWidth + offset, 22); + + btn_text.htmlText = _group_naming_btn.label; + _group_naming_btn.setSize(btn_text.textWidth + offset, 22); + + btn_text.htmlText = _tool_output_match_btn.label; + _tool_output_match_btn.setSize(btn_text.textWidth + offset, 22); + + btn_text.htmlText = _conditions_setup_btn.label; + _conditions_setup_btn.setSize(btn_text.textWidth + offset, 22); + + btn_text.removeTextField(); } private function hideAllSteppers(v):Void{ @@ -1012,7 +1035,7 @@ private function onGroupMatchClick(evt:Object){ // open group to branch matching window - _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('groupmatch_dlg_title_lbl'), closeButton:true, viewResize:false, scrollContentPath:'GroupMatchingDialog'}); + _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('groupmatch_dlg_title_lbl'), closeButton:true, resize:false, scrollContentPath:'GroupMatchingDialog'}); _app.dialog.addEventListener('contentLoaded', Delegate.create(this, groupMatchDialogLoaded)); setModified(); @@ -1021,7 +1044,7 @@ private function onGroupNamingClick(evt:Object){ // open group to branch matching window - _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('groupnaming_dlg_title_lbl'), closeButton:true, viewResize:false, scrollContentPath:'GroupNamingDialog'}); + _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('groupnaming_dlg_title_lbl'), closeButton:true, resize:false, scrollContentPath:'GroupNamingDialog'}); _app.dialog.addEventListener('contentLoaded', Delegate.create(this, GroupNamingDialogLoaded)); setModified(); @@ -1033,7 +1056,7 @@ private function onConditionMatchClick(evt:Object){ // open group to branch matching window - _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('condmatch_dlg_title_lbl'), closeButton:true, viewResize:false, scrollContentPath:'ConditionMatchingDialog'}); + _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('condmatch_dlg_title_lbl'), closeButton:true, resize:false, scrollContentPath:'ConditionMatchingDialog'}); _app.dialog.addEventListener('contentLoaded', Delegate.create(this, ConditionMatchDialogLoaded)); setModified();