Index: openacs-4/packages/bookmarks/www/bookmark-add-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/bookmark-add-one.adp	3 Jul 2015 11:19:03 -0000	1.8
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp	17 Oct 2017 06:53:40 -0000	1.9
@@ -3,7 +3,7 @@
 <property name="context">@context;literal@</property>
 
 <include src="bookmark-header">
-<if @url_unreachable_p@ eq "t">
+<if @url_unreachable_p;literal@ true>
 <strong>Warning: We are not able to reach the url (@complete_url@) that you specified. Please make sure that you did not misspell the url.</strong>
 </if>
 
Index: openacs-4/packages/bookmarks/www/bookmark-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bookmarks/www/bookmark-edit.adp	31 Jul 2015 06:38:43 -0000	1.10
+++ openacs-4/packages/bookmarks/www/bookmark-edit.adp	17 Oct 2017 06:53:40 -0000	1.11
@@ -8,7 +8,7 @@
 <input type="hidden" name="bookmark_id" value="@bookmark.bookmark_id@">
 <table>
  
-<if @bookmark.folder_p@ eq "f">
+<if @bookmark.folder_p;literal@ false>
 <tr> 
 <td align="right" valign="top">URL:</td> 
 <td align="left"><input type="text" size="40" maxlength="500" name="complete_url" value="@bookmark.complete_url@"></td>
@@ -26,8 +26,8 @@
 
 <tr>
   <td align="right" valign="top">Access Permissions</td>
-<if @public_possible_p@ eq "t">
-<td><input type="checkbox" name="private_p" value="t" <if @old_private_p@ eq "t"> checked</if>> Private (no other registered users have read access <if @folder_bookmark@ eq "folder">to this folder or any of its contained bookmarks and folders</if>)</td>
+<if @public_possible_p;literal@ true>
+<td><input type="checkbox" name="private_p" value="t" <if @old_private_p;literal@ true> checked</if>> Private (no other registered users have read access <if @folder_bookmark@ eq "folder">to this folder or any of its contained bookmarks and folders</if>)</td>
 </if>
 <else>
 <td>This bookmark is private since it is contained in a private folder. To make this bookmark public you need to make the topmost private folder containing this bookmark public.</td>
@@ -43,7 +43,7 @@
 
 <ul>
 
-<if @delete_p@ eq "t">
+<if @delete_p;literal@ true>
 <p>  
 <li><a href="bookmark-delete?bookmark_id=@bookmark.bookmark_id@&amp;viewed_user_id=@viewed_user_id@&amp;return_url=@return_url_urlenc@">Delete this <%= [ad_decode @bookmark.folder_p@ "t" "folder" "bookmark"] %></a>
 </li>
Index: openacs-4/packages/bookmarks/www/bookmark-header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmark-header.adp	23 Jun 2015 16:24:15 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmark-header.adp	17 Oct 2017 06:53:40 -0000	1.4
@@ -11,7 +11,7 @@
 	     <a href="bookmarks-export?viewed_user_id=@viewed_user_id@">Export</a>
 	   </div>
 
-	    <if @write_p@ eq "t">
+	    <if @write_p;literal@ true>
                 <div class="tab">
  		  <a href="bookmark-add-import?return_url=@return_url_urlenc@&amp;viewed_user_id=@viewed_user_id@">Add / Import</a>	
                 </div>
@@ -29,12 +29,12 @@
    	    <div class="tab">
 	     <a href="bookmarks-user-list">Other users</a> 
 	    </div>
-	    <if @root_admin_p@ eq "1">
+	    <if @root_admin_p;literal@ true>
    	     <div class="tab">
 	      <a href="@permissions_url@">Permissions</a> 
 	     </div>
 	    </if>
-	    <if @bookmarks_admin_p@ eq "1">
+	    <if @bookmarks_admin_p;literal@ true>
    	     <div class="tab">
 	      <a href="admin">Admin</a>
 	     </div>
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-permissions.adp	3 Jul 2015 11:19:03 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp	17 Oct 2017 06:53:40 -0000	1.8
@@ -10,7 +10,7 @@
 
 <tr>
   <th>Default (root) access permissions</th>
-  <td><input type="checkbox" name="private_p" value="t" <if @old_private_p@ eq "t"> checked</if>> Private (no other registered users have read access to any of your bookmarks)</td>
+  <td><input type="checkbox" name="private_p" value="t" <if @old_private_p;literal@ true> checked</if>> Private (no other registered users have read access to any of your bookmarks)</td>
 </tr>
 
 </table>
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/permissions-reset-all.adp	3 Jul 2015 11:19:04 -0000	1.5
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.adp	17 Oct 2017 06:53:40 -0000	1.6
@@ -7,7 +7,7 @@
 
 <ul>
 <multiple name="direct_permissions">
-<li>@direct_permissions.local_title@ <if @public_p@ eq "t">private</if><else>public</else></li>
+<li>@direct_permissions.local_title@ <if @public_p;literal@ true>private</if><else>public</else></li>
 </multiple>
 </ul>
 
Index: openacs-4/packages/bookmarks/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bookmarks/www/search.tcl	7 Aug 2014 07:36:55 -0000	1.10
+++ openacs-4/packages/bookmarks/www/search.tcl	17 Oct 2017 06:53:40 -0000	1.11
@@ -98,7 +98,7 @@
 			link_url_eval {[export_vars -base "bookmark-edit" {bookmark_id viewed_user_id return_url} ]}
 			link_html { title "Edit bookmark" }
 			display_template {
-				<if @others_list.admin_p@ eq "t">
+				<if @others_list.admin_p;literal@ true>
 				<img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" border="0">
 				</if>
 			}