Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -ra14258831fcc72b00a6ff5c93654133a620bdc4c -rb7b18e3a982232c1c7f6320107de6b6bcbf7988b
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -ra14258831fcc72b00a6ff5c93654133a620bdc4c -rb7b18e3a982232c1c7f6320107de6b6bcbf7988b
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2 -rb7b18e3a982232c1c7f6320107de6b6bcbf7988b
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision b7b18e3a982232c1c7f6320107de6b6bcbf7988b)
@@ -213,6 +213,7 @@
 		WorkspaceModel(_workspaceView.getModel()).addEventListener('viewUpdate',this);
 		
 		Debugger.log('_workspaceView:'+_workspaceView,Debugger.GEN,'setUpContent','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
+		
 		//get a ref to the controller and kkep it here to listen for events:
 		_workspaceController = _workspaceView.getController();
 		Debugger.log('_workspaceController:'+_workspaceController,Debugger.GEN,'setUpContent','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
@@ -222,11 +223,11 @@
         ok_btn.addEventListener('click',Delegate.create(this, ok));
         cancel_btn.addEventListener('click',Delegate.create(this, cancel));
 		switchView_tab.addEventListener("change",Delegate.create(this, switchTab));
+		
 		//think this is failing....
 		switchView_tab.setSelectedIndex(0); 
 		
 		new_btn.addEventListener('click',Delegate.create(_workspaceController, _workspaceController.fileOperationRequest));
-		//cut_btn.addEventListener('click',Delegate.create(_workspaceController, _workspaceController.fileOperationRequest));
 		copy_btn.addEventListener('click',Delegate.create(_workspaceController, _workspaceController.fileOperationRequest));
 		paste_btn.addEventListener('click',Delegate.create(_workspaceController, _workspaceController.fileOperationRequest));
 		delete_btn.addEventListener('click',Delegate.create(_workspaceController, _workspaceController.fileOperationRequest));
@@ -251,7 +252,6 @@
 	public function viewUpdate(event:Object):Void{
 		Debugger.log('Recived an Event dispather UPDATE!, updateType:'+event.updateType+', target'+event.target,4,'viewUpdate','org.lamsfoundation.lams.ws.WorkspaceDialog');
 		//Update view from info object
-        //Debugger.log('Recived an UPDATE!, updateType:'+infoObj.updateType,4,'update','CanvasView');
        var wm:WorkspaceModel = event.target;
 	   //set a permenent ref to the model for ease (sorry mvc guru)
 	   _workspaceModel = wm;
@@ -326,16 +326,8 @@
 	private function refreshTree(){
 		 Debugger.log('Refreshing tree....:' ,Debugger.GEN,'refreshTree','org.lamsfoundation.lams.ws.WorkspaceDialog');
 		
-		
 		 treeview.refresh();// this is USELESS
 
-		//var oBackupDP = treeview.dataProvider;
-		//treeview.dataProvider = null; // clear
-		//treeview.dataProvider = oBackupDP;
-		
-		//treeview.setIsOpen(treeview.getNodeDisplayedAt(0),false);
-		//treeview.setIsOpen(treeview.getNodeDisplayedAt(0),true);
-
 	}
 	
 	/**
@@ -351,6 +343,7 @@
 		//open the node
 		nodeToOpen.attributes.isOpen = true;
 		treeview.setIsOpen(nodeToOpen,true);
+		treeview.selectedNode = nodeToOpen;
 		
 		Debugger.log('openFolder forced:'+wm.isForced() ,Debugger.GEN,'openFolder','org.lamsfoundation.lams.ws.WorkspaceDialog');
 		
@@ -359,11 +352,6 @@
 			treeview.selectedNode = nodeToOpen.firstChild;
 			dispatchEvent({type:'change', target:this.treeview});
 			
-			// no longer force open the Organisation virtual folder
-			//var virNode:XMLNode = nodeToOpen.firstChild.nextSibling;
-			//if(virNode.attributes.data.resourceID == WorkspaceModel.ORG_VFOLDER && !treeview.getIsOpen(virNode)){
-			//	openFolder(virNode, wm);
-			//}
 		}
 		
 		refreshTree();
@@ -702,7 +690,7 @@
         //cancel_btn.setStyle('styleName',styleObj);
         
         //Get label style and apply to label
-       var styleObj = themeManager.getStyleObject('label');
+		var styleObj = themeManager.getStyleObject('label');
         name_lbl.setStyle('styleName',styleObj);
 
         //Apply treeview style 
@@ -1006,11 +994,6 @@
 		}else if(e.newIndex ==1){
 			dispatchEvent({type:'propertiesTabClick',target:this});
 		}
-		/*
-		for (var item:String in e) {	
-			trace("Item: " + item + "=" + e[item]);
-		}
-		*/
 	}
     
     /**
@@ -1049,12 +1032,6 @@
 			for (var i = 0; i<node.childNodes.length; i++) {
 				var cNode = node.getTreeNodeAt(i);
 				setBranches(cNode);
-				/*
-				if(cNode.hasChildNodes()){
-					treeview.setIsBranch(cNode, true);
-					setBranches(cNode);
-				}
-				*/
 				
 			}
 		}