Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.13 -r1.13.6.1
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	13 Jan 2005 13:58:20 -0000	1.13
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	15 Feb 2007 16:36:14 -0000	1.13.6.1
@@ -18,8 +18,16 @@
 
 %>
 
+<if @config.shaded_p@ ne "t">
+
 <include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@root_folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
 <p>@notification_chunk;noquote@</p>
 <if @webdav_url@ not nil>
       <p>#file-storage.Folder_available_via_WebDAV_at#</p>
 </if>
+</if>
+<else>
+  <small>
+    #new-portal.when_portlet_shaded#
+  </small>
+</else>
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.31 -r1.31.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	15 Dec 2006 22:45:37 -0000	1.31
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	15 Feb 2007 16:36:14 -0000	1.31.2.1
@@ -44,75 +44,14 @@
   </table>
 
 </if>
+  <listtemplate name="folders"></listtemplate>
 
-  <table class="table-display" border="0" cellpadding="3" cellspacing="0" width="100%">
-    <multiple name="folders">
-       <if @folders.rownum@ odd>
-          <tr class="odd">
-       </if>
-       <else>
-          <tr class="even">
-       </else>
-
-       <if @folders.type@ eq "folder">
-          <td>
-          <a href="@folders.url@?folder_id=@folders.object_id@" title="#fs-portlet.open_folder_folders_name#">
-	  <img border="0" src="/resources/file-storage/folder.gif" height="14" width="14" alt="#file-storage.folder#">
- 	  </a>
-          </td>
-          <td>
-          <a href="@folders.url@?folder_id=@folders.object_id@" title="#fs-portlet.open_folder_folders_name#">@folders.name@</a>
-          </td>
-          <td><small>#file-storage.folder_type_pretty_name#</small></td>
-          <if @folders.content_size@ eq 0>
-            <td><small>0 #fs-portlet.items#</small></td>
-          </if>
-          <else>
-            <if @folders.content_size@ gt 1>
-               <td><small>@folders.content_size@ #fs-portlet.items#</small></td>
-            </if>
-            <else>
-                <td><small>@folders.content_size@ #fs-portlet.item#</small></td>
-            </else>
-          <td>&nbsp;</td>
-          </else>
-        </if>
-        <else>
-          <if @folders.type@ eq "url">
-             <td>
-              <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif"></a>
-             </td>
-             <td>
-             <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
-             </td>
-             <td><small>@folders.type@</small></td>
-             <td><small>&nbsp;</small></td>
-             <td><small>&nbsp;</small></td>
-          </if>
-          <else>
-             <td>
-              <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@"><img border="0" src="/resources/file-storage/file.gif"></a>
-             </td>
-             <td>
-             <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
-             </td>
-             <td><small>@folders.type@</small></td>
-             <td><small>@folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else></small></td>
-            <td>
-            <nobr> <small>[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>]</small>
-            </nobr>
-            </td>
-         </else>
-      </else>
-      </tr>  
-   </multiple>
-   </table>
-
 </else>
-
 </if>
 <else>
-  &nbsp;
+<small>
+    #new-portal.when_portlet_shaded#
+  </small>
 </else>
 
 <p>@notification_chunk;noquote@</p>
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 -r1.21.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	15 Dec 2006 22:45:37 -0000	1.21
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	15 Feb 2007 16:36:14 -0000	1.21.2.1
@@ -85,6 +85,61 @@
 if {$scoped_p} {
     set scope_fs_url "/packages/file-storage/www/folder-chunk"
 } else {
+
+    template::list::create -name folders -multirow folders -key forum_id -pass_properties {
+    } -elements {
+	item {
+	    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">
+                  </a> 
+		  <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>
+                 </div>
+		 <div style="float:right;">
+		  #file-storage.folder_type_pretty_name#
+		  <if @folders.content_size@ eq 0>
+		   0 #fs-portlet.items#
+		  </if>
+		  <else>
+		   <if @folders.content_size@ gt 1>
+		    @folders.content_size@ #fs-portlet.items#
+		   </if>
+		   <else>
+                    @folders.content_size@ #fs-portlet.item#
+		   </else>
+		  </else>
+                 </div>
+		</if>
+		<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>
+	    }
+	}
+    }
+
     db_multirow folders $query {
         # The name of the folder may contain message keys that need to be localized on the fly
         set name [lang::util::localize $name]