Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/bookmarks/www/index.adp	6 Jul 2016 08:35:03 -0000	1.21
+++ openacs-4/packages/bookmarks/www/index.adp	6 Jul 2016 08:52:30 -0000	1.22
@@ -46,12 +46,12 @@
     
     <% set decoration_open ""
        set decoration_close ""
-    if { @bookmark.folder_p@ == "f" && [string compare @bookmark.last_checked_date@ @bookmark.last_live_date@] } {
+    if {[string is false @bookmark.folder_p;literal@] && [string compare @bookmark.last_checked_date@ @bookmark.last_live_date@] } {
 	append decoration_open "<i>"
 	append decoration_close "</i>"
     }
 
-    if {@bookmark.folder_p@ true} {
+    if {[string is true @bookmark.folder_p;literal@]} {
 	append decoration_open "<b>"
 	append decoration_close "</b>"
     }
@@ -60,18 +60,18 @@
 
     set action_bar ""
 
-    if { "@bookmark.admin_p@" true } {
+    if { [string is true @bookmark.admin_p;literal@] } {
        lappend action_bar [subst {
 	   <a href="bookmark-edit?viewed_user_id=@viewed_user_id;literal@&amp;bookmark_id=@bookmark.bookmark_id;literal@&amp;return_url=@return_url_urlenc;literal@">$edit_anchor</a>
        }]
     }
-    if { "@bookmark.delete_p@" true } {
+    if { [string is true @bookmark.delete_p;literal@] } {
 	lappend action_bar [subst {
 	    <a href="bookmark-delete?bookmark_id=@bookmark.bookmark_id;literal@&amp;return_url=@return_url_urlenc;literal@&amp;viewed_user_id=@viewed_user_id;literal@">$delete_anchor</a>
 	}]
     } 
 
-    if {@bookmark.folder_p@ false} {
+    if { [string is false @bookmark.folder_p;literal@]} {
 	set url "bookmark-access?bookmark_id=@bookmark.bookmark_id;literal@&url=[ad_urlencode @bookmark.complete_url;literal@]"
 	set bgcolor $bookmark_bgcolor
 	set image_url "pics/ftv2doc.gif"
@@ -83,9 +83,9 @@
 	set url "toggle-open-close?bookmark_id=@bookmark.bookmark_id;literal@&viewed_user_id=@viewed_user_id;literal@&sort_by=@sort_by@&browsing_user_id=@browsing_user_id;literal@"
 
 	# different image_urls for whether or not the folder is open
-	if {@bookmark.closed_p@ true} {
+	if { [string is true @bookmark.closed_p;literal@]} {
 	    set image_url "pics/ftv2folderclosed.gif"
-	} elseif {@bookmark.closed_p@ false } {
+	} elseif {[string is false @bookmark.closed_p;literal@]} {
 	    set image_url "pics/ftv2folderopen.gif"
 	}
     }