Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -r19348e215abebf817cee5f374899013a0ae3d4b1 -r5440d2fca669b2c801a56a591d6368608f3c6f89
--- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 19348e215abebf817cee5f374899013a0ae3d4b1)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 5440d2fca669b2c801a56a591d6368608f3c6f89)
@@ -67,9 +67,11 @@
 	private var app:ApplicationParent;
 	private var _tip:ToolTip;
 	//locals
+	private var tooltipTitle:String;
 	private var actStatus:String;
 	private var actLabel:String;
 	private var learner:Progress;
+	private var clickTarget_mc:MovieClip;
 	private var completed_mc:MovieClip;
 	private var current_mc:MovieClip;
 	private var todo_mc:MovieClip;
@@ -135,6 +137,11 @@
 			LABEL_Y = 10
 			_autosize = "center";
 		}
+		if (actLabel == undefined){
+			tooltipTitle =  _activity.title
+		}else {
+			tooltipTitle = actLabel
+		}
 		
 		title_lbl = this.attachMovie("Label", "Label"+_activity.activityID, this.getNextHighestDepth(), {_x:LABEL_X , _y:LABEL_Y, _width:LABEL_W, _height:LABEL_H, autoSize:_autosize, styleName:styleObj});
 		
@@ -180,15 +187,15 @@
 	 */
 	private function draw(){
 		
-		
+		var toolTitle:String
 		if (actStatus == null || actStatus == undefined){
 			actStatus = Progress.compareProgressData(learner, _activity.activityID);
 		}
 		
 		//title_lbl._visible = true;
 		Debugger.log('activity status : ' + actStatus ,Debugger.CRITICAL,'draw','org.lamsfoundation.lams.LearnerActivity');
 	
-		//clickTarget_mc._visible = true;
+		clickTarget_mc._visible = true;
 		
 		switch (actStatus){
 		    case 'completed_mc' :
@@ -209,10 +216,19 @@
 		//write text
 		trace("Title passed for Gate Activity: "+actLabel)
 		if (actLabel == undefined){
-			title_lbl.text = _activity.title;
+			toolTitle = _activity.title
+			if (toolTitle.length > 19){
+				toolTitle = toolTitle.substr(0, 17)+"..."
+			}
+			//title_lbl.text = toolTitle;
 		}else {
-			title_lbl.text = actLabel;
+			toolTitle = actLabel
+			if (toolTitle.length > 19){
+				toolTitle = toolTitle.substr(0, 17)+"..."
+			}
+			
 		}
+		title_lbl.text = toolTitle;
 		//this.completed_mc.onRollOver = Proxy.create(this,this['showToolTip'], this.completed_mc, "completed_act_tooltip");
 		//this.completed_mc.onRollOut = Proxy.create(this,this['hideToolTip']);
 		//this.current_mc.onRollOver = Proxy.create(this,this['showToolTip'], this.current_mc, "current_act_tooltip");
@@ -226,13 +242,21 @@
 			var ttXpos = appData.compX + xPos;
 			var ttYpos = appData.compY + yPos;
 		} else {
-			var ttXpos = appData.compX + this._x;
+			if(app.module == 'learner'){
+				var ttXpos = appData.compX + this._x-10;
+			}else {
+				var ttXpos = appData.compX + this._x;
+			}
 			var ttYpos = appData.compY + this._y+btnObj._height;
 		}
 		
 		var ttHolder = appData.ttHolder;
 		trace("x pos: "+ttXpos+" and y pos: "+ttYpos+" and tt holder is: "+ttHolder)
-		var ttMessage = Dictionary.getValue(btnTT);
+		if (btnTT == undefined || btnTT == null || btnTT == "" || btnTT == "undefined"){
+			var ttMessage = "<b>"+ _activity.title+"</b>"
+		}else {
+			var ttMessage = "<b>"+ _activity.title +"</b> \n"+Dictionary.getValue(btnTT);
+		}
 		var ttWidth = 140;
 		_tip.DisplayToolTip(ttHolder, ttMessage, ttXpos, ttYpos, undefined, ttWidth);
 		
@@ -244,9 +268,13 @@
 	
 	private function onRollOver(){
 		if (actStatus == "completed_mc"){
-			showToolTip(this.completed_mc, "completed_act_tooltip");
+			showToolTip(this.clickTarget_mc, "completed_act_tooltip");
 		}else if (actStatus == "current_mc"){
-			showToolTip(this.current_mc, "current_act_tooltip");
+			showToolTip(this.clickTarget_mc, "current_act_tooltip");
+		}else {
+			if (String(_activity.title).length > 19){
+				showToolTip(this.clickTarget_mc, "undefined");
+			}
 		}
 		
 	}
Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r5440d2fca669b2c801a56a591d6368608f3c6f89
--- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 5440d2fca669b2c801a56a591d6368608f3c6f89)
@@ -201,7 +201,7 @@
 	}
 	
 	private function draw (){
-		
+		var toolTitle:String;
 		if (actStatus == null || actStatus == undefined){
 			actStatus = Progress.compareProgressData(learner, _activity.activityID);
 		}
@@ -228,19 +228,23 @@
 		panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE);
 
 		//write text
-		if(_activity.title != undefined){
-			title_lbl.text = _activity.title;
-			containerPanelHeader.title_lbl.text = _activity.title;
-		} else {
-			if(_activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
-				title_lbl.text = 'Optional Activities';
-				containerPanelHeader.title_lbl.text = 'Optional Activities';
-			} else {
-				title_lbl.text = 'Parallel Activities';
-				containerPanelHeader.title_lbl.text = 'Parallel Activities';
-			}
+		//if(_activity.title != undefined){
+		toolTitle = _activity.title
+		if (toolTitle.length > 19){
+			toolTitle = toolTitle.substr(0, 17)+"..."
 		}
-		
+		//} 
+		//else {
+			//if(_activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
+				//title_lbl.text = 'Optional Activities';
+				//containerPanelHeader.title_lbl.text = 'Optional Activities';
+			//} else {
+				//title_lbl.text = 'Parallel Activities';
+				//containerPanelHeader.title_lbl.text = 'Parallel Activities';
+			//}
+		//}
+		title_lbl.text = toolTitle;
+		containerPanelHeader.title_lbl.text = toolTitle;
 		container_pnl.setStyle ("backgroundColor", 0x4289FF);
 		
 		//position the container (this)
@@ -253,11 +257,15 @@
 	
 	public function showToolTip(btnObj, btnTT:String):Void{
 		var appData = getAppData();
-		var Xpos = appData.compX+ this._x;
+		var Xpos = appData.compX+ this._x - 10;
 		var Ypos = appData.compY+( (this._y+btnObj._height)-4);
 		var ttHolder = appData.ttHolder;
 		trace("x pos: "+Xpos+" and y pos: "+Ypos+" and tt holder is: "+ttHolder)
-		var ttMessage = Dictionary.getValue(btnTT);
+		if (btnTT == undefined || btnTT == null || btnTT == "" || btnTT == "undefined"){
+			var ttMessage = "<b>"+ _activity.title+"</b>"
+		}else {
+			var ttMessage = "<b>"+ _activity.title+"</b> \n"+Dictionary.getValue(btnTT);
+		}
 		var ttWidth = 140;
 		_tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos, undefined, ttWidth);
 		
@@ -269,11 +277,15 @@
 	
 	private function localOnRollOver(){
 		if (actStatus == "completed_mc"){
-			showToolTip(this.completed_mc, "completed_act_tooltip");
+			showToolTip(this.clickTarget_mc, "completed_act_tooltip");
 		}else if (actStatus == "current_mc"){
-			showToolTip(this.current_mc, "current_act_tooltip");
+			showToolTip(this.clickTarget_mc, "current_act_tooltip");
 		}else if (actStatus == "attempted_mc"){
-			showToolTip(this.current_mc, "current_act_tooltip");
+			showToolTip(this.clickTarget_mc, "current_act_tooltip");
+		}else {
+			if (String(_activity.title).length > 19){
+				showToolTip(this.clickTarget_mc, "undefined");
+			}
 		}
 		
 	}