Index: lams_central/web/ckeditor/filemanager/browser/default/browser.html
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/ckeditor/filemanager/browser/default/browser.html,v
diff -u -r1.1 -r1.2
--- lams_central/web/ckeditor/filemanager/browser/default/browser.html	6 Oct 2010 10:11:40 -0000	1.1
+++ lams_central/web/ckeditor/filemanager/browser/default/browser.html	10 Oct 2010 11:59:01 -0000	1.2
@@ -75,6 +75,7 @@
 
 var oConnector = new Object() ;
 oConnector.CurrentFolder	= '/' ;
+oConnector.DesignFolder     = GetUrlParam( 'CurrentFolder' );
 
 var sConnUrl = GetUrlParam( 'Connector' ) ;
 document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');
@@ -99,7 +100,9 @@
 {
 	var sUrl = this.ConnectorUrl + 'Command=' + command ;
 	sUrl += '&Type=' + this.ResourceType ;
-	sUrl += '&CurrentFolder=' + encodeURIComponent( this.CurrentFolder ) ;
+//	sUrl += '&CurrentFolder=' + encodeURIComponent( this.CurrentFolder ) ;
+    sUrl += '&CurrentFolder=' + encodeURIComponent( oConnector.CurrentFolder ) ;
+ 	sUrl += '&DesignFolder=' + encodeURIComponent( oConnector.DesignFolder );
 
 	if ( params ) sUrl += '&' + params ;
 
Index: lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html,v
diff -u -r1.1 -r1.2
--- lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html	6 Oct 2010 10:11:40 -0000	1.1
+++ lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html	10 Oct 2010 11:59:01 -0000	1.2
@@ -183,7 +183,8 @@
 window.onload = function()
 {
 	oListManager.Init() ;
-	LoadFolders( '/' ) ;
+//	LoadFolders( '/' ) ;
+	LoadFolders( parent.oConnector.CurrentFolder ) ;
 }
 		</script>
 	</head>
Index: lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html,v
diff -u -r1.1 -r1.2
--- lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html	6 Oct 2010 10:11:40 -0000	1.1
+++ lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html	10 Oct 2010 11:59:01 -0000	1.2
@@ -47,7 +47,8 @@
 {
 	// Build the link to view the folder.
 	var sLink = '<a href="#" onclick="OpenFolder(\'' + ProtectPath( folderPath ) + '\');return false;">' ;
-
+	var dLink = '<a href="#" onclick="DeleteFolder(\'' + folderName + '\');return false;">' 
+	
 	return '<tr>' +
 			'<td width="16">' +
 				sLink +
@@ -56,14 +57,19 @@
 				sLink +
 				folderName +
 				'<\/a>' +
-		'<\/td><\/tr>' ;
+				'<\/td><td align="right" nowrap>' +
+				 dLink +
+				 '<img alt="delete" src="images/trash.gif" width="20" height="19" border="0">' +
+				 '<\/a>' +
+		         '<\/td><\/tr>' ;
 }
 
 oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize )
 {
 	// Build the link to view the folder.
 	var sLink = '<a href="#" onclick="OpenFile(\'' + ProtectPath( fileUrl ) + '\');return false;">' ;
-
+	var dLink = '<a href="#" onclick="DeleteFile(\'' + fileName + '\');return false;">' ;
+	
 	// Get the file icon.
 	var sIcon = oIcons.GetIcon( fileName ) ;
 
@@ -78,9 +84,27 @@
 			'<\/td><td align="right" nowrap>&nbsp;' +
 				fileSize +
 				' KB' +
-		'<\/td><\/tr>' ;
+				'<\/td><td align="right" nowrap>' +
+ 	  	  	 	dLink +
+ 	  	  	 	'<img alt="delete" src="images/trash.gif" width="20" height="19" border="0">' +
+ 	  	  	 	'<\/a>' +
+ 	  	  	 	'<\/td><\/tr>' ;
 }
 
+function confirmDelete(name) {
+	return confirm("Delete '" + name + "' ?");
+}
+
+function DeleteFile( fileName ) {
+	if(confirmDelete(fileName))
+	 	 oConnector.SendCommand( 'DeleteFile', 'fileName=' + encodeURIComponent( fileName ), Refresh ) ;
+}
+
+function DeleteFolder( folderName ) {
+	 if(confirmDelete(folderName))
+	 	  oConnector.SendCommand( 'DeleteFolder', 'folderName=' + encodeURIComponent( folderName ), Refresh ) ;
+}
+
 function OpenFolder( folderPath )
 {
 	// Load the resources list for this folder.
Index: lams_central/web/ckeditor/filemanager/browser/default/frmupload.html
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/ckeditor/filemanager/browser/default/frmupload.html,v
diff -u -r1.1 -r1.2
--- lams_central/web/ckeditor/filemanager/browser/default/frmupload.html	6 Oct 2010 10:11:40 -0000	1.1
+++ lams_central/web/ckeditor/filemanager/browser/default/frmupload.html	10 Oct 2010 11:59:01 -0000	1.2
@@ -34,6 +34,7 @@
 	var sUrl = oConnector.ConnectorUrl + 'Command=FileUpload' ;
 	sUrl += '&Type=' + resourceType ;
 	sUrl += '&CurrentFolder=' + encodeURIComponent( folderPath ) ;
+	sUrl += '&DesignFolder=' + oConnector.DesignFolder ;
 
 	document.getElementById('frmUpload').action = sUrl ;
 }
Index: lams_central/web/ckeditor/filemanager/browser/default/images/trash.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/ckeditor/filemanager/browser/default/images/trash.gif,v
diff -u
Binary files differ