Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -r022866b9e6765c8ac0840e6d7d6b69224f05dd25 -r6379d2985a6f1f3460524f168fa9e58f8e8e4c59
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision 022866b9e6765c8ac0840e6d7d6b69224f05dd25)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision 6379d2985a6f1f3460524f168fa9e58f8e8e4c59)
@@ -1,14 +1,34 @@
- import mx.controls.*
- import mx.utils.*
- /**
- * @author      DI
- */
- class org.lamsfoundation.lams.common.ws.WorkspaceDialog extends MovieClip{
-     
-    private var ok_btn:Button;
+import mx.controls.*
+import mx.utils.*
+import mx.managers.*
+import mx.managers.*
+import org.lamsfoundation.lams.common.ws.*
+import org.lamsfoundation.lams.common.util.*
+import org.lamsfoundation.lams.common.dict.*
+
+/**
+* @author      DI
+*/
+class WorkspaceDialog extends MovieClip{
+ 
+    //private static var OK_OFFSET:Number = 50;
+    //private static var CANCEL_OFFSET:Number = 50;
+    
+    private var ok_btn:Button;           //OK+Cancel buttons
     private var cancel_btn:Button;
-    private var panel:MovieClip;
+    private var panel:MovieClip;         //The underlaying panel base
+    private var treeview:MovieClip;      //Treeview for navigation through workspace folder structure
     
+    private var _container:MovieClip;    //The container window that holds the dialog
+    
+    private var xOkOffset:Number;
+    private var yOkOffset:Number;
+    private var xCancelOffset:Number;
+    private var yCancelOffset:Number;
+    
+    private var fm:FocusManager;        //Reference to focus manager
+
+
     function WorkspaceDialog(){
         trace('WorkSpaceDialog.constructor');
         //Create a clip that will wait a frame before dispatching init to give components time to setup
@@ -18,23 +38,44 @@
     private function init(){
         //Delete the enterframe dispatcher
         delete this.onEnterFrame;
-        //Add an event listener for the ok button
+        
+        //Set the container reference
+        _container = _parent._parent;
+        
+        //Set the text for buttons
+        ok_btn.label = Dictionary.getValue(1);
+        cancel_btn.label = Dictionary.getValue(2);
+        
+        //Set up focus manager
+        fm = _container.getFocusManager();
+        trace(fm);
+        fm.enabled = true;
+        ok_btn.setFocus();
+        
+        //Add event listeners for ok, cancel and close buttons
         ok_btn.addEventListener('click',Delegate.create(this, ok));
         cancel_btn.addEventListener('click',Delegate.create(this, cancel));
         //Tie parent click event (generated on clicking close button) to this instance
-        _parent._parent.addEventListener('click',this);
-        
+        _container.addEventListener('click',this);
         //Register for LFWindow size events
-        _parent._parent.addEventListener('size',this);
+        _container.addEventListener('size',this);
         
+        Debugger.log('setting offsets',Debugger.GEN,'init','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
+
+        //work out offsets from bottom RHS of panel
+        xOkOffset = panel._width - ok_btn._x + ok_btn.width/2;
+        yOkOffset = panel._height - ok_btn._y + ok_btn.height/2;
+        xCancelOffset = panel._width - cancel_btn._x + cancel_btn.width/2;
+        yCancelOffset = panel._height - cancel_btn._y + cancel_btn.height/2;
     }
-    
+
     /**
     * Called by the cancel button 
     */
     private function cancel(){
         trace('Cancel');
-        //Escape changes + close parent window
+        //close parent window
+        _container.deletePopUp();
     }
     
     /**
@@ -45,7 +86,7 @@
        //If validation successful commit + close parent window
     }
     
- 
+    
     /**
     * Event dispatched by parent container when close button clicked
     */
@@ -54,14 +95,29 @@
         e.target.deletePopUp();
     }
     
-  
+    
     /**
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number){
+        Debugger.log('setSize',Debugger.GEN,'setSize','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
+        
         //Size the panel
         panel.setSize(w,h);
+
         //Buttons
+        ok_btn.move(w-xOkOffset,h-yOkOffset);
+        cancel_btn.move(w-xCancelOffset,h-yCancelOffset);
+        
     }
     
+    //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