Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml =================================================================== diff -u -rd75a56dbb3bbbceaeba8a0f5367d60ac305239aa -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 --- lams_flex/LamsAuthor/src/LamsAuthor.mxml (.../LamsAuthor.mxml) (revision d75a56dbb3bbbceaeba8a0f5367d60ac305239aa) +++ lams_flex/LamsAuthor/src/LamsAuthor.mxml (.../LamsAuthor.mxml) (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -11,6 +11,7 @@ You are not allowed to have a circular sequence + + + Properties + + + Title + \ No newline at end of file Index: lams_flex/LamsAuthor/src/assets/languages/en_AU.xml =================================================================== diff -u -ra29b09f571d90b3bbb52490afb6691b5d4fb473f -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 --- lams_flex/LamsAuthor/src/assets/languages/en_AU.xml (.../en_AU.xml) (revision a29b09f571d90b3bbb52490afb6691b5d4fb473f) +++ lams_flex/LamsAuthor/src/assets/languages/en_AU.xml (.../en_AU.xml) (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -148,5 +148,14 @@ You are not allowed to have a circular sequence + + + + Properties + + + Title + + \ No newline at end of file Index: lams_flex/LamsAuthor/src/assets/languages/en_AU_dictionary.xml =================================================================== diff -u --- lams_flex/LamsAuthor/src/assets/languages/en_AU_dictionary.xml (revision 0) +++ lams_flex/LamsAuthor/src/assets/languages/en_AU_dictionary.xml (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -0,0 +1,1041 @@ + + + + + Parallel Activity + + + Optional Activity + + + Send + + + Sorry you cannot move this activity. + + + Sorry! You are not allowed to copy this child activity. + + + Sorry! You are not allowed to cut this child activity. + + + Activities Toolkit + + + Alert + + + Cancel + + + Confirm + + + OK + + + The theme data has not been loaded + + + The application cannot continue. Please contact support + + + Copy + + + You cannot create a transition to this object + + + Issues + + + Thanks for Sending data to server + + + Delete + + + Gate + + + Group + + + Grouping + + + Activity + + + Done + + + Issue + + + Validation issues + + + Edit + + + Copy + + + Cut + + + Paste + + + Redo + + + Undo + + + File + + + Close + + + New + + + Open + + + Save + + + Save as... + + + Help + + + Tools + + + Draw Optional + + + Draw Transition + + + New + + + Are you sure you want to clear your design on the screen? + + + None + + + Open + + + Optional + + + Paste + + + Permission + + + Gate Activity + + + Grouping Activity + + + Close gate + + + Grouping type + + + Hours + + + Current Grouping + + + Description + + + Grouping + + + Title + + + Minutes + + + Optional Activity + + + Open gate + + + Properties + + + Copy of + + + Cancel + + + Language + + + OK + + + Theme + + + Preview + + + Properties + + + Random + + + Rename + + + Save + + + Schedule + + + Synchronise + + + Activities Toolkit + + + Transition + + + Cancel + + + Synchronisation + + + Type + + + OK + + + Transition + + + Root + + + Please click on either a Folder to save in, or a Design to overwrite + + + The source and destination folders are the same + + + Cancel + + + File Name + + + Location + + + OK + + + Open + + + Properties + + + Save + + + Workspace + + + Cancel + + + Please enter a the new folder name + + + OK + + + Sorry, you do not have permission to write to this resource + + + Please enter the new name + + + My Workspace + + + View + + + A following system error has occurred: + + + You may need to re-start LAMS Author to continue. Do you want to save the following information about this error to help fix this problem? + + + System Error + + + Choose in Monitor + + + Sorry! You are required to select the activity before you click on the Open/Edit Activity Content menu item in activity right click menu. + + + None + + + This folder already contains a file named {0}. + + + Import + + + Copy ({0}) of + + + Please click on a Design to open. + + + You cannot add a gate activity as an optional activity. + + + You cannot save a design in this folder. Please select a valid sub-folder. + + + License + + + Additional License Information + + + Second activity of the Transition is missing. + + + Remove to and from transitions from {0} before setting it as an optional activity. + + + A Transition to {0} already exist + + + A Transition from {0} already exist + + + Are you sure you want to delete this file / folder? + + + Branch + + + Flow + + + Drop an activity on this bin to remove it from the activity sequence. + + + Clears current sequence and resets workspace ready for use + + + Show File Dialogue to open an Activity Sequence + + + Create flow controls activities + + + Create a Grouping activity + + + Preview your Sequence as learners will see it + + + Copy the selected activity + + + Paste a copy of the selected activity + + + Quick save current Activity Sequence + + + Create a set of optional activities. + + + Create a stop point + + + Use this pen to draw transitions between activities (or press CTRL key) + + + Days + + + Cannot use this folder. + + + Exit + + + You cannot Export an unsaved design. + + + Export + + + Refresh + + + Number of groups + + + The design on the canvas has changed. Continue without saving? + + + No file found. + + + You are not allowed to have a circular sequence + + + None + + + You are about to recover the last lost or unsaved design. Your current design will be cleared. Continue? + + + Warning: you are about to overwrite this sequence! + + + Sorry! You are required to select the activity before you click copy + + + The language data has not been loaded + + + You are unable to edit tools of a read-only design. Please save a copy of the design and try again. + + + Read Only + + + No license currently selected - Please select one + + + Sorry, You cannot save an empty design + + + Description + + + Congratulations! - Your design is valid and has been saved + + + Learner's Output + + + Warning + + + My Groups + + + Recover... + + + Please enter the design name, and then click Save button. + + + Sorry! You are not allowed to save a design with no file name. + + + Author Activity Help + + + Open/Edit Activity Content + + + Copy Activity + + + Paste Activity + + + Property Inspector... + + + Authoring Help + + + Support + + + Create a set of optional support activities. + + + Support Activity + + + Support activities cannot be connected to any other activity + + + Activities of type {0} cannot be added as a support activity + + + Cannot drop activity: {0} here. The support activity permits a maximum of {1} child activities. + + + Cannot drop a support activity inside another activity. + + + About LAMS + + + Untitled - 1 + + + Cannot find help page for {0} + + + Close and back to {0} + + + About - {0} + + + Version + + + {0} is a trademark of {0} Foundation ( {1} ). + + + <p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. <br><br>{0}</p> + + + LAMS + + + www.gnu.org/licenses/gpl.txt + + + http://{0}foundation.org + + + Return to monitor lesson. + + + Finish + + + Apply Changes + + + A Transition must have an activity before or after the transition + + + An activity must have an input or output transition + + + This activity has no input transition + + + No activities are missing their input transition. + + + This activity has no output transition + + + No activities are missing their output transition. + + + Cannot apply changes. There are one or more transitions missing. + + + Apply Changes + + + Apply changes to design and return to monitor lesson. + + + Cancel + + + Activity cannot be {0}. The Activity is read-only. + + + Live Edit + + + removed + + + modified + + + Design must be valid in order to finish editing. + + + Warning: Your design has been modified. Do you wish to close without saving? + + + Transition cannot be {0}. The Transition target is read-only. + + + --Selection-- + + + © 2002-2009 {0} Foundation. + + + Branching + + + Define in Monitor + + + Click on a name to change its value. + + + Input (Tool) + + + Done + + + Conditions + + + Match Conditions to Branches + + + default + + + + Add + + + Clear All + + + - Remove + + + Branch + + + Condition + + + Group + + + No Branch selected. + + + No Mapping selected. + + + No Condition selected. + + + All remaining Conditions will be mapped to the default Branch. + + + Mappings + + + Range {0} to {1} + + + Exact value of {0} + + + Setup Mappings + + + Define in Monitor + + + Map Groups to Branches + + + Map to competencies + + + Competencies + + + No Groups selected. + + + Group-based + + + Branches + + + Groups + + + Group Naming + + + Branching Activity + + + Branching type + + + Name Groups + + + Sequence + + + Sorry you cannot paste this type of activity + + + Teacher Choice + + + start value + + + end value + + + The {0} cannot be within the range of an existing condition. + + + The {0} cannot be greater than the {1}. + + + WARNING: The lesson is about to be removed. Do you want it keep this lesson as {0}? + + + The default branch can be chosen by clicking the "default" checkbox in the Properties area for the desired branch. + + + Continue + + + {0} linked to an existing branch. Do you wish to continue? + + + There are conditions + + + This condition is + + + Untitled {0} + + + The design contains unused branch mappings that will be removed. Do you wish to continue? + + + To remove please deselect this activity as the {0}. + + + This {0} is linked to a {1}. + + + This {0} has a child linked to a {1}. + + + Activity + + + Sequence + + + Create a set of optional sequences. + + + Removing sequences + + + The sequence(s) to be removed may contain activities that will be deleted. Do you wish to remove these sequences? + + + No of Sequences + + + Sequence Activity ({0}) + + + {0} - Sequences + + + Please drop the activity onto one of the sequences. + + + Remove any connected branches from {0} before adding it to an optional sequence. + + + There are no sequences enabled on this container. + + + Please unlock the Optional Sequences container before assigning this activity to an optional sequence. + + + Remove to and from transitions from {0} before setting it to an optional sequence. + + + Remove any connected branches from {0} before setting it as an optional activity. + + + Please unlock the Optional Activity container before assigning this activity as optional. + + + {0} - Activities + + + Less than or equals + + + Optional Sequences + + + Less than or eq {0} + + + Greater than or eq {0} + + + Activities + + + Sequences + + + Max {0} + + + Min {0} + + + Offline Activity + + + {0} {1} + + + From + + + To + + + Range + + + range + + + true/false + + + {0} ({1}) + + + Name + + + Condition + + + [ Options ] + + + Minimize + + + An error has occurred while trying to auto-save your design. Please increase your Flash Player storage settings. + + + Greater than or equal to + + + Less than or equal to + + + Group Name + + + Insert + + + {0} (default) + + + [ Choose Output ] + + + Create Conditions + + + Match Groups to Branches + + + Match Conditions to Branches + + + You are about to update your conditions for the selected output definition. This will clear all links to existing branches. Do you wish to continue? + + + Cannot update as no user defined conditions were found. You may need to set them up in the tool's authoring page(s). + + + user defined + + + Cannot save the design as the grouping activity '{0}' has more than one group with the same name. Please review the grouping and try again. + + + Insert/Merge... + + + To Preview your sequence, you need to save it first, then click Preview + + + Your design is not yet valid, but it has been saved, click 'Potential Issues' to see what's wrong. + + + Number of learners + + + Once you insert another sequence, you cannot Cancel this action – your old sequence is automatically saved with the new sequence inserted. To go back to your old sequence, you will need to delete all new sequence activities by hand, and then save. To leave your current sequence unchanged, click Cancel. Otherwise click OK to select a sequence to insert. + + + Can't create a transition between activities in different branches. + + + A branch to {0} already exists. + + + A branch from {0} already exists. + + + Cannot connect a new transition to a closed sequence. + + + To move an activity to a different sequence within Optional sequences, first drag the activity out of the Optional Sequence area, and then click and drag it to its new location inside Optional Sequences. + + + Group names cannot be blank. + + + Group names must be unique. + + + Learner's choice + + + Equal group sizes + + + Competence Editor + + + A competence with the title {0} already exists + + + The competence title cannot be blank + + + The competence you are attempting to delete is currently mapped to one or more activities. Deleting this competence will remove its mappings. Are you sure you want to proceed? + + + Competencies + + + Add + + + Competence Definition Dialog + + + Competence Mappings + + + Map Gate Conditions + + + All remaining conditions will be mapped to the selected gates closed state. + + + open + + + closed + + + Please make sure you have an activity selected before trying to view its competence mappings. + + + Changes have been successfully applied. + + + Import from LAMS Community... + + + Last modified: {0} + + + Title cannot contain special characters: {0} + + + Preferences + + + Preferences + + + Gradebook Output + + + View learners before selection? + + + Arrange Activities + + + Warning: This will clear all existing group to branch mappings linked to this grouping activity, would you like to continue? + + + Create branches + + + Select Output Conditions for Input + + + + Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml =================================================================== diff -u -r3a0659a3a5a5d9d184ae04db297efe2117bf5c9d -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml (.../CanvasArea.mxml) (revision 3a0659a3a5a5d9d184ae04db297efe2117bf5c9d) +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml (.../CanvasArea.mxml) (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -7,88 +7,8 @@ "; - } - } */ - - /* - // The dragEnter event handler for the Canvas container - // enables dropping. - private function dragEnterHandler(event:DragEvent):void { - if (event.dragSource.hasFormat("img")) - { - DragManager.acceptDragDrop(Canvas(event.currentTarget)); - } - } - - // The dragDrop event handler for the Canvas container - // sets the Image control's position by - // "dropping" it in its new location. - private function dragDropHandler(event:DragEvent):void { - - var image:Image; - - if (event.dragInitiator is ActivityComponent) { - var activityComponent:ActivityComponent; - activityComponent = event.dragInitiator as ActivityComponent; - activityComponent.x = UIComponent(event.currentTarget).mouseX - 10; - activityComponent.y = UIComponent(event.currentTarget).mouseY - 10; - } else { - var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent; - - if (learningLibraryComponent.learningLibraryEntry.isCombined) { - var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent(); - combinedActivityComponent.learningLibraryEntry = learningLibraryComponent.learningLibraryEntry; - combinedActivityComponent.load() - combinedActivityComponent.x = UIComponent(event.currentTarget).mouseX; - combinedActivityComponent.y = UIComponent(event.currentTarget).mouseY; - canvasBox.addChild(combinedActivityComponent); - } else { - var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent(); - toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0]; - toolActivityComponent.load() - toolActivityComponent.x = UIComponent(event.currentTarget).mouseX; - toolActivityComponent.y = UIComponent(event.currentTarget).mouseY; - canvasBox.addChild(toolActivityComponent); - } - } - - - }*/ - - /* private function maximizeLearningLibrary():void { - var effResize:Resize = new Resize(); - effResize.stop(); - effResize.heightFrom = 0; - effResize.heightTo = 12yy0; - effResize.duration = 100; - effResize.play([compLearningLibrary2]); - } */ ]]> @@ -105,7 +25,10 @@ - + + + Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml =================================================================== diff -u -rb18306871e780d0266af4b3135c37780f09d2b72 -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml (.../CanvasBox.mxml) (revision b18306871e780d0266af4b3135c37780f09d2b72) +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml (.../CanvasBox.mxml) (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -7,6 +7,8 @@ borderStyle="solid" width="4000" height="3000" x="0" y="0" + click="click(event)" + mouseDown="mouseDown(event)" > @@ -45,55 +47,8 @@ // sets the Image control's position by // "dropping" it in its new location. private function dragDropHandler(event:DragEvent):void { - - var dropActivityEvent:DropActivityEvent = new DropActivityEvent(DropActivityEvent.DROP_ACTIVITY_EVENT, event); - - Application.application.dispatchEvent(dropActivityEvent); - - /* if (event.dragInitiator is ActivityComponent) { - var activityComponent:ActivityComponent; - activityComponent = event.dragInitiator as ActivityComponent; - activityComponent.x = UIComponent(event.currentTarget).mouseX; - activityComponent.y = UIComponent(event.currentTarget).mouseY; - activityComponent.setCenter(); - activityComponent.updateTransitionPositions(); - } else if (event.dragInitiator is LearningLibraryEntryComponent) { - var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent; - - if (learningLibraryComponent.learningLibraryEntry.isCombined) { - var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent(); - combinedActivityComponent.learningLibraryEntry = learningLibraryComponent.learningLibraryEntry; - combinedActivityComponent.load() - combinedActivityComponent.x = UIComponent(event.currentTarget).mouseX; - combinedActivityComponent.y = UIComponent(event.currentTarget).mouseY; - this.addChild(combinedActivityComponent); - combinedActivityComponent.setCenter(); - } else { - var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent(); - toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0]; - toolActivityComponent.load() - toolActivityComponent.x = UIComponent(event.currentTarget).mouseX; - toolActivityComponent.y = UIComponent(event.currentTarget).mouseY; - this.addChild(toolActivityComponent); - toolActivityComponent.setCenter(); - } - } else if (event.dragInitiator is SystemActivityComponent) { - var systemActivityComponent:SystemActivityComponent = event.dragInitiator as SystemActivityComponent; - - switch (systemActivityComponent.type) { - case Constants.SYTEM_ACTIVITY_TYPE_OPTIONAL: - var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent(); - optionalActivityComponent.x = UIComponent(event.currentTarget).mouseX; - optionalActivityComponent.y = UIComponent(event.currentTarget).mouseY; - this.addChild(optionalActivityComponent); - optionalActivityComponent.setCenter(); - break; - } - } - - // Return cursor state to normal - Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL); */ + Application.application.dispatchEvent(dropActivityEvent); } public function doZoom(isOut:Boolean):void @@ -124,6 +79,20 @@ } + + // Deselect the current activity + protected function click(event:MouseEvent):void { + if (Application.application.selectedActivity != null) { + Application.application.selectedActivity.deSelectActivity(); + } + } + + protected function mouseDown(event:MouseEvent):void { + + if (Application.application.selectedActivity != null) { + Application.application.selectedActivity.deSelectActivity(); + } + } ]]> Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml =================================================================== diff -u --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml (revision 0) +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml =================================================================== diff -u -ra29b09f571d90b3bbb52490afb6691b5d4fb473f -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml (.../ActivityComponent.mxml) (revision a29b09f571d90b3bbb52490afb6691b5d4fb473f) +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml (.../ActivityComponent.mxml) (revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5) @@ -4,6 +4,7 @@ mouseDown="mouseDown(event)" mouseOver="mouseOver(event)" mouseOut="mouseOut(event)" + click="click(event)" >