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.36 -r1.37
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	14 Jul 2015 22:36:41 -0000	1.36
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	7 Aug 2017 23:48:12 -0000	1.37
@@ -18,19 +18,22 @@
 
 %>
 
-<if @config.shaded_p@ false>
-<if @use_ajaxfs_p@ eq 1>
-<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id;literal@" folder_id="@folder_id;literal@" layoutdiv="fscontainer">
+<if @config.shaded_p;literal@ false>
+<if @use_ajaxfs_p;literal@ true>
+<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id;literal@"
+	 &="folder_id" layoutdiv="fscontainer">
 </if>
 
 <div id="fscontainer">
-<if @scoped_p@ eq 1>
-<include src="@scope_fs_url;literal@" folder_id="@folder_id;literal@" root_folder_id="@folder_id;literal@" viewing_user_id="@user_id;literal@" n_past_days="@n_past_days;literal@" allow_bulk_actions="1" fs_url="@url;literal@" page_num="@page_num;literal@">
+<if @scoped_p;literal@ true>
+<include src="@scope_fs_url;literal@" &="folder_id" root_folder_id="@root_folder_id;literal@"
+	 viewing_user_id="@user_id;literal@" &="n_past_days" allow_bulk_actions="1"
+	 fs_url="@url;literal@" &="page_num">
 </if>
 
 <else>
 
-<if @write_p@ true>
+<if @write_p;literal@ true>
 	<div class="list-button-bar-top">
 		<a href="@url@folder-create?parent_id=@folder_id@" class="button" title="#fs-portlet.create_new_folder#">#fs-portlet.create_new_folder#</a>
 		<a href="@url@file-add?folder_id=@folder_id@" class="button" title="#fs-portlet.upload_file#">#fs-portlet.upload_file#</a>
@@ -41,8 +44,11 @@
   <listtemplate name="folders"></listtemplate>
 </else>
 
-<p>@notification_chunk;noquote@</p>
-
+<p><include src="/packages/notifications/lib/notification-widget" type="fs_fs_notif"
+	 object_id="@folder_id;literal@"
+	 pretty_name="@folder_name@"
+	 url="@folder_url;literal@" >
+	 
 <if @webdav_url@ not nil>
       <p>#file-storage.Folder_available_via_WebDAV_at#</p>
 </if>