Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as	17 Aug 2007 04:17:16 -0000	1.4
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as	23 Aug 2007 03:21:07 -0000	1.5
@@ -181,9 +181,9 @@
 	public function set message(msg:String) {
 		modTextArea(_message);
 		_message.text = "<p align='center'>" + msg + "</p>";
-		
 		_message._x = -_message._width/2;
 		_message._y = _title._y + _title._height;
+		
 		setMessageHeight();
 	}
 	
@@ -196,18 +196,18 @@
 	private function setMessageHeight() {
 		
 			this.createTextField("message", this.getNextHighestDepth(), -1000, -1000, 0, 0); 
-		
+
 			var msg_text = this["message"];
 			
 			msg_text.html = true;
 			msg_text.htmlText = _message.text;
 			msg_text.wordWrap = true;
 			msg_text.autoSize = true;
-			msg_text._width = _message.width;
+			msg_text._width = _message.width; 
+				
+			Debugger.log('textHeight: ' + msg_text.textHeight * 2, Debugger.GEN, 'setMessageHeight', 'org.lamsfoundation.lams.Alertialog');
+			_message.setSize(_message.width, msg_text.textHeight * 2); // fix  for messages being concatenated in message box
 			
-			Debugger.log('textHeight: ' + msg_text.textHeight, Debugger.CRITICAL, 'setMessageHeight', 'org.lamsfoundation.lams.Alertialog');
-			_message.setSize(_message.width, msg_text.textHeight);
-			
 	}
 	
 	public function set type(a:Number) {
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	17 Aug 2007 04:17:16 -0000	1.5
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	23 Aug 2007 03:21:07 -0000	1.6
@@ -49,13 +49,6 @@
     private static var _inputOkHandler:Function;
     private static var _inputCancelHandler:Function;
 	
-	private static var _intervalID:Number;
-	private static var _dialogLoaded:Boolean;
-	private static var _count:Number;
-
-	private static var CHECK_INTERVAL:Number = 200;
-	private static var LIMIT:Number = 10;
-
     static function createPopUp(path:MovieClip,cls:Object, initobj:Object):MovieClip{
         return path.createClassChildAtDepth(cls, DepthManager.kTopmost, initobj);
     }
@@ -81,17 +74,12 @@
 			target = ApplicationParent.dialogue;
 		}
 		
-		var _alertDialog:MovieClip = target.attachMovie('alertDialog', 'alertDialog' + new Date().toString(), DepthManager.kTopmost, {_x:0, _y:0});
-		
+		var _alertDialog:MovieClip = target.attachMovie('alertDialog', 'alertDialog' + new Date().toString(), DepthManager.kTopmost, {_x:0, _y:0});
+
 		//Assign dialog load handler
 		_alertDialog.addEventListener('contentLoaded', Proxy.create(org.lamsfoundation.lams.common.ui.Dialog,alertDialogLoaded));
-	
+
 		return _alertDialog;
-	}
-	
-	static function checkDialog() {
-		_dialogLoaded = (_inputDialog != null || _inputDialog != undefined) ? true : false;
-		_count++;
 	}
 	
 	static function createInputDialog(instructions:String, okButtonLabel:String, cancelButtonLabel:String, okHandler:Function, cancelHandler:Function){
@@ -123,8 +111,7 @@
         Debugger.log('!evt.type:'+evt.type,Debugger.GEN,'alertDialogLoaded','org.lamsfoundation.lams.common.ui.Dialog');
 
         //Set up handlers and labels
-        Debugger.log('!evt.target:'+evt.target,Debugger.GEN,'inputDialogLoaded','org.lamsfoundation.lams.common.ui.Dialog');
-		
+        Debugger.log('!evt.target:'+evt.target,Debugger.GEN,'inputDialogLoaded','org.lamsfoundation.lams.common.ui.Dialog');
 		evt.target.title = _inputTitle;
 		evt.target.message = _inputMessage;
 		evt.target.setOKButton(_inputOkButtonLabel,_inputOkHandler);
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as	26 Jul 2007 08:45:53 -0000	1.4
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as	23 Aug 2007 03:21:07 -0000	1.5
@@ -40,7 +40,7 @@
      //Declarations  
 	private var _ref:Object;
 	private var _fn:String;
-	private var title:String;
+	private var title:String;
 	 
     //Constructor  
 	function LFMessage() {
@@ -77,15 +77,16 @@
   
   public static function showMessageAlert(msg, okHandler){
 	var title:String = "<b>" + Dictionary.getValue('al_alert') + "</b>\n";
-	  
+	var _dialog:MovieClip;
 	if(okHandler != undefined){
-		Dialog.createAlertDialog(title, msg, Dictionary.getValue('al_ok'), null, okHandler, null, AlertDialog.ALERT);
+		_dialog = Dialog.createAlertDialog(title, msg, Dictionary.getValue('al_ok'), null, okHandler, null, AlertDialog.ALERT);
 	}else{
-		Dialog.createAlertDialog(title, msg, Dictionary.getValue('al_ok'), null, null, null, AlertDialog.ALERT);
+		_dialog = Dialog.createAlertDialog(title, msg, Dictionary.getValue('al_ok'), null, null, null, AlertDialog.ALERT);
 	}
   }
   
    public static function showMessageConfirm(msg:String, okHandler:Function, cancelHandler:Function, okLabel:String, cancelLabel:String,  msgTitle:String){
+
 	if(msgTitle == null){
 		msgTitle = Dictionary.getValue('al_confirm');
 	}