Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html =================================================================== diff -u -N -r4863 -r4936 --- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html (.../frmupload.html) (revision 4863) +++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmupload.html (.../frmupload.html) (revision 4936) @@ -48,21 +48,7 @@ return true ; } -function OnUploadCompleted( errorNumber, fileName ) -{ - // Reset the Upload Worker Frame. - window.parent.frames['frmUploadWorker'].location = 'about:blank' ; - - // Reset the upload form (On IE we must do a little trick to avout problems). - if ( document.all ) - document.getElementById('NewFile').outerHTML = '' ; - else - document.getElementById('frmUpload').reset() ; - - // Reset the interface elements. - document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ; - document.getElementById('btnUpload').disabled = false ; - +function outputErrorMsg(errorNumber, fileName) { switch ( errorNumber ) { case 0 : @@ -75,12 +61,35 @@ case 202 : alert( 'Invalid file' ) ; break ; + case 203 : + alert( 'Invalid file type for this foder' ) ; + break ; + case 204 : + alert( 'A file with the same name is already available' ) ; + break ; default : alert( 'Error on file upload. Error number: ' + errorNumber ) ; break ; } } +function OnUploadCompleted( errorNumber, fileName ) +{ + // Reset the Upload Worker Frame. + window.parent.frames['frmUploadWorker'].location = 'about:blank' ; + + // Reset the upload form (On IE we must do a little trick to avout problems). + if ( document.all ) + document.getElementById('NewFile').outerHTML = '' ; + else + document.getElementById('frmUpload').reset() ; + + // Reset the interface elements. + document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ; + document.getElementById('btnUpload').disabled = false ; + outputErrorMsg(errorNumber); +} + window.onload = function() { window.top.IsLoadedUpload = true ; @@ -101,7 +110,14 @@ } } - +function RenameFile() +{ + filename = window.parent.frames['frmResourcesList'].GetCheckedFileName('first'); + f=prompt('Rename file "'+filename+'"?',filename); + if (f) { + window.parent.frames['frmResourcesList'].RenameFile(filename,f); + } +} @@ -120,7 +136,7 @@