Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html
===================================================================
diff -u -N -r4862 -r4936
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html	(.../frmresourceslist.html)	(revision 4862)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html	(.../frmresourceslist.html)	(revision 4936)
@@ -26,7 +26,8 @@
 		<script language="javascript">
 
 var oListManager = new Object() ;
-
+var current_sort_order = '_asc';
+var current_sort_by = 'name';
 oListManager.Init = function()
 {
 	this.Table = document.getElementById('tableFiles') ;
@@ -39,6 +40,16 @@
 		this.Table.deleteRow(0) ;
 }
 
+function is_msie()
+{
+	var browser = "";
+	browser = navigator.appName;	
+	if (browser == 'Microsoft Internet Explorer')
+		return 1;
+	else
+		return 0;	
+}
+
 oListManager.AddFolder = function( folderName, folderPath )
 {
 	// Create the new row.
@@ -58,11 +69,11 @@
 	// Add the folder name cell.
 	oCell = oRow.insertCell(-1) ;
 	oCell.noWrap = true ;
-	oCell.colSpan = 2 ;
+	oCell.colSpan = 3 ;
 	oCell.innerHTML = '&nbsp;' + sLink + folderName + '</a>' ;
 }
 
-oListManager.AddFile = function( fileName, fileUrl, fileSize )
+oListManager.AddFile = function( fileName, fileUrl, fileSize, fileDate )
 {
 	// Create the new row.
 	var oRow = this.Table.insertRow(-1) ;
@@ -76,8 +87,8 @@
 
 	// Add the checkbox cell
 	var oCell = oRow.insertCell(-1);
-	oCell.width = 16;
-	oCell.innerHTML = '<input type="checkbox" name="file_checkbox" onclick="HandleCheckboxes()"/>';
+	oCell.width = 25;
+	oCell.innerHTML = '<input type="checkbox" name="file_checkbox" value='+fileName+' onclick="HandleCheckboxes()"/>';
 	
 	// Add the file icon cell.
 	var oCell = oRow.insertCell(-1) ;
@@ -97,16 +108,26 @@
 	
 	//Add the file date cell.
 	oCell = oRow.insertCell(-1) ;
-	oCell.width = 75;
+	oCell.width = 120;
 	oCell.noWrap = true ;
-	oCell.align = 'right' ;
-	oCell.innerHTML = '07-06-2006' ;
+	oCell.align = 'center' ;
+	oCell.innerHTML = fileDate ;
 	
-	oCell = oRow.insertCell(-1);
-	oCell.width = 10;
-	
 }
 
+function GetCheckedFileName(method)
+{
+	checkboxes = document.getElementsByName('file_checkbox');
+	for (i in checkboxes) {
+		if (checkboxes[i].checked) {
+			if (method == 'first')
+				return checkboxes[i].value;
+			files = files+checkboxes[i].value+'|'; 
+		}
+	}
+	return files;
+}
+
 function HandleCheckboxes(e) {
 	var checked_num = 0, i;
 	checkboxes = document.getElementsByName('file_checkbox');
@@ -145,12 +166,39 @@
 	window.top.opener.focus() ;
 }
 
+function RenameFile(old_name,new_name)
+{
+	oConnector.SendCommand( 'RenameFile_'+old_name+'|'+new_name, null, RenameCallBack );
+}
+
+function RenameCallBack(fckXml)
+{
+	var oNode = fckXml.SelectSingleNode( 'Connector/Error' ) ;
+	var iErrorNumber = parseInt( oNode.attributes.getNamedItem('number').value ) ;
+	switch ( iErrorNumber )
+	{
+		case 0 :
+			window.parent.frames['frmResourcesList'].Refresh() ;
+			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 LoadResources( resourceType, folderPath )
 {
 	oListManager.Clear() ;
 	oConnector.ResourceType = resourceType ;
 	oConnector.CurrentFolder = folderPath
-	oConnector.SendCommand( 'GetFoldersAndFiles', null, GetFoldersAndFilesCallBack ) ;
+	oConnector.SendCommand( 'GetFoldersAndFiles_'+current_sort_by+current_sort_order, null, GetFoldersAndFilesCallBack ) ;
 }
 
 function Refresh()
@@ -165,21 +213,62 @@
 	var sCurrentFolderPath	= oNode.attributes.getNamedItem('path').value ;
 	var sCurrentFolderUrl	= oNode.attributes.getNamedItem('url').value ;
 
-	// Add the Folders.	
-	var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
-	for ( var i = 0 ; i < oNodes.length ; i++ )
-	{
-		var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
-		oListManager.AddFolder( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+	if (current_sort_order == '_asc') { 
+		// Add the Folders.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
+			oListManager.AddFolder( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+		}
+		// Add the Files.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFileName = oNodes[i].attributes.getNamedItem('name').value ;
+			var sFileSize = oNodes[i].attributes.getNamedItem('size').value ;
+			var sFileDate = oNodes[i].attributes.getNamedItem('date').value;
+			oListManager.AddFile( sFileName, sCurrentFolderUrl + sFileName, sFileSize, sFileDate) ;
+		}
+		
+	} else {
+		// Add the Files.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFileName = oNodes[i].attributes.getNamedItem('name').value ;
+			var sFileSize = oNodes[i].attributes.getNamedItem('size').value ;
+			var sFileDate = oNodes[i].attributes.getNamedItem('date').value;
+			oListManager.AddFile( sFileName, sCurrentFolderUrl + sFileName, sFileSize, sFileDate) ;
+		}
+		// Add the Folders.	
+		var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
+		for ( var i = 0 ; i < oNodes.length ; i++ )
+		{
+			var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
+			oListManager.AddFolder( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+		}
+		
 	}
-	
-	// Add the Files.	
-	var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
-	for ( var i = 0 ; i < oNodes.length ; i++ )
-	{
-		var sFileName = oNodes[i].attributes.getNamedItem('name').value ;
-		var sFileSize = oNodes[i].attributes.getNamedItem('size').value ;
-		oListManager.AddFile( sFileName, sCurrentFolderUrl + sFileName, sFileSize ) ;
+	UpdateDivSize();
+}
+
+function UpdateDivSize()
+{
+	table_height = document.getElementById('tableFiles').clientHeight;
+	if(is_msie())
+		window_height = document.body.outerHeight;
+	else
+		window_height = window.outerHeight - 165;
+	document.getElementById('data_div').style.height = window_height;
+	//alert(document.getElementById('tableFiles').clientWidth);
+
+	if (window_height < table_height) {
+		document.getElementById('data_div').scroll = 'yes';
+		document.getElementById('sortFiles').style.width = document.getElementById('tableFiles').clientWidth;
+	} else {
+		document.getElementById('data_div').scroll = 'yes';
+		document.getElementById('sortFiles').style.width = document.getElementById('tableFiles').clientWidth;
 	}
 }
 
@@ -188,10 +277,68 @@
 	oListManager.Init() ;
 	window.top.IsLoadedResourcesList = true ;
 }
-		</script>
+
+function sortBy(sort_by)
+{
+	if (sort_by == current_sort_by)
+		current_sort_order = (current_sort_order == '_asc')?'_desc':'_asc';
+	else { 
+		document.getElementById('sort_'+current_sort_by).src = document.getElementById('_no').src;
+		current_sort_by = sort_by;
+		current_sort_order = '_asc';
+	}
+	document.getElementById('sort_'+current_sort_by).src = document.getElementById(current_sort_order).src;
+	//alert('GetFoldersAndFiles_'+current_sort_by+current_sort_order);
+	LoadResources( oConnector.ResourceType, oConnector.CurrentFolder ) ;
+}
+
+window.onresize = UpdateDivSize;
+
+</script>
 	</head>
-	<body class="FileArea" bottomMargin="10" leftMargin="10" topMargin="10" rightMargin="10">
-		<table id="tableFiles" cellSpacing="1" cellPadding="0" width="100%" border="0">
+	<body class="FileArea" bottomMargin="10" leftMargin="10" topMargin="3" rightMargin="10">
+	<div id="sort_div" style="padding: 0; border: none; overflow: hidden; width: 100%; position: relative;">
+		<table id="sortFiles" border="0" cellSpacing="1" cellPadding="0" width="100%" border="0" style="border-bottom:1px solid #000000; margin-bottom:0px; padding-bottom:0px;">
+			<tr>
+				<td width="25"> </td>
+				<td width="5"> </td>
+				<td>
+					<table border="0" cellSpacing="0" cellPadding="0"border="0">
+						<tr>
+							<td><a href="javascript:sortBy('name');"><img id="sort_name" src="images/sort_asc.gif" alt="" border="0"></a></td>
+							<td><a href="javascript:sortBy('name');" class='order-link'>&nbsp;File Name</a></td>
+						</tr>
+					</table>
+				</td>
+				<td width="50" align="center">
+					<table border="0" cellSpacing="0" cellPadding="0"border="0">
+						<tr>
+							<td><a href="javascript:sortBy('size');"><img id="sort_size" src="images/sort_no.gif" alt="" border="0"></a></td>
+							<td><a href="javascript:sortBy('size');" class='order-link'>&nbsp;Size</a></td>
+						</tr>
+					</table>
+				</td>
+				<td width="120" align="center">
+					<table border="0" cellSpacing="0" cellPadding="0"border="0">
+						<tr>
+							<td><a href="javascript:sortBy('date');"><img  id="sort_date" src="images/sort_no.gif" alt="" border="0"></a></td>
+							<td><a href="javascript:sortBy('date');" class='order-link'>&nbsp;Date</a></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 		</table>
+	</div>
+	<div id="data_div" style="padding: 0; border: none; overflow: auto; width: 100%; position: relative;">
+		<img src="images/s.gif" width="1" height="3"><br />
+		<table id="tableFiles" border="0" cellSpacing="1" cellPadding="0" width="100%" border="0" style="padding-top:0px;">
+		</table>
+	</div>
+	<div style="display:none">
+	<img id='_desc' src="images/sort_desc.gif" alt="" border="0">
+	<img id='_asc' src="images/sort_asc.gif" alt="" border="0">
+	<img id='_no' src="images/sort_no.gif" alt="" border="0">
+
+	</div>
 	</body>
 </html>