Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	15 Feb 2007 16:36:14 -0000	1.21.2.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	19 Feb 2007 10:43:58 -0000	1.21.2.2
@@ -88,54 +88,69 @@
 
     template::list::create -name folders -multirow folders -key forum_id -pass_properties {
     } -elements {
-	item {
+	icon {
 	    label ""
 	    display_template {
-		<small>
 		<if @folders.type@ eq "folder">
-		 <div style="float:left;">
 		  <a href="@folders.url@?folder_id=@folders.object_id@">
-                   <img border="0" src="/resources/file-storage/folder.gif" height="14" width="14">
+		  <img border="0" src="/resources/file-storage/folder.gif" height="16" width="16">
                   </a> 
-		  <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>
-                 </div>
-		 <div style="float:right;">
+		</if>
+		<elseif @folders.type@ eq "url">
+		    <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif"></a>
+		</elseif>
+		<else>
+		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">
+		   <img border="0" src="/resources/file-storage/file.gif"></a>
+		</else>
+	    }
+	}
+	name {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
+		  <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>		
+		</if>
+		<elseif @folders.type@ eq "url">
+		  <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
+		</elseif>
+		<else>
+		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
+		</else>
+	    }
+	}
+	type {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
 		  #file-storage.folder_type_pretty_name#
+		</if>
+		<else>
+		   @folders.type@
+		</else>
+	    }
+	}
+	size {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
 		  <if @folders.content_size@ eq 0>
-		   0 #fs-portlet.items#
+		    0 #fs-portlet.items#
 		  </if>
-		  <else>
-		   <if @folders.content_size@ gt 1>
+		  <elseif @folders.content_size@ gt 1>
 		    @folders.content_size@ #fs-portlet.items#
-		   </if>
-		   <else>
+		  </elseif>
+	          <else>
                     @folders.content_size@ #fs-portlet.item#
-		   </else>
 		  </else>
-                 </div>
 		</if>
+		<elseif @folders.type@ eq "url">
+		   <i>n/a</i>
+		</elseif>
 		<else>
-		 <if @folders.type@ eq "url">
-		  <div style="float:left;">
-		   <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif"></a>
-		   <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
-		   @folders.type@
-                  </div>
-		 </if>
-		 <else>
-		  <div style="float:left;">
-		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">
-		    <img border="0" src="/resources/file-storage/file.gif"></a>
-		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
-		  </div>
-		  <div style="float:right;">
-		   @folders.type@
 		   @folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else>
 		   \[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>\]
-                  </div>
-		 </else>
 		</else>
-	       </small>
 	    }
 	}
     }