Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r507885144beb497c8639eb64931c04b6e31c917f -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r507885144beb497c8639eb64931c04b6e31c917f -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r470bd43cd17fa6128a767fec948850a5815c1c55 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 470bd43cd17fa6128a767fec948850a5815c1c55)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -83,9 +83,9 @@
 	private var _groupings:Hashtable;
 	private var _branches:Hashtable;
 	private var _branchMappings:Hashtable;
+	private var _competences:Hashtable;
 	private var _outputConditions:Hashtable;
 	
-	
 	private var _licenseID:Number;
 	private var _licenseText:String;
 	private var _workspaceFolderID:Number;
@@ -108,6 +108,7 @@
 		_groupings = new Hashtable("_groupings");
 		_branches = new Hashtable("_branches");
 		_branchMappings = new Hashtable("_branchMappings");
+		_competences = new Hashtable("_competences");
 		_outputConditions = new Hashtable("_outputConditions");
 		
 		//set the defualts:
@@ -582,6 +583,13 @@
 				_branchMappings.put(newMappingEntry.entryUIID, newMappingEntry);
 		}
 		
+		//set the competences in the hashtable
+		_competences = new Hashtable("_competences");
+		for(var i=0; i<design.competences.length;i++){
+			var competenceDTO = design.competences[i];
+			_competences.put(competenceDTO.title, competenceDTO.description);
+		}
+		
 		return success;
 	}
 	
@@ -790,6 +798,16 @@
 		design.branchMappings = new Array();
 		var classMappingEntries = _branchMappings.values();
 		
+		design.competences = new Array();
+		if (competences.size() > 0) {
+			for (var i=0; i<competences.size(); i++) {
+				var cdto:Object = new Object();
+				cdto.title = competences.keys()[i];
+				cdto.description = competences.get(cdto.title);
+				design.competences.push(cdto);
+			}
+		}
+		
 		if(classMappingEntries.length > 0)
 			for(var i=0; i<classMappingEntries.length; i++)
 				if((classMappingEntries[i].branchingActivity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE 
@@ -1415,8 +1433,12 @@
 	
 	public function set branchMappings(a:Hashtable):Void {
 		_branchMappings = a;
-	}	
+	}
 	
+	public function get competences():Hashtable {
+		return _competences;
+	}
+	
 	public function set conditions(a:Hashtable):Void {
 		_outputConditions = a;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -r470bd43cd17fa6128a767fec948850a5815c1c55 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 470bd43cd17fa6128a767fec948850a5815c1c55)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -55,6 +55,8 @@
 	private var _supportsRunOffline:Boolean;
 	private var _supportsOutputs:Boolean;
 	
+	private var _competenceMappings:Array; // competences to which this activity is mapped
+	
 	private var _toolOutputDefinitions:Hashtable;
 	
 	function ToolActivity(activityUIID:Number){
@@ -65,6 +67,7 @@
 		_activityTypeID = TOOL_ACTIVITY_TYPE;
 		_toolOutputDefinitions = new Hashtable("_toolOutputDefinitions");
 		
+		_competenceMappings = new Array();
 	}
 	
 	//TODO: ADD A VALIDATE() FUNCTION
@@ -140,6 +143,13 @@
 			if(StringUtils.isWDDXNull(dto.extLmsId)) { _extLmsId = null }
 			else { _extLmsId = dto.extLmsId; }
 			 
+			_competenceMappings = new Array();
+			if(!StringUtils.isWDDXNull(dto.competenceMappingTitles)) {
+				for (var i=0; i<dto.competenceMappingTitles.length; i++) {
+					_competenceMappings.push(dto.competenceMappingTitles[i]);
+				}
+			}
+			
 			_supportsContribute = dto.supportsContribute;
 			_supportsDefineLater = dto.supportsDefineLater;
 			_supportsModeration = dto.supportsRunOffline
@@ -162,6 +172,14 @@
 		dto.toolID = (_toolID) ?  _toolID: Config.NUMERIC_NULL_VALUE;	
 		
 		dto.extLmsId = (_extLmsId) ? _extLmsId : Config.STRING_NULL_VALUE;
+		
+		dto.competenceMappings = new Array();
+		if (_competenceMappings.length > 0) {
+			for (var i=0; i<_competenceMappings.length; i++) {
+				dto.competenceMappings.push(_competenceMappings[i]);
+			}
+		}
+		
 		/* THESE are internal flags, not part of the design
 		dto.supportsContribute = (_supportsContribute!=null) ?  _supportsContribute: Config.BOOLEAN_NULL_VALUE;	
 		dto.supportsDefineLater = (_supportsDefineLater!=null) ?  _supportsDefineLater: Config.BOOLEAN_NULL_VALUE;	
@@ -235,6 +253,10 @@
 		return _toolOutputDefinitions.values();
 	}
 	
+	public function get competenceMappings():Array {
+		return _competenceMappings	
+	}
+	
 	//GETTERS + SETTERS
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -0,0 +1,284 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+ 
+
+import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.style.*
+ 
+import org.lamsfoundation.lams.authoring.*
+import org.lamsfoundation.lams.authoring.br.*
+import org.lamsfoundation.lams.authoring.cmpt.*;
+ 
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.events.*
+
+/*
+* Competence Container representing a single competence within the competence editor dialog
+* @author  Daniel Carlier
+*/
+class org.lamsfoundation.lams.authoring.cmpt.CompetenceContainer extends MovieClip {
+
+    //References to components + clips 
+    private var _container:MovieClip;  //The container window that holds the dialog
+	
+	private var _competenceTitle:String;
+	private var _description:String;
+	
+	private var competence_title_lbl:Label;
+	private var competence_description_lbl:Label;
+	
+	private var competence_title_txt:TextField;
+	private var competence_description_txt:TextArea;
+	
+	private var edit_competence_btn:Button;
+	private var delete_competence_btn:Button;
+	
+    private var _bgpanel:MovieClip;       //The underlaying panel base
+	private var definitionDialog:MovieClip;
+	
+	private var app:Application;
+    private var fm:FocusManager;            //Reference to focus manager
+    private var themeManager:ThemeManager;  //Theme manager
+	
+    //Dimensions for resizing
+    private var xOkOffset:Number;
+    private var yOkOffset:Number;
+    private var xCancelOffset:Number;
+    private var yCancelOffset:Number;
+
+    //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+    
+    /**
+    * constructor
+    */
+    function CompetenceContainer(){
+        //Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+		
+		app = Application.getInstance();
+		
+        //Create a clip that will wait a frame before dispatching init to give components time to setup
+        this.onEnterFrame = init;
+    }
+
+    /**
+    * Called a frame after movie attached to allow components to initialise
+    */
+    private function init():Void{
+        //Delete the enterframe dispatcher
+        delete this.onEnterFrame;
+        
+        //set the reference to the StyleManager
+        themeManager = ThemeManager.getInstance();
+		
+		competence_title_lbl.text = "Title";
+		competence_description_lbl.text = "Description";
+		
+		edit_competence_btn.label = "Edit";
+		delete_competence_btn.label = "Delete";
+		
+		competence_title_txt.editable = false;
+		competence_description_txt.editable = false;
+		
+		if (_competenceTitle != null) competence_title_txt.text = _competenceTitle;
+		if (_description != null) competence_description_txt.text = _description;
+		
+        //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
+        fm = _container.getFocusManager();
+        fm.enabled = true;
+        
+        //EVENTS
+        //Add event listeners for ok, cancel and close buttons
+		edit_competence_btn.addEventListener('click',Delegate.create(this, editHandler));
+        delete_competence_btn.addEventListener('click',Delegate.create(this, deleteHandler));
+		
+        //work out offsets from bottom RHS of panel
+        xOkOffset = _bgpanel._width;// - close_btn._x;
+        yOkOffset = _bgpanel._height;// - close_btn._y;
+        
+        //Register as listener with StyleManager and set Styles
+        themeManager.addEventListener('themeChanged',this);
+        setStyles();
+		
+        //fire event to say we have loaded
+		_container.contentLoaded();
+	}
+    
+	public function setUpContent():Void{
+		this._visible = true;
+	}
+	
+	public function editHandler():Void {
+		Debugger.log("editCompetence clicked: _competenceTitle "+_competenceTitle, Debugger.CRITICAL, "editHandler", "CompetenceContainer");
+		CompetenceEditorDialog(app.dialog.scrollContent).editingCompetence = _competenceTitle;
+		
+		definitionDialog = app.getCanvas().openCompetenceDefinitionWindow();
+		Selection.setFocus(definitionDialog.scrollContent);
+	}
+	
+	public function deleteHandler():Void {
+		Debugger.log("delete button clicked", Debugger.CRITICAL, "editCompetence", "CompetenceContainer");
+		
+		var _isMapped:Boolean = isCompetenceMapped();
+		
+		if (_isMapped) {
+			LFMessage.showMessageConfirm("The competence you are attempting to delete is currently mapped to one or more activities. Deleting this competence will remove it's mappings. Are you sure you want to proceed?", Proxy.create(this, deleteMappedCompetences, _competenceTitle), null);
+		} else {
+			deleteCompetence();
+		}
+		
+	}
+	
+	/*
+	* Returns true if the competence is mapped to an activity
+	*/
+	private function isCompetenceMapped():Boolean {
+		
+		var activityKeys = app.getDesignDataModel().activities.keys();
+		
+		for (var i=0; i<activityKeys.length; i++) {
+			if (app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity) {
+				var competenceMappings:Array = ToolActivity(app.getDesignDataModel().activities.get(activityKeys[i])).competenceMappings;
+				for (var j=0; j<competenceMappings.length; j++) {
+					if (competenceMappings[j] == _competenceTitle)
+						return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	/*
+	* Deletes competence mappings to where an activity is mapped to the competence
+	*/
+	private function deleteMappedCompetences(competenceTitle:String) {
+		
+		// remove applied mappings
+		var activityKeys = app.getDesignDataModel().activities.keys();
+				
+		for (var i=0; i<activityKeys.length; i++) {
+			
+			Debugger.log("app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity: "+(app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity), Debugger.CRITICAL, "deleteMappedCompetences", "CompetenceContainer");
+			if (app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity) {
+				var competenceMappings:Array = ToolActivity(app.getDesignDataModel().activities.get(activityKeys[i])).competenceMappings;
+				for (var j=0; j<competenceMappings.length; j++) {
+					if (competenceMappings[j] == competenceTitle) {
+						competenceMappings.splice(j,1); // remove the competence mapping from the activity
+					}
+				}
+			}
+		}
+		deleteCompetence();
+	}
+	
+	
+	private function deleteCompetence() {
+		// app.dialog.scrollContent must be an instance of CompetenceEditorDialog
+		var competenceEditorDialog:CompetenceEditorDialog = CompetenceEditorDialog(app.dialog.scrollContent);
+		app.getDesignDataModel().competences.remove(_competenceTitle);
+			
+		competenceEditorDialog.clear();
+		MovieClipUtils.doLater(Proxy.create(competenceEditorDialog, competenceEditorDialog.draw));
+		
+		this.removeMovieClip();
+	}
+	
+    /**
+    * Event fired by StyleManager class to notify listeners that Theme has changed
+    * it is up to listeners to then query Style Manager for relevant style info
+    */
+    public function themeChanged(evt:Object):Void{
+        if(evt.type=='themeChanged') {
+            //Theme has changed so update objects to reflect new styles
+            setStyles();
+        }else {
+            Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','CompetenceDefinitionDialog');
+        }
+    }
+	
+    /**
+    * Called on initialisation and themeChanged event handler
+    */
+    private function setStyles(){
+        //LFWindow, goes first to prevent being overwritten with inherited styles.
+        var styleObj = themeManager.getStyleObject('LFWindow');
+        _container.setStyle('styleName', styleObj);
+
+        //Get the button style from the style manager and apply to both buttons
+        styleObj = themeManager.getStyleObject('button');
+		edit_competence_btn.setStyle('styleName', styleObj);
+        delete_competence_btn.setStyle('styleName', styleObj);
+       
+		styleObj = themeManager.getStyleObject('CanvasPanel');
+		_bgpanel.setStyle('styleName', styleObj);
+
+        //Apply label style 
+        styleObj = themeManager.getStyleObject('label');
+        competence_title_lbl.setStyle('styleName', styleObj);
+        competence_description_lbl.setStyle('styleName', styleObj);
+		competence_title_txt.setStyle('styleName', styleObj);
+		competence_description_txt.setStyle('styleName', styleObj);
+    }
+	
+    /**
+    * Called by the OK button 
+    */
+    private function close(){
+
+		_container.deletePopUp();
+    }
+	
+    /**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+        e.target.deletePopUp();
+    }
+    
+    /**
+    * Main resize method, called by scrollpane container/parent
+    */
+    public function setSize(w:Number,h:Number):Void{
+		//Size the panel
+        _bgpanel.setSize(w,h);
+		
+    }
+    
+    //Gets+Sets
+    /**
+    * set the container refernce to the window holding the dialog
+    */
+    function set container(value:MovieClip){
+        _container = value;
+    }
+
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -0,0 +1,298 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.style.*
+ 
+import org.lamsfoundation.lams.authoring.*
+import org.lamsfoundation.lams.authoring.br.*
+import org.lamsfoundation.lams.authoring.cmpt.CompetenceEditorDialog;
+ 
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.events.*
+
+/*
+* Competence Definition Dialog for defining/editing and adding new competences
+* @author  Daniel Carlier
+*/
+class org.lamsfoundation.lams.authoring.cmpt.CompetenceDefinitionDialog extends MovieClip implements Dialog {
+
+    //References to components + clips 
+    private var _container:MovieClip;  //The container window that holds the dialog
+	
+	private var add_competence_btn:Button;
+	private var save_competence_btn:Button;
+    private var close_btn:Button;         // Close button
+    
+	private var competence_title_lbl:Label;
+	private var competence_description_lbl:Label;
+	
+	private var competence_title_txt:TextField;
+	private var competence_description_txt:TextArea;
+	
+    private var _bgpanel:MovieClip;       //The underlaying panel base
+	
+	private var editingCompetence:String; // The competence (if any) being edited
+	
+	private var app:Application;
+    private var fm:FocusManager;            //Reference to focus manager
+    private var themeManager:ThemeManager;  //Theme manager
+	
+    //Dimensions for resizing
+    private var xOkOffset:Number;
+    private var yOkOffset:Number;
+    private var xCancelOffset:Number;
+    private var yCancelOffset:Number;
+
+    //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+    
+    /**
+    * constructor
+    */
+    function CompetenceDefinitionDialog(){
+        //Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+		
+		app = Application.getInstance();
+		
+        //Create a clip that will wait a frame before dispatching init to give components time to setup
+        this.onEnterFrame = init;
+    }
+
+    /**
+    * Called a frame after movie attached to allow components to initialise
+    */
+    private function init():Void{
+        //Delete the enterframe dispatcher
+        delete this.onEnterFrame;
+        
+        //set the reference to the StyleManager
+        themeManager = ThemeManager.getInstance();
+        
+		fm = _container.getFocusManager();
+		
+        //Set the text for buttons
+        close_btn.label = "Cancel";
+		
+		competence_title_lbl.text = "Title";
+		competence_description_lbl.text = "Description";
+		
+		add_competence_btn.label = "Add";
+		save_competence_btn.label = "Save";
+		
+		editingCompetence = CompetenceEditorDialog(app.dialog.scrollContent).editingCompetence;
+		
+        //EVENTS
+        //Add event listeners for ok, cancel and close buttons
+		add_competence_btn.addEventListener('click', Delegate.create(this, addNewCompetence));
+		save_competence_btn.addEventListener('click', Delegate.create(this, updateCompetence));
+        close_btn.addEventListener('click',Delegate.create(this, close));
+		
+		//Assign Click (close button) and resize handlers
+        _container.addEventListener('click',this);
+        _container.addEventListener('size',this);
+		
+        //work out offsets from bottom RHS of panel
+        xOkOffset = _bgpanel._width - close_btn._x;
+        yOkOffset = _bgpanel._height - close_btn._y;
+        
+        //Register as listener with StyleManager and set Styles
+        themeManager.addEventListener('themeChanged',this);
+        setStyles();
+		setTabIndex();
+
+        //fire event to say we have loaded
+		_container.contentLoaded();
+	}
+	
+	private function setTabIndex() {
+		competence_title_txt.tabIndex = 501;
+		competence_description_txt.tabIndex = 502;
+		
+		add_competence_btn.tabIndex = 503;
+		save_competence_btn.tabIndex = 504;
+		close_btn.tabIndex = 505;
+	}
+	
+	public function setUpContent():Void{
+		
+		if (editingCompetence != null && editingCompetence != undefined) { // if we are editing an existing competence
+			add_competence_btn.visible = false;
+			save_competence_btn.visible = true;
+			competence_title_txt.text = editingCompetence;
+			competence_description_txt.text = app.getDesignDataModel().competences.get(editingCompetence);
+		} else {
+			add_competence_btn.visible = true;
+			save_competence_btn.visible = false;
+			Selection.setFocus(competence_title_txt);
+		}
+		
+		this._visible = true;
+	}
+	
+    /**
+    * Event fired by StyleManager class to notify listeners that Theme has changed
+    * it is up to listeners to then query Style Manager for relevant style info
+    */
+    public function themeChanged(evt:Object):Void{
+        if(evt.type=='themeChanged') {
+            //Theme has changed so update objects to reflect new styles
+            setStyles();
+        }else {
+            Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','CompetenceDefinitionDialog');
+        }
+    }
+	
+    /**
+    * Called on initialisation and themeChanged event handler
+    */
+    private function setStyles(){
+        //LFWindow, goes first to prevent being overwritten with inherited styles.
+        var styleObj = themeManager.getStyleObject('LFWindow');
+        _container.setStyle('styleName', styleObj);
+
+        //Get the button style from the style manager and apply to both buttons
+        styleObj = themeManager.getStyleObject('button');
+		add_competence_btn.setStyle('styleName', styleObj);
+		save_competence_btn.setStyle('styleName', styleObj);
+        close_btn.setStyle('styleName', styleObj);
+       
+		styleObj = themeManager.getStyleObject('CanvasPanel');
+		_bgpanel.setStyle('styleName', styleObj);
+		
+        //Apply label style 
+        styleObj = themeManager.getStyleObject('label');
+        competence_title_lbl.setStyle('styleName', styleObj);
+        competence_description_lbl.setStyle('styleName', styleObj);
+		competence_title_txt.setStyle('styleName', styleObj);
+		competence_description_txt.setStyle('styleName', styleObj);
+    }
+	
+	private function addNewCompetence():Void {
+		var competenceName:String = StringUtils.trim(competence_title_txt.text);
+		var competenceDesc:String = StringUtils.trim(competence_description_txt.text);
+		
+		if (competenceName.length == 0) {
+			LFMessage.showMessageAlert("The competence title cannot be blank", null);
+		}
+		else if (app.getDesignDataModel().competences.containsKey(competenceName)) {
+			// entry already exists, do not add
+			LFMessage.showMessageAlert("A competence with the title '"+competenceName+"' already exists", null);
+		} 
+		else {
+			// add the new competence to the hashtable
+			app.getDesignDataModel().competences.put(competenceName, competenceDesc);
+
+			CompetenceEditorDialog(app.dialog.scrollContent).clear();
+			CompetenceEditorDialog(app.dialog.scrollContent).draw();
+		}
+		
+		_container.deletePopUp();
+	}
+	
+	// used for updating an existing competence
+	private function updateCompetence():Void {
+		
+		var updatedCompetenceName:String = StringUtils.trim(competence_title_txt.text);
+		var updatedCompetenceDesc:String = StringUtils.trim(competence_description_txt.text);
+		
+		if (editingCompetence != null && editingCompetence != undefined && app.getDesignDataModel().competences.containsKey(editingCompetence)) {
+			if (updatedCompetenceName.length > 0) {
+				app.getDesignDataModel().competences.remove(editingCompetence);  // remove the original competencetitle
+				app.getDesignDataModel().competences.put(updatedCompetenceName, updatedCompetenceDesc);
+	
+				// if the competence title has changed, update the mappings for all activities to the new competence title
+				if (editingCompetence != updatedCompetenceName) { 
+					
+					var activityKeys:Array = app.getDesignDataModel().activities.keys(); // contains the activity UIIDs
+					
+					for (var i=0; i<activityKeys.length; ++i) {
+
+						if (app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity) {
+							var competenceMappings:Array = ToolActivity(app.getDesignDataModel().activities.get(activityKeys[i])).competenceMappings;
+							for (var j=0; j<competenceMappings.length; ++j) {
+								if (competenceMappings[j] == editingCompetence) {
+									competenceMappings[j] = updatedCompetenceName;
+								}
+							}
+						}
+					}
+				}
+				
+				CompetenceEditorDialog(app.dialog.scrollContent).clear();
+				CompetenceEditorDialog(app.dialog.scrollContent).draw();
+			}
+			else {
+				LFMessage.showMessageAlert("The competence title cannot be blank", null);
+			}
+		} 
+		
+		_container.deletePopUp();
+	}
+	
+    /**
+    * Called by the OK button 
+    */
+    private function close(){
+
+		_container.deletePopUp();
+
+    }
+	
+    /**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+        e.target.deletePopUp();
+    }
+    
+    /**
+    * Main resize method, called by scrollpane container/parent
+    */
+    public function setSize(w:Number,h:Number):Void{
+		//Size the panel
+        _bgpanel.setSize(w,h);
+
+        //Buttons
+        close_btn.move(w-xOkOffset,h-yOkOffset);
+		
+    }
+    
+    //Gets+Sets
+    /**
+    * set the container refernce to the window holding the dialog
+    */
+    function set container(value:MovieClip){
+        _container = value;
+    }
+
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -0,0 +1,310 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.style.*
+ 
+import org.lamsfoundation.lams.authoring.*
+import org.lamsfoundation.lams.authoring.br.*
+
+import org.lamsfoundation.lams.authoring.cmpt.CompetenceDefinitionDialog;
+import org.lamsfoundation.lams.authoring.cv.CanvasModel;
+import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
+
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.events.*
+import mx.containers.ScrollPane;
+
+/*
+* Competence Editor Dialog for defining and adding new competences
+* @author  Daniel Carlier
+*/
+class org.lamsfoundation.lams.authoring.cmpt.CompetenceEditorDialog extends MovieClip implements Dialog {
+
+    //References to components + clips 
+	private var add_competence_btn:Button;
+    private var close_btn:Button;        
+	
+	public var className:String = 'CompetenceEditorDialog';
+	private var _editingCompetence:String; // The competence (if any) being edited
+	
+	private var competence_lbl:Label;
+	
+    private var _bgpanel:MovieClip;        //The underlaying panel base
+	private var _container:MovieClip;  	//The container window that holds the dialog
+	private var competenceContainer:MovieClip;
+	private var main_mc:MovieClip
+	private var competenceContainerLayer:MovieClip;
+	private var definitionDialog:MovieClip;
+	
+	private var competence_editor_scp:ScrollPane;
+		
+	private var app; // application instance
+	private var model:Observable;
+    private var fm:FocusManager;            //Reference to focus manager
+    private var themeManager:ThemeManager;  //Theme manager
+	
+    //Dimensions for resizing
+    private var xOkOffset:Number;
+    private var yOkOffset:Number;
+	private var selectedActivityUIID:Number
+	private var yContainerOffset:Number;
+
+    //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+    
+    /**
+    * constructor
+    */
+    function CompetenceEditorDialog(){
+        //Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+		
+        //Create a clip that will wait a frame before dispatching init to give components time to setup
+		this.onEnterFrame = init;
+    }
+
+    /**
+    * Called a frame after movie attached to allow components to initialise
+    */
+    private function init():Void{
+        //Delete the enterframe dispatcher
+        delete this.onEnterFrame;
+        
+		this._visible = false;
+        
+		//set the reference to the StyleManager
+        themeManager = ThemeManager.getInstance();
+		
+        //Set the text for buttons
+        //close_btn.label = Dictionary.getValue('al_ok');
+		competence_lbl.text = "Competences";
+		
+		add_competence_btn.label = "Add"
+        close_btn.label = "Close";
+			
+		main_mc = competence_editor_scp.content;
+		
+		// add new layer here on top of main_mc and then remove it whenever we need to redraw the container contents
+		competenceContainerLayer = main_mc.createEmptyMovieClip("competenceContainerLayer", main_mc.getNextHighestDepth());
+		
+        //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
+        fm = _container.getFocusManager();
+        
+        //EVENTS
+        //Add event listeners for ok, cancel and close buttons
+		add_competence_btn.addEventListener('click',Delegate.create(this, openCompetenceDefinitionDialog));
+        close_btn.addEventListener('click',Delegate.create(this, close));
+		
+		//Assign Click (close button) and resize handlers
+        _container.addEventListener('click',this);
+        _container.addEventListener('size',this);
+        
+		//work out offsets from bottom RHS of panel
+        xOkOffset = _bgpanel._width - close_btn._x;
+        yOkOffset = _bgpanel._height - close_btn._y;
+        
+        //Register as listener with StyleManager and set Styles
+        themeManager.addEventListener('themeChanged',this);
+        setStyles();
+		 
+        //fire event to say we have loaded
+		_container.contentLoaded();
+	}
+	
+    public function setUpContent(model:Observable):Void{
+		
+		setModel(model);
+		
+		if (model instanceof CanvasModel) {
+			app = org.lamsfoundation.lams.authoring.Application.getInstance();
+		} else if (model instanceof MonitorModel){
+			app = org.lamsfoundation.lams.monitoring.Application.getInstance();
+			
+			selectedActivityUIID = app.monitor.model.selectedItem.activity.activityUIID;
+			if (app.monitor.ddm.activities.get(selectedActivityUIID) instanceof ToolActivity) {
+				var activityTitle:String = ToolActivity(app.monitor.ddm.activities.get(selectedActivityUIID)).title;
+				competence_lbl.text = "Competences mapped to "+activityTitle;
+			}
+		} else {
+			Debugger.log("model type not recognized", Debugger.CRITICAL, "setUpContent", "CompetenceEditorDialog");
+			// other model types not currently supported
+		}
+
+		draw();
+		this._visible = true;
+	}
+	
+	public function clear():Void {
+		competenceContainerLayer.removeMovieClip();
+		competenceContainerLayer = main_mc.createEmptyMovieClip("competenceContainerLayer", main_mc.getNextHighestDepth());
+	}
+	
+	/*
+	* If we are in author the competence keys correspond to all competences in the ddm
+	* If we are in monitor the competence keys correspond to the competences mapped to the selected activity
+	* @return competenceKeys an array of the competence keys to draw
+	*/
+	private function getCompetenceKeysToDraw():Array {
+		
+		var competenceKeys:Array;
+		
+		if (model instanceof MonitorModel) {			
+	
+			if (app.monitor.ddm.activities.get(selectedActivityUIID) instanceof ToolActivity) {
+				competenceKeys = ToolActivity(app.monitor.ddm.activities.get(selectedActivityUIID)).competenceMappings;
+			}
+		} else if (model instanceof CanvasModel) { // CanvasModel
+			competenceKeys = app.getDesignDataModel().competences.keys();
+		}
+		return competenceKeys;
+	}
+	
+	public function draw() {
+		
+		var competenceKeys:Array = getCompetenceKeysToDraw();
+		competenceKeys.sort();
+		
+		yContainerOffset = 0;
+		
+		for (var i=0; i<competenceKeys.length; i++) {
+			
+			var titleKey:String = competenceKeys[i];		
+			var descriptionValue:String = (model instanceof MonitorModel) ? app.monitor.ddm.competences.get(competenceKeys[i]) : app.getDesignDataModel().competences.get(competenceKeys[i]);
+			var competenceTitle:String = new String("competenceContainer_"+titleKey);
+			var mc:MovieClip = competenceContainerLayer.attachMovie("competenceContainer", competenceTitle, competenceContainerLayer.getNextHighestDepth(), {_x:0, _y:yContainerOffset, _competenceTitle:titleKey, _description:descriptionValue});
+
+			yContainerOffset = yContainerOffset + 120;
+		}
+		
+		competence_editor_scp.invalidate();
+	}
+	
+	// The competence to be edited in the CompetenceDefinitionDialog
+	public function get editingCompetence():String {
+		return _editingCompetence;
+	}
+	
+	public function set editingCompetence(ec:String):Void {
+		_editingCompetence = ec;
+	}
+	
+	public function openCompetenceDefinitionDialog():Void{
+		
+		_editingCompetence = null;
+		
+		definitionDialog = app.getCanvas().openCompetenceDefinitionWindow();
+		Selection.setFocus(definitionDialog.scrollContent);
+	}
+
+	/**
+    * Event fired by StyleManager class to notify listeners that Theme has changed
+    * it is up to listeners to then query Style Manager for relevant style info
+    */
+    public function themeChanged(evt:Object):Void{
+        if(evt.type=='themeChanged') {
+            //Theme has changed so update objects to reflect new styles
+            setStyles();
+        }else {
+            Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','CompetenceEditorDialog');
+        }
+    }
+	
+    /**
+    * Called on initialisation and themeChanged event handler
+    */
+    private function setStyles(){
+        //LFWindow, goes first to prevent being overwritten with inherited styles.
+        var styleObj = themeManager.getStyleObject('LFWindow');
+        _container.setStyle('styleName', styleObj);
+
+		styleObj = themeManager.getStyleObject('scrollpane');
+		competence_editor_scp.setStyle('styleName', styleObj);
+
+        //Get the button style from the style manager and apply to both buttons
+        styleObj = themeManager.getStyleObject('button');
+		add_competence_btn.setStyle('styleName', styleObj);
+        close_btn.setStyle('styleName', styleObj);
+       
+		styleObj = themeManager.getStyleObject('CanvasPanel');
+		_bgpanel.setStyle('styleName', styleObj);
+		
+        //Apply label style 
+        styleObj = themeManager.getStyleObject('label');
+        competence_lbl.setStyle('styleName', styleObj);
+    }
+	
+    /**
+    * Called by the close button 
+    */
+    private function close(){
+		
+		_container.deletePopUp();
+    }
+	
+    /**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+        e.target.deletePopUp();
+    }
+	
+	/**
+    * set model to either 'authoring' or 'monitoring'
+    */
+	public function setModel(m:Observable) {
+		model = m;
+	}
+	
+    /**
+    * Main resize method, called by scrollpane container/parent
+    */
+    public function setSize(w:Number,h:Number):Void{
+		//Size the panel
+        _bgpanel.setSize(w,h);
+
+		competence_editor_scp.setSize(w-45, h-82);
+		
+        //Buttons
+		add_competence_btn.move(add_competence_btn._x,h-yOkOffset);
+        close_btn.move(w-xOkOffset,h-yOkOffset);
+		
+    }
+    
+    //Gets+Sets
+    /**
+    * set the container refernce to the window holding the dialog
+    */
+    function set container(value:MovieClip){
+        _container = value;
+    }
+
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -0,0 +1,289 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.style.*
+ 
+import org.lamsfoundation.lams.authoring.*
+import org.lamsfoundation.lams.authoring.br.*
+
+import org.lamsfoundation.lams.authoring.cmpt.CompetenceMappingItem;
+
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.events.*
+import mx.containers.ScrollPane;
+
+/*
+* Competence Mapping Dialog for mapping competences to activities
+* @author  Daniel Carlier
+*/
+class org.lamsfoundation.lams.authoring.cmpt.CompetenceMappingDialog extends MovieClip implements Dialog {
+
+    //References to components + clips 
+    private var close_btn:Button;        
+	
+	public var className:String = 'CompetenceMappingDialog';
+    
+	private var competence_mapping_lbl:Label;
+	
+    private var _bgpanel:MovieClip;        //The underlaying panel base
+	private var _container:MovieClip;  	//The container window that holds the dialog
+	private var main_mc:MovieClip
+	private var competenceContainerLayer:MovieClip;
+	
+	private var competence_mapping_scp:ScrollPane;
+		
+	private var competenceItemMCs:Array;	
+		
+	private var app:Application;
+    private var fm:FocusManager;            //Reference to focus manager
+    private var themeManager:ThemeManager;  //Theme manager
+	
+    //Dimensions for resizing
+    private var xOkOffset:Number;
+    private var yOkOffset:Number;
+    private var xCancelOffset:Number;
+    private var yCancelOffset:Number;
+	
+	private var yContainerOffset:Number;
+
+    //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+    
+    /**
+    * constructor
+    */
+    function CompetenceMappingDialog(){
+        //Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+			
+		app = Application.getInstance();
+		
+        //Create a clip that will wait a frame before dispatching init to give components time to setup
+		this.onEnterFrame = init;
+    }
+
+    /**
+    * Called a frame after movie attached to allow components to initialise
+    */
+    private function init():Void{
+        //Delete the enterframe dispatcher
+        delete this.onEnterFrame;
+        
+		this._visible = false;
+		
+		//set the reference to the StyleManager
+        themeManager = ThemeManager.getInstance();
+
+        //Set the text for buttons
+        //close_btn.label = Dictionary.getValue('al_ok');
+		competence_mapping_lbl.text = "Competences mapped to "+app.canvas.model.selectedItem.activity.title;
+		
+        close_btn.label = "OK";
+		
+		main_mc = competence_mapping_scp.content;
+		
+		// add new layer here on top of main_mc and then remove it whenever we need to redraw the container contents
+		competenceContainerLayer = main_mc.createEmptyMovieClip("competenceContainerLayer", main_mc.getNextHighestDepth());
+		
+        //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
+        fm = _container.getFocusManager();
+        fm.enabled = true;
+        
+        //EVENTS
+        //Add event listeners for ok, cancel and close buttons
+        close_btn.addEventListener('click',Delegate.create(this, close));
+		
+		//Assign Click (close button) and resize handlers
+        _container.addEventListener('click',this);
+        _container.addEventListener('size',this);
+        
+		//work out offsets from bottom RHS of panel
+        xOkOffset = _bgpanel._width - close_btn._x;
+        yOkOffset = _bgpanel._height - close_btn._y;
+        
+        //Register as listener with StyleManager and set Styles
+        themeManager.addEventListener('themeChanged',this);
+        setStyles();
+		
+		setUpContent(); //maybe call from elsewhere
+		
+        //fire event to say we have loaded
+		_container.contentLoaded();
+	}
+    
+    public function setUpContent():Void{
+		draw();
+		this._visible = true;
+		
+	}
+	
+	public function draw(evt:Object) {
+		
+		var competenceKeys:Array = app.getDesignDataModel().competences.keys();
+		competenceKeys.sort();
+		var mappedCompetences:Array = new Array();
+		
+		competenceItemMCs = new Array();
+		yContainerOffset = 15;
+		
+		var selectedActivityUIID:Number = app.canvas.model.selectedItem.activity.activityUIID;
+		
+		if (app.getDesignDataModel().activities.get(selectedActivityUIID) instanceof ToolActivity) {
+			mappedCompetences = ToolActivity(app.getDesignDataModel().activities.get(selectedActivityUIID)).competenceMappings;
+		}
+		
+		var checked:Boolean; // true if competence is to be checked for selected activity
+		
+		// for each defined competence, see if it is mapped to this activity
+		for (var i=0; i<competenceKeys.length; i++) {
+			
+			checked = false;
+			
+			var competenceTitle:String = competenceKeys[i];
+			
+			for (var j=0; j<mappedCompetences.length; j++) {	
+				if (mappedCompetences[j] == competenceTitle) {
+					checked = true;
+				}
+			}
+				
+			var mc:MovieClip = competenceContainerLayer.attachMovie("competenceMappingItem", competenceTitle, competenceContainerLayer.getNextHighestDepth(), {_x:0, _y:yContainerOffset, _competenceNum:(i+1), _competenceTitle:competenceTitle, _checked:checked});
+			
+			competenceItemMCs.push(mc);
+			yContainerOffset = yContainerOffset + 45;
+		}
+		
+		competence_mapping_scp.invalidate();
+	}
+
+	/**
+    * Event fired by StyleManager class to notify listeners that Theme has changed
+    * it is up to listeners to then query Style Manager for relevant style info
+    */
+    public function themeChanged(evt:Object):Void{
+        if(evt.type=='themeChanged') {
+            //Theme has changed so update objects to reflect new styles
+            setStyles();
+        }else {
+            Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','CompetenceMappingDialog');
+        }
+    }
+	
+    /**
+    * Called on initialisation and themeChanged event handler
+    */
+    private function setStyles(){
+        //LFWindow, goes first to prevent being overwritten with inherited styles.
+        var styleObj = themeManager.getStyleObject('LFWindow');
+        _container.setStyle('styleName', styleObj);
+
+        //Get the button style from the style manager and apply to both buttons
+        styleObj = themeManager.getStyleObject('button');
+        close_btn.setStyle('styleName', styleObj);
+       
+		styleObj = themeManager.getStyleObject('CanvasPanel');
+		_bgpanel.setStyle('styleName', styleObj);
+		
+        //Apply label style 
+        styleObj = themeManager.getStyleObject('label');
+        competence_mapping_lbl.setStyle('styleName', styleObj);
+    }
+	
+    /**
+    * Called by the close button 
+    */
+    private function close(){
+		
+		var activityUIID:Number = app.canvas.model.selectedItem.activity.activityUIID;
+		var selectedAct = app.getDesignDataModel().activities.get(activityUIID);
+		
+		if (selectedAct instanceof ToolActivity) {
+			//competenceItemMCs contains a reference to drawn competenceItem movieclips
+			for (var i=0; i<competenceItemMCs.length; i++){
+				var cmi:CompetenceMappingItem = CompetenceMappingItem(competenceItemMCs[i]);
+				var _isMapped:Boolean = cmi.isMapped;
+				if (_isMapped) {
+					var addMapping:Boolean = true;
+					for (var j=0; j<selectedAct.competenceMappings.length; j++) {
+						if (selectedAct.competenceMappings[j] == cmi.competenceTitle) {
+							addMapping = false;
+						}
+					}
+					if (addMapping) {
+						selectedAct.competenceMappings.push(cmi.competenceTitle);
+						Debugger.log("added a mapping, selectedAct.competenceMappings.length: "+selectedAct.competenceMappings.length, Debugger.CRITICAL, "close", "CompetenceMappingDialog");
+					}
+				} 
+				else {
+					// if the mapping exists remove the mapping
+					for (var j=0; j<selectedAct.competenceMappings.length; j++) {
+						if (selectedAct.competenceMappings[j] == cmi.competenceTitle) {
+							selectedAct.competenceMappings.splice(j,1); // remove the competence mapping from the activity
+						}
+					}
+				}
+			}
+		}
+		
+		_container.deletePopUp();
+    }
+	
+    /**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+        e.target.deletePopUp();
+    }
+	   
+    /**
+    * Main resize method, called by scrollpane container/parent
+    */
+    public function setSize(w:Number,h:Number):Void{
+		//Size the panel
+        _bgpanel.setSize(w,h);
+
+		competence_mapping_scp.setSize(w, h-80);
+		
+        //Buttons
+        close_btn.move(w-xOkOffset,h-yOkOffset);
+		
+    }
+    
+    //Gets+Sets
+    /**
+    * set the container refernce to the window holding the dialog
+    */
+    function set container(value:MovieClip){
+        _container = value;
+    }
+
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -0,0 +1,183 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+ 
+
+import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.style.*
+ 
+import org.lamsfoundation.lams.authoring.*
+import org.lamsfoundation.lams.authoring.br.*
+import org.lamsfoundation.lams.authoring.cmpt.*;
+ 
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.events.*
+
+/*
+* Competence Container representing a single competence within the competence editor dialog
+* @author  Daniel Carlier
+*/
+class org.lamsfoundation.lams.authoring.cmpt.CompetenceMappingItem extends MovieClip {
+
+    //References to components + clips 
+	private var _bgpanel:MovieClip;       //The underlaying panel base
+	private var _container:MovieClip;  //The container window that holds the dialog
+	
+	private var _competenceNum:String;
+	private var _competenceTitle:String;
+	
+	private var _checked:Boolean;
+	
+	private var competence_number_lbl:Label;
+	private var competence_title_txt:TextField;
+	
+	private var _map_competence_checkbox:CheckBox;
+	
+	private var app:Application;
+    private var fm:FocusManager;            //Reference to focus manager
+    private var themeManager:ThemeManager;  //Theme manager
+	
+    //Dimensions for resizing
+    private var xOkOffset:Number;
+    private var yOkOffset:Number;
+    private var xCancelOffset:Number;
+    private var yCancelOffset:Number;
+
+    //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+    
+    /**
+    * constructor
+    */
+    function CompetenceMappingItem(){
+        //Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+		
+		app = Application.getInstance();
+		
+        //Create a clip that will wait a frame before dispatching init to give components time to setup
+        this.onEnterFrame = init;
+    }
+
+    /**
+    * Called a frame after movie attached to allow components to initialise
+    */
+    private function init():Void{
+        //Delete the enterframe dispatcher
+        delete this.onEnterFrame;
+        
+        //set the reference to the StyleManager
+        themeManager = ThemeManager.getInstance();
+
+		competence_title_txt.editable = false;
+		
+		if (_competenceNum != null) competence_number_lbl.text = _competenceNum;
+		if (_competenceTitle != null) competence_title_txt.text = _competenceTitle;
+		if (_checked != null) _map_competence_checkbox.selected = _checked;
+		
+        //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
+        fm = _container.getFocusManager();
+        fm.enabled = true;
+		
+        //Register as listener with StyleManager and set Styles
+        themeManager.addEventListener('themeChanged',this);
+        setStyles();
+		
+        //fire event to say we have loaded
+		_container.contentLoaded();
+	}
+    
+	public function setUpContent():Void{
+		this._visible = true;
+	}
+	
+    /**
+    * Event fired by StyleManager class to notify listeners that Theme has changed
+    * it is up to listeners to then query Style Manager for relevant style info
+    */
+    public function themeChanged(evt:Object):Void{
+        if(evt.type=='themeChanged') {
+            //Theme has changed so update objects to reflect new styles
+            setStyles();
+        }else {
+            Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','CompetenceMappingItem');
+        }
+    }
+	
+    /**
+    * Called on initialisation and themeChanged event handler
+    */
+    private function setStyles(){
+        //LFWindow, goes first to prevent being overwritten with inherited styles.
+        var styleObj = themeManager.getStyleObject('LFWindow');
+        _container.setStyle('styleName', styleObj);
+       
+		styleObj = themeManager.getStyleObject('CanvasPanel');
+		_bgpanel.setStyle('styleName', styleObj);
+		
+        //Apply label style 
+        styleObj = themeManager.getStyleObject('label');
+        competence_number_lbl.setStyle('styleName', styleObj);
+		competence_title_txt.setStyle('styleName', styleObj);
+    }
+	
+    /**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+		
+        e.target.deletePopUp();
+    }
+	
+	public function get isMapped():Boolean {
+		return _map_competence_checkbox.selected;
+	}
+	
+	public function get competenceTitle():String {
+		return _competenceTitle;
+	}
+    
+    /**
+    * Main resize method, called by scrollpane container/parent
+    */
+    public function setSize(w:Number,h:Number):Void{
+		//Size the panel
+        _bgpanel.setSize(w,h);
+		
+    }
+    
+    //Gets+Sets
+    /**
+    * set the container refernce to the window holding the dialog
+    */
+    function set container(value:MovieClip){
+        _container = value;
+    }
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r26f461d8762793126c0e8446a82ac831ae0c3619 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 26f461d8762793126c0e8446a82ac831ae0c3619)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -998,7 +998,11 @@
 		if(evt.type == 'contentLoaded'){
 			//set up UI
 			//note this function registers the dialog to recieve view updates
-			evt.target.scrollContent.setUpContent();		
+			if (evt.target.scrollContent instanceof org.lamsfoundation.lams.authoring.cmpt.CompetenceEditorDialog) {
+				evt.target.scrollContent.setUpContent(_canvasModel);
+			} else {
+				evt.target.scrollContent.setUpContent();
+			}
 			
         } else {
             //TODO DI 25/05/05 raise wrong event type error 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r470bd43cd17fa6128a767fec948850a5815c1c55 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 470bd43cd17fa6128a767fec948850a5815c1c55)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -21,6 +21,7 @@
  * ************************************************************************
  */
 
+import org.lamsfoundation.lams.authoring.cmpt.*
 import org.lamsfoundation.lams.authoring.cv.*
 import org.lamsfoundation.lams.authoring.br.*
 import org.lamsfoundation.lams.authoring.tk.*
@@ -33,7 +34,7 @@
 import org.lamsfoundation.lams.common.ws.Workspace
 import org.lamsfoundation.lams.common.ApplicationParent
 import org.lamsfoundation.lams.common.* 
-
+   
 import mx.managers.*
 import mx.utils.*
 import mx.transitions.Tween;
@@ -485,45 +486,45 @@
 	public function setPastedItem(o:Object){
 		if(o.data instanceof CanvasActivity && o.data.activity.activityCategoryID != Activity.CATEGORY_SYSTEM){
 			Debugger.log('instance is CA',Debugger.GEN,'setPastedItem','Canvas');
-			var callback:Function = Proxy.create(this, setNewContentID, o);
+			var callback:Function = Proxy.create(this, setNewContentID, o);
 			var copyActivityURL:String = appendCustomCSVIfExists('authoring/author.do?method=copyToolContent&toolContentID='+o.data.activity.toolContentID+'&userID='+_root.userID);
 			Application.getInstance().getComms().getRequest(copyActivityURL,callback, false);
 		} else if(o.data instanceof ToolActivity){
 			Debugger.log('instance is Tool',Debugger.GEN,'setPastedItem','Canvas');
-			var callback:Function = Proxy.create(this, setNewContentID, o);
+			var callback:Function = Proxy.create(this, setNewContentID, o);
 			var copyActivityURL:String = appendCustomCSVIfExists('authoring/author.do?method=copyToolContent&toolContentID='+o.toolContentID+'&userID='+_root.userID);
 			Application.getInstance().getComms().getRequest(copyActivityURL,callback, false);
-		} else if(o.data instanceof CanvasOptionalActivity || o.data instanceof CanvasParallelActivity || (o.data instanceof CanvasActivity && o.data.activity.isBranchingActivity())){
-			Debugger.log('instance is Complex', Debugger.GEN,'setPastedItem','Canvas');
-			var callback:Function = Proxy.create(this, setNewContents, o);
-			Application.getInstance().getComms().sendAndReceive(getToolContentArray(o.data), 'servlet/authoring/copyMultipleToolContent?userID='+_root.userID, callback, false);
-		} else{
+		} else if(o.data instanceof CanvasOptionalActivity || o.data instanceof CanvasParallelActivity || (o.data instanceof CanvasActivity && o.data.activity.isBranchingActivity())){
+			Debugger.log('instance is Complex', Debugger.GEN,'setPastedItem','Canvas');
+			var callback:Function = Proxy.create(this, setNewContents, o);
+			Application.getInstance().getComms().sendAndReceive(getToolContentArray(o.data), 'servlet/authoring/copyMultipleToolContent?userID='+_root.userID, callback, false);
+		} else{
 			LFMessage.showMessageAlert(Dictionary.getValue('al_activity_paste_invalid'));
 			Debugger.log('Cant paste this item!',Debugger.GEN,'setPastedItem','Canvas');
 		}
 	}
+	
+	/**
+	 * Appends the customCSV parameter passed from the external machine if it was passed
+	 * This is required for tool adapter tools, so the learning design details returns the 
+	 * correct values
+	 * 
+	 * @usage   
+	 * @param   URL 
+	 * @return  
+	 */
+
+	public function appendCustomCSVIfExists(URL:String):String
+	{
+		var tempURL:String = new String(URL);
+		if (_root.customCSV != null)
+		{
+			tempURL = tempURL + "&customCSV=" + escape(_root.customCSV);
+		}
+		return tempURL;
+	}
 	
 	/**
-	 * Appends the customCSV parameter passed from the external machine if it was passed
-	 * This is required for tool adapter tools, so the learning design details returns the 
-	 * correct values
-	 * 
-	 * @usage   
-	 * @param   URL 
-	 * @return  
-	 */
-
-	public function appendCustomCSVIfExists(URL:String):String
-	{
-		var tempURL:String = new String(URL);
-		if (_root.customCSV != null)
-		{
-			tempURL = tempURL + "&customCSV=" + escape(_root.customCSV);
-		}
-		return tempURL;
-	}
-	
-	/**
 	 * Array of tool content IDs within the complex activity.
 	 * 
 	 * @param   ca Canvas object
@@ -535,11 +536,11 @@
 		
 		o.toolContentIDs = getAllToolContentIDs(ca.activity.activityUIID);
 		Debugger.log('toolContentIDs: ' + o.toolContentIDs,Debugger.CRITICAL,'getToolContentArray','CanvasHelper');
+		
+		if (_root.customCSV != null) {
+			o.customCSV = _root.customCSV;
+		}
 		
-		if (_root.customCSV != null) {
-			o.customCSV = _root.customCSV;
-		}
-
 		return o;
 	}
 	
@@ -814,7 +815,28 @@
 		var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('about_popup_title_lbl', [Dictionary.getValue('stream_reference_lbl')]),closeButton:true,scrollContentPath:'AboutLams'});
 		dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
 		
-	}
+	}
+	
+	/**
+    * Opens the competence editor window
+    */
+    public function openCompetenceEditorWindow() {
+		var controller:CanvasController = canvasView.getController();
+
+		app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:"Competence Editor",closeButton:true, resize:false, scrollContentPath:'CompetenceEditorDialog'});
+		app.dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
+	}	
+	
+	/**
+    * Opens the competence definition dialog
+    */
+    public function openCompetenceDefinitionWindow():MovieClip {
+		var controller:CanvasController = canvasView.getController();
+		var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:"Competence Definition Dialog", closeButton:true, scrollContentPath:'CompetenceDefinitionDialog'});			
+		
+		dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
+		return dialog;
+	}
 	
 	public function openBranchView(ba, visible:Boolean){
 		var cx:Number = ba._x + ba.getVisibleWidth()/2;
@@ -929,12 +951,11 @@
 	
 	public function get ddm():DesignDataModel{
 		return _ddm;
-	}
+	}
 	
 	private function createContentFolder():Void{
 		var callback:Function = Proxy.create(this,setNewContentFolderID);
 		Application.getInstance().getComms().getRequest('authoring/author.do?method=createUniqueContentFolder&userID='+_root.userID,callback, false);
-		
 	}
 	
 	private function setNewContentFolderID(o:Object) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r507885144beb497c8639eb64931c04b6e31c917f -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 507885144beb497c8639eb64931c04b6e31c917f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -21,7 +21,8 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.cmpt.*;
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.util.*
@@ -129,6 +130,7 @@
 		
 		_group_match_btn.addEventListener("click", Delegate.create(this, onGroupMatchClick));
 		_group_naming_btn.addEventListener("click", Delegate.create(this, onGroupNamingClick));
+		_map_competence_btn.addEventListener("click", Delegate.create(this, onMapCompetenceClick));
 		_tool_output_match_btn.addEventListener("click", Delegate.create(this, onConditionMatchClick));
 		_conditions_setup_btn.addEventListener("click", Delegate.create(this, onConditionsSetupClick));
 		
@@ -192,6 +194,9 @@
 
 		_define_monitor_cb.label = Dictionary.getValue('pi_define_monitor_cb_lbl');
 
+		//TODO Internationalise
+		_map_competence_btn.label = "Map to competences";
+
 		// Branch 
 		_pi_defaultBranch_cb.label = Dictionary.getValue("pi_defaultBranch_cb_lbl");
 		
@@ -751,6 +756,7 @@
 	private function showAppliedGroupingProperties(a:Activity){
 		//update the grouping drop down values
 		appliedGroupingActivity_cmb.dataProvider = getGroupingActivitiesDP();
+		_global.breakpoint();
 
 		var appliedGroupingAct:GroupingActivity = _canvasModel.getCanvas().ddm.getGroupingActivityByGroupingUIID(a.groupingUIID);
 		Debugger.log('a.groupingUIID='+a.groupingUIID+', appliedGroupingAct.activityUIID :'+appliedGroupingAct.activityUIID ,Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r507885144beb497c8639eb64931c04b6e31c917f -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 507885144beb497c8639eb64931c04b6e31c917f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -21,7 +21,8 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.cmpt.*;
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.util.*
@@ -123,8 +124,11 @@
 	private var numRandomGroups_stp:NumericStepper;
 	private var numLearners_stp:NumericStepper;
 	
-	private var _group_naming_btn:Button;
 	private var	equalGroupSizes_chk:CheckBox;
+	private var _group_naming_btn:Button;
+	
+	//Competence
+	private var _map_competence_btn:Button;
 	
 	//Complex Activity
 	private var min_lbl:Label;
@@ -255,14 +259,18 @@
 		currentGrouping_lbl.visible = v;
 		runOffline_chk.visible = v;
 		defineLater_chk.visible = v;
-		editGrouping_btn.visible = v;
+		editGrouping_btn.visible = v;
+		
+		_map_competence_btn.visible = v;
 		
 		if(e != null) {
 			grouping_lbl.enabled = e;
 			currentGrouping_lbl.enabled = e;
 			runOffline_chk.enabled = e;
 			defineLater_chk.enabled = e;
-			editGrouping_btn.enabled = e;
+			editGrouping_btn.enabled = e;
+			
+			_map_competence_btn.enabled = e;
 		}
 	}
 	
@@ -842,6 +850,8 @@
 		
 		_tool_output_match_btn.setStyle('styleName', styleObj);
 		_conditions_setup_btn.setStyle('styleName', styleObj);
+		
+		_map_competence_btn.setStyle('styleName', styleObj);
 		
 		styleObj = _tm.getStyleObject('PIlabel');
 		
@@ -1180,14 +1190,19 @@
 	}
 	
 	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, resize:false, scrollContentPath:'GroupNamingDialog'});
-		_app.dialog.addEventListener('contentLoaded', Delegate.create(this, GroupNamingDialogLoaded));
+		_app.dialog.addEventListener('contentLoaded', Delegate.create(this, GroupNamingDialogLoaded));
 		
 		setModified();
 	}
 	
+	private function onMapCompetenceClick(evt:Object){
+		// open group to competence mapping window
+		_app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:"Competence Mappings", closeButton:true, resize:false, scrollContentPath:'CompetenceMappingDialog'});
+	}
+	
 	public function openConditionMatchDialog():Void {
 		onConditionMatchClick();
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -0,0 +1,290 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.events.*
+
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.style.*
+import org.lamsfoundation.lams.common.*
+import org.lamsfoundation.lams.monitoring.*
+import org.lamsfoundation.lams.monitoring.mv.*
+import org.lamsfoundation.lams.monitoring.mv.tabviews.*
+
+/*
+* Lesson Manager Dialog window for selecting an organisation class
+* @author  DI
+*/
+class ViewCompetencesDialog extends MovieClip implements Dialog{
+	
+	public static var X_OFFSET:Number = -5;
+	public static var Y_OFFSET:Number = 20;
+	
+	//References to components + clips 
+    private var _container:MovieClip;  //The container window that holds the dialog
+	
+    private var close_btn:Button;         // Close window button
+    private var competences_lbl:Label;
+	private var panel:MovieClip;       //The underlaying panel base
+	
+	private var competences_scp:MovieClip;		// learners container
+	private var _competences_mc:MovieClip;
+	private var _competenceList:Array;
+	
+    private var fm:FocusManager;            //Reference to focus manager
+    private var themeManager:ThemeManager;  //Theme manager
+	
+	private var app:Application;
+	
+	//Dimensions for resizing
+    private var xCloseOffset:Number;
+    private var yCloseOffset:Number;
+	
+	private var _lessonTabView:LessonTabView;
+	private var _monitorModel:MonitorModel;
+	private var _monitorView:MonitorView;
+	private var _monitorController:MonitorController;
+
+	private var competenceTitles:Array;
+	
+	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+	
+	 /**
+    * constructor
+    */
+    function ViewCompetencesDialog(){
+		//Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+        
+		Debugger.log("ViewCompetencesDialog->Constructor", Debugger.CRITICAL, "ViewCompetencesDialog", "ViewCompetencesDialog");
+		
+		app = Application.getInstance();
+		
+        //Create a clip that will wait a frame before dispatching init to give components time to setup
+        //MovieClipUtils.doLater(Proxy.create(this,init));
+		
+		this.onEnterFrame = init;
+	}
+	
+	/**
+    * Called a frame after movie attached to allow components to initialise
+    */
+    private function init():Void{
+		
+		delete this.onEnterFrame;
+		
+        //set the reference to the StyleManager
+        themeManager = ThemeManager.getInstance();
+        
+		Debugger.log("ViewCompetencesDialog->init", Debugger.CRITICAL, "init", "ViewCompetencesDialog");
+		
+		// Set the styles
+        setStyles();
+		
+        //Set the text for buttons
+		close_btn.label = Dictionary.getValue('ls_win_learners_close_btn');
+		 
+		 //Set the labels
+		competences_lbl.text = "Competences in learning design: "+ app.monitor.ddm.title;
+		
+        //EVENTS
+        //Add event listeners for ok, cancel and close buttons
+        close_btn.addEventListener('click',Delegate.create(this, close));
+        
+		//Assign Click (close button) and resize handlers
+        _container.addEventListener('click',this);
+        _container.addEventListener('size',this);
+        
+        //work out offsets from bottom RHS of panel
+        xCloseOffset = panel._width - close_btn._x;
+        yCloseOffset = panel._height - close_btn._y;
+		
+		loadCompetences();
+		
+		//fire event to say we have loaded
+		_container.contentLoaded();
+    }
+	
+	/**
+	 * Called by the worspaceView after the content has loaded
+	 * @usage   
+	 * @return  
+	 */
+	public function setUpContent():Void{
+		
+		 //Add event listeners for ok, cancel and close buttons
+        close_btn.addEventListener('onPress',Delegate.create(this, close));
+	}
+	
+    /**
+    * Called on initialisation
+    */
+    private function setStyles(){
+        //LFWindow, goes first to prevent being overwritten with inherited styles.
+        var styleObj = themeManager.getStyleObject('LFWindow');
+        _container.setStyle('styleName',styleObj);
+		
+		//Apply panel style
+		styleObj = themeManager.getStyleObject('BGPanel');
+		panel.setStyle('styleName', styleObj);
+
+		//Apply scrollpane style
+		styleObj = themeManager.getStyleObject('scrollpane');
+		competences_scp.setStyle('styleName', styleObj);
+
+        //Get the button style from the style manager and apply to both buttons
+        styleObj = themeManager.getStyleObject('button');
+        close_btn.setStyle('styleName',styleObj);
+        
+        //Apply label style 
+        styleObj = themeManager.getStyleObject('label');
+		competences_lbl.setStyle('styleName', styleObj);
+        
+    }
+
+	/**
+    * Event fired by StyleManager class to notify listeners that Theme has changed
+    * it is up to listeners to then query Style Manager for relevant style info
+    */
+    public function themeChanged(event:Object):Void{
+        if(event.type=='themeChanged') {
+            //Theme has changed so update objects to reflect new styles
+            setStyles();
+        }else {
+            Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','org.lamsfoundation.lams.WorkspaceDialog');
+        }
+    }
+
+	/**
+    * Called by the close button 
+    */
+    private function close(){
+		_container.deletePopUp();
+    }
+	
+    /**
+    * If an alert was spawned by this dialog this method is called when it's closed
+    */
+    private function alertClosed(evt:Object){
+        //Should prefs dialog be closed?
+        //TODO DI 01/06/05 check for delete of dialog
+        //_container.deletePopUp();
+    }
+    
+	/**
+	 * 
+	 * @usage   
+	 * @param   newworkspaceView 
+	 * @return  
+	 */
+	public function set monitorView (newMonitorView:MonitorView):Void {
+		_monitorView = newMonitorView;
+	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get monitorView ():MonitorView {
+		return _monitorView;
+	}
+	
+    /**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+        e.target.deletePopUp();
+    }
+
+	/*
+	* Clear Method to clear movies from scrollpane
+	* 
+	*/
+	public static function clearScp(array:Array):Array{
+		if(array != null){
+			for (var i=0; i <array.length; i++){
+				array[i].removeMovieClip();
+			}
+		}
+		array = new Array();
+	return array;
+	}
+	
+
+	/**
+	 * Load learners into scrollpane
+	 * @param   users Users to load
+	 */
+	
+	public function loadCompetences():Void{
+		Debugger.log("loadCompetences invoked", Debugger.GEN, "loadCompetences", "ViewCompetencesDialog");
+		_competenceList = clearScp(_competenceList);
+		_competences_mc = competences_scp.content;
+		var competenceTitles:Array = app.monitor.ddm.competences.keys();
+		
+		competenceTitles.sort();
+		Debugger.log("competenceTitles.length: "+competenceTitles.length, Debugger.GEN, "loadCompetences", "ViewCompetencesDialog");
+		
+		for (var i=0; i<competenceTitles.length; ++i) {
+			var singleCompetence_mc:MovieClip = _competences_mc.attachMovie('competence_dataRow', 'competence_dataRow'+i, _competences_mc.getNextHighestDepth());
+			singleCompetence_mc.title.text = competenceTitles[i];
+			singleCompetence_mc._x = X_OFFSET;
+			singleCompetence_mc._y = Y_OFFSET * i;
+			_competenceList.push(singleCompetence_mc);
+		}
+
+		competences_scp.redraw(true);
+	}
+	
+    /**
+    * Main resize method, called by scrollpane container/parent
+    */
+    public function setSize(w:Number,h:Number):Void{
+        //Size the panel
+        panel.setSize(w,h);
+
+        //Buttons
+        close_btn.move(w-xCloseOffset,h-yCloseOffset);
+		
+    }
+    
+    /**
+    * set the container refernce to the window holding the dialog
+    */
+    function set container(value:MovieClip){
+        _container = value;
+    }
+	
+	public function get competenceList():Array{
+		return _competenceList;
+	}
+	
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.monitoring.mv.tabviews.*;
 import org.lamsfoundation.lams.authoring.DesignDataModel;
 import org.lamsfoundation.lams.authoring.Activity;
+import org.lamsfoundation.lams.authoring.cmpt.CompetenceEditorDialog;
 import org.lamsfoundation.lams.authoring.cv.CanvasActivity;
 import org.lamsfoundation.lams.authoring.cv.CanvasOptionalActivity;
 import org.lamsfoundation.lams.authoring.cv.CanvasComplexView;
@@ -210,6 +211,13 @@
 		dialog.addEventListener('contentLoaded', Delegate.create(controller, controller.viewBranchConditionMappingsDialogLoaded));
 		
 	}
+	
+	public function showMappedCompetences() {
+		
+		var controller:MonitorController = monitorView.getController();
+		var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:"Mapped Competences",closeButton:true,scrollContentPath:'CompetenceEditorDialog'});
+		dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
+	}
 
 	/**
     * Called when Users loaded for role type
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -540,8 +540,12 @@
 			LessonTabView(getView()).dialog = evt.target.scrollContent;
 			
 			//set up UI
-			//note this function registeres the dialog to receive view updates
-			evt.target.scrollContent.setUpContent();		
+			//note this function registeres the dialog to receive view updates
+			if (evt.target.scrollContent instanceof org.lamsfoundation.lams.authoring.cmpt.CompetenceEditorDialog) {
+				evt.target.scrollContent.setUpContent(_monitorModel);
+			} else {
+				evt.target.scrollContent.setUpContent();
+			}
 			
         } else {
             //TODO DI 25/05/05 raise wrong event type error 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
diff -u -r5fb237f34d2b1c641cfd6d8dde51b8d8a57863d0 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 5fb237f34d2b1c641cfd6d8dde51b8d8a57863d0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -226,6 +226,11 @@
 				_monitorController = getController();
 				showLearnersDialog(mm);
 				break;
+			case 'VIEW_COMPETENCES_DIALOG' :
+				Debugger.log("LessonTabView->VIEW_COMPETENCES_DIALOG update received", Debugger.CRITICAL, "update", "LessonTabView");
+				_monitorController = getController();
+				showCompetencesDialog(mm);
+				break;
 			case 'LEARNERS_LOADED' :
 				_dialog.checkLearners(mm.organisation);
 				break;
@@ -697,6 +702,19 @@
 		opendialog.addEventListener('contentLoaded',Delegate.create(_monitorController,_monitorController.openDialogLoaded));
 		
     }
+	
+	
+	/**
+    * Opens the view competences dialog
+    */
+	public function showCompetencesDialog(mm:MonitorModel) {
+		var opendialog:MovieClip = PopUpManager.createPopUp(mm.getMonitor().root, LFWindow, false,{title:"View Competences",closeButton:true,scrollContentPath:'viewCompetencesDialog'});
+		opendialog.addEventListener('contentLoaded',Delegate.create(_monitorController,testFunction));
+	}
+	
+	public function testFunction():Void {
+		Debugger.log("testFunction invoked, therefore content has been loaded", Debugger.CRITICAL, "testFunction", "LessonTabView");
+	}
 	
 	/**
 	 * 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -175,7 +175,12 @@
 		
         tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_trans'), instanceName:"drawTransitionalItem"});
         tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_opt'), instanceName:"drawOptionalItem"});
-        //tools_menu.addMenuItem({type:"separator"});
+        
+		tools_menu.addMenuItem({type:"separator"});
+		tools_menu.addMenuItem({label:"Competence Editor", instanceName:"competenceEditor"});
+		//tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_competence'), instanceName:"competenceEditor"});
+		
+		//tools_menu.addMenuItem({type:"separator"});
         //tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_prefs'), instanceName:"prefsItem", enabled:false});
 
         /*=================
@@ -220,6 +225,8 @@
         view_menu = _mb.addMenu(Dictionary.getValue('mnu_view'));
 		
         view_menu.addMenuItem({label:Dictionary.getValue('mnu_view_learners'), instanceName:"viewLearners", enabled:false});
+        //view_menu.addMenuItem({label:Dictionary.getValue('mnu_view_competences'), instanceName:"viewCompetences", enabled:false});
+        view_menu.addMenuItem({label:"View Competences", instanceName:"viewCompetences", enabled:true});
 		
 		/*=================
             GO MENU
@@ -377,6 +384,9 @@
 			case eventObj.menu.viewLearners : 
 				org.lamsfoundation.lams.monitoring.Application(app).getMonitor().getMM().setDialogOpen("VM_DIALOG");
 				break;
+			case eventObj.menu.viewCompetences : 
+				org.lamsfoundation.lams.monitoring.Application(app).getMonitor().getMM().setDialogOpen("VIEW_COMPETENCES_DIALOG");
+				break;
 		}
 	}
 	
@@ -394,6 +404,9 @@
 				break;
 			case eventObj.menu.drawOptionalItem :
 				org.lamsfoundation.lams.authoring.Application(app).getCanvas().toggleOptionalActivity();
+				break;
+			case eventObj.menu.competenceEditor :
+				org.lamsfoundation.lams.authoring.Application(app).getCanvas().openCompetenceEditorWindow();
 				break;
         }        
     }    
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	(.../CustomContextMenu.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	(.../CustomContextMenu.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
@@ -116,7 +116,9 @@
 		menuArr[4] = [Dictionary.getValue('ccm_monitor_activityhelp'),getMonitorHelp, false, v, monitorC];
 		menuArr[5] = [Dictionary.getValue('ccm_paste_activity'),getPaste, false, v, authorC];
 		menuArr[6] = [Dictionary.getValue('ccm_pi'),getPI, true, true, authorC];
-		menuArr[7] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC];
+		menuArr[7] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC];
+		//menuArr[8] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC];
+		menuArr[8] = ["View Mapped Competences",getMappedCompetences, false, v, monitorC];
 		
 		for (var i=0; i<menuArr.length; i++){
 			if (menuArr[i][4]) {
@@ -182,5 +184,9 @@
 	
 	public function getHelp(){
 		org.lamsfoundation.lams.authoring.Application.getInstance().help();
+	}
+	
+	private function getMappedCompetences() {
+		org.lamsfoundation.lams.monitoring.Application.getInstance().getMonitor().showMappedCompetences();
 	}
 }
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -re0eebc7060d775eda138515e2166ddbe04a5ada7 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -re0eebc7060d775eda138515e2166ddbe04a5ada7 -r6071623eaaab7f58e5c1befe499b0fc1c76850dc
Binary files differ