Index: openacs-4/packages/acs-admin/www/users/merge-final.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/merge-final.adp	22 May 2018 15:59:45 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/merge-final.adp	22 May 2018 17:30:02 -0000	1.6
@@ -4,7 +4,7 @@
 
     <h2>Merging ...</h2>
 
-    <if @merge_p;literal@ ne 0>
+    <if @merge_p;literal@ true>
       <p/>
         @results;noquote@
       <p/>
Index: openacs-4/packages/acs-reference/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-reference/www/index.adp	22 May 2018 15:59:45 -0000	1.7
+++ openacs-4/packages/acs-reference/www/index.adp	22 May 2018 17:30:02 -0000	1.8
@@ -9,7 +9,7 @@
 <hr>
 <h3>Reports</h3>
 Coming soon!
-<if @admin_p;literal@ ne 0 >
+<if @admin_p;literal@ true>
 <hr>
 <h3>Admin</h3>
   None Yet
Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 15:59:45 -0000	1.24
+++ openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 17:30:02 -0000	1.25
@@ -5,9 +5,9 @@
 
     <multiple name="items">
 <if @admin_p;literal@ true><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
-<if @feedback_only_p;literal@ eq 0 or @items.has_feedback_p;literal@ eq 1>
+<if @feedback_only_p;literal@ false or @items.has_feedback_p;literal@ true>
      <if @show_item_name_p;literal@ true><p style="font-weight:bold;">@items.name@:</p></if>
-      <if @survey_p;literal@ ne t and @items.as_item_id@ ne @items.next_as_item_id@>
+      <if @survey_p;literal@ false and @items.as_item_id@ ne @items.next_as_item_id@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
       </if>
      </if>
@@ -20,7 +20,7 @@
 	</if>
 	    <group column=as_item_id>
 	      @items.description;noquote@
-		<if @survey_p;literal@ ne t>
+		<if @survey_p;literal@ false>
 		  <if @items.as_item_id@ eq @items.next_as_item_id@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
 
@@ -32,14 +32,14 @@
 			<if @items.answered_p;literal@ true><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
-		      <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
+		      <if @edit_p;literal@ true and @items.answered_p;literal@ true><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
 		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		    </if>
 		    <else>
 		      <if @items.answered_p;literal@ true><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
 		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
-		    <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
+		    <if @edit_p;literal@ true and @items.answered_p;literal@ true>
               <a href="@items.results_edit_url@">#assessment.Edit#</a>
             </if>
 		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
@@ -81,10 +81,10 @@
     </group>
 
   <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>
-  <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
+  <if @edit_p;literal@ true and @items.answered_p;literal@ true>
     <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
   </if>
-  <if @feedback_only_p;literal@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
+  <if @feedback_only_p;literal@ false and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
     <p style="font-weight: bold">@items.result_points@ / @items.points@ #assessment.points#</p>
   </if>
 
Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/assessment/lib/session.adp	22 May 2018 15:59:45 -0000	1.15
+++ openacs-4/packages/assessment/lib/session.adp	22 May 2018 17:30:02 -0000	1.16
@@ -3,7 +3,7 @@
 <th colspan="3" align="left">#assessment.Assessment#: <a href="assessment?assessment_id=@assessment_id@">@assessment_data.title@</a></th></tr>
 <tr><td><strong>#assessment.User_ID#:</strong> <span><if @show_username_p;literal@ true><a href="@session_user_url@">@first_names@ @last_name@</a><if @assessment_data.anonymous_p;literal@ true><br>#assessment.lt_bNoteb_This_assessmen#</if></if><else>#assessment.anonymous_name#</else></span></td>
 <td><strong>#assessment.Attempt#:</strong> <multiple name="session_attempts"><if @session_attempts.session_id@ eq @session_id@><strong>@session_attempts.rownum@</strong></if><else><a href="session?session_id=@session_attempts.session_id@">@session_attempts.rownum@</a></else>&nbsp;&nbsp; </multiple> <if @admin_p;literal@ true> (<a href="@delete_url@">#assessment.Delete_Attempts#</a>)</if></td>
-<td><if @assessment_data.survey_p;literal@ ne t> <if @showpoints@ eq 1> <strong>#assessment.Percent_Score#:</strong>  <span>@percent_score@</span></if></if> </td></tr>
+<td><if @assessment_data.survey_p;literal@ false> <if @showpoints@ eq 1> <strong>#assessment.Percent_Score#:</strong>  <span>@percent_score@</span></if></if> </td></tr>
 
 <tr><td><strong>#assessment.Started#:</strong> <span>@session_start@</span></td>
 <td><strong>#assessment.Finished#:</strong> <span>@session_finish@</span></td>
@@ -19,7 +19,7 @@
 <multiple name="sections">
 
   <fieldset style="padding:10px;margin-bottom:10px"><!-- Section FieldSet -->
-    <legend>@sections.title@   <if @assessment_data.survey_p;literal@ ne t> <if @showpoints@ eq 1 and @sections.max_points@ gt 0>(@sections.points@ / @sections.max_points@ #assessment.points#)</p></if> </if></legend>
+    <legend>@sections.title@   <if @assessment_data.survey_p;literal@ false> <if @showpoints@ eq 1 and @sections.max_points@ gt 0>(@sections.points@ / @sections.max_points@ #assessment.points#)</p></if> </if></legend>
 
   <if @sections.max_time_to_complete@ not nil><p>(#assessment.max_time# @sections.max_time_to_complete@)</p></if>
 
@@ -37,7 +37,7 @@
 
 
 <hr>
-<if @assessment_data.survey_p;literal@ ne t and @assessment_data.show_feedback@ ne none and @assessment_score@ not nil and @assessment_score@ gt 0><strong>#assessment.Total_score#:</strong> @session_score@ / @assessment_score@ = @percent_score@%</if>
+<if @assessment_data.survey_p;literal@ false and @assessment_data.show_feedback@ ne none and @assessment_score@ not nil and @assessment_score@ gt 0><strong>#assessment.Total_score#:</strong> @session_score@ / @assessment_score@ = @percent_score@%</if>
 
 <if @comments_installed_p;literal@ true>
 <include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" >
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	22 May 2018 15:59:45 -0000	1.33
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	22 May 2018 17:30:02 -0000	1.34
@@ -30,7 +30,7 @@
        <div class="question-container" style="margin-bottom:25px">
          <if @items.description@ not nil><p>@items.description;noquote@</p></if>
          <if @items.content@ not nil><p>@items.content;noquote@</p></if>
-         <if @items.presentation_type@ ne fitb><strong>@items.question_text;noquote@<if @assessment_data.show_item_name_p;literal@ eq f and @items.required_p;literal@ eq t> <span style="color: #f00;">*</span></if></strong></if>
+         <if @items.presentation_type@ ne fitb><strong>@items.question_text;noquote@<if @assessment_data.show_item_name_p;literal@ false and @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></strong></if>
 
 <group column=as_item_id>
          <div class="form-widget">
Index: openacs-4/packages/assessment/www/assessment-single-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-single-submit.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/assessment/www/assessment-single-submit.adp	22 May 2018 15:13:22 -0000	1.15
+++ openacs-4/packages/assessment/www/assessment-single-submit.adp	22 May 2018 17:30:02 -0000	1.16
@@ -33,7 +33,7 @@
       <input type="hidden" name="as_item_id" value="@items.as_item_id@">
       <tr>
       <tr bgcolor="#e4eaef"><if @assessment_data.show_item_name_p;literal@ true><td colspan="2" nowrap><strong>@items.name@:<if @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></strong></td></if>
-        <td><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p;literal@ eq f and @items.required_p;literal@ eq t> <span style="color: #f00;">*</span></if></if></strong></td></tr>
+        <td><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p;literal@ false and @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></if></strong></td></tr>
       <if @items.content@ not nil><tr><if @assessment_data.show_item_name_p;literal@ true><td colspan="4"></if><else><td colspan="3"></else>@items.content;noquote@</td></tr></if>
 
       <tr><if @assessment_data.show_item_name_p;literal@ true><td colspan="4"></if><else><td colspan="3"></else>
Index: openacs-4/packages/assessment/www/asm-admin/section-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/section-preview.adp	22 May 2018 15:13:22 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/section-preview.adp	22 May 2018 17:30:02 -0000	1.12
@@ -24,7 +24,7 @@
       <multiple name="items">
       <tr>
       <tr><if @assessment_data.show_item_name_p;literal@ true><td bgcolor="#e4eaef" colspan="2" nowrap><strong>@items.name@:</strong><if @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></td></if>
-        <td bgcolor="#e4eaef"><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p;literal@ eq f and @items.required_p;literal@ eq t> <span style="color: #f00;">*</span></if></if></strong>
+        <td bgcolor="#e4eaef"><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p;literal@ false and @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></if></strong>
       <if @items.content@ not nil><tr><td bgcolor="#e4eaef" colspan="4"><br>@items.content;noquote@</if>
       <if @items.title@ ne @items.next_title@>
         </td></tr>
Index: openacs-4/packages/bug-tracker/www/patch.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/bug-tracker/www/patch.adp	27 May 2016 15:28:44 -0000	1.12
+++ openacs-4/packages/bug-tracker/www/patch.adp	22 May 2018 17:30:02 -0000	1.13
@@ -18,7 +18,7 @@
 </if>
 </p>
 
-<if @mode;literal@ eq "view" and @deleted_p@ defined and @deleted_p;literal@ eq 0>
+<if @mode;literal@ eq "view" and @deleted_p@ defined and @deleted_p;literal@ false>
 <center>
 <p>
 <a href="patch?patch_number=@patch_number;noi18n@&download=1">#bug-tracker.Download_patch_content#</a>
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	22 May 2018 15:59:45 -0000	1.13
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	22 May 2018 17:30:02 -0000	1.14
@@ -18,7 +18,7 @@
 
 %>
 
-<if @config.shaded_p;literal@ ne "t">
+<if @config.shaded_p;literal@ false>
   <include src="/packages/calendar/www/view-list-display"
   start_date="@start_date;literal@"
   end_date="@end_date;literal@"
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	22 May 2018 15:59:45 -0000	1.21
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	22 May 2018 17:30:02 -0000	1.22
@@ -18,7 +18,7 @@
 
 %>
 
-<if @config.shaded_p;literal@ ne "t">
+<if @config.shaded_p;literal@ false>
 
  <switch @view@>
    <case value="day">
Index: openacs-4/packages/categories/www/cadmin/tree-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/tree-delete.adp	22 May 2018 15:59:45 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/tree-delete.adp	22 May 2018 17:30:02 -0000	1.9
@@ -21,7 +21,7 @@
   <p>
 </if>
 
-<if @instances_using_p;literal@ ne t>
+<if @instances_using_p;literal@ false>
   #categories.lt_Are_you_sure_you_want_3#
   <p>
     <a href="@delete_url@" class="button">#categories.Delete#</a>
Index: openacs-4/packages/categories/www/include/widget.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/include/widget.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/include/widget.adp	22 May 2018 15:13:22 -0000	1.6
+++ openacs-4/packages/categories/www/include/widget.adp	22 May 2018 17:30:02 -0000	1.7
@@ -2,7 +2,7 @@
   <multiple name=trees>
     @trees.tree_name@:
     <select name="@name@"<if @trees.assign_single_p;literal@ false> #categories.multiple#</if>>
-    <if @trees.assign_single_p;literal@ eq t and @trees.require_category_p;literal@ eq f><option value=""></if>
+    <if @trees.assign_single_p;literal@ true and @trees.require_category_p;literal@ false><option value=""></if>
     <group column=tree_id>
       <option value="@trees.category_id@"<if @trees.selected_p;literal@ true> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
     </group>
Index: openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp	22 May 2018 15:59:45 -0000	1.9
+++ openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp	22 May 2018 17:30:02 -0000	1.10
@@ -22,7 +22,7 @@
 <multiple name="forums">
   <li>
     <a href="@url@admin/forum-edit?forum_id=@forums.forum_id@">@forums.name@</a>
-<if @forums.enabled_p;literal@ ne t><strong>(#forums-portlet.disabled#)</strong></if>
+<if @forums.enabled_p;literal@ false><strong>(#forums-portlet.disabled#)</strong></if>
   </li>
 </multiple>
 </ul>
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.17 -r1.18
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	22 May 2018 15:59:45 -0000	1.17
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	22 May 2018 17:30:02 -0000	1.18
@@ -18,7 +18,7 @@
 
 %>
 
-<if @config.shaded_p;literal@ ne "t">
+<if @config.shaded_p;literal@ false>
 
 <include src="@scope_fs_url;literal@" &="folder_id" &="root_folder_id" viewing_user_id="@user_id;literal@"
 	 &="n_past_days" fs_url="@url;literal@">
Index: openacs-4/packages/general-comments/www/view-comment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/general-comments/www/view-comment.adp	22 May 2018 15:13:22 -0000	1.12
+++ openacs-4/packages/general-comments/www/view-comment.adp	22 May 2018 17:30:02 -0000	1.13
@@ -54,7 +54,7 @@
   </if>
 </ul>
 
-<if @is_creator_p;literal@ eq t and @allow_attach_p;literal@ eq t>
+<if @is_creator_p;literal@ true and @allow_attach_p;literal@ true>
   <h2>#general-comments.Actions#</h2>
   <ul>
     <if @allow_file_p;literal@ true>
Index: openacs-4/packages/new-portal/www/place-element-other-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/new-portal/www/place-element-other-page.adp	22 May 2018 15:59:45 -0000	1.13
+++ openacs-4/packages/new-portal/www/place-element-other-page.adp	22 May 2018 17:30:02 -0000	1.14
@@ -22,7 +22,7 @@
 <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
 <div><input type="hidden" name="return_url" value="@return_url@"></div>
 
-<if @other_page_avail_p;literal@ ne 0>
+<if @other_page_avail_p;literal@ true>
   <div><input type="hidden" name="element_id" value="@element_id@"></div>
   <div><input type="hidden" name="anchor" value="@page_id@"></div>
   <div><input type="submit" name="op_move_to_page" value="#new-portal.Move_to_page#"></div>
Index: openacs-4/packages/new-portal/www/show-here.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/new-portal/www/show-here.adp	22 May 2018 15:59:45 -0000	1.8
+++ openacs-4/packages/new-portal/www/show-here.adp	22 May 2018 17:30:02 -0000	1.9
@@ -5,7 +5,7 @@
         </div>
     </div>
     <div class="portlet">
-<if @show_avail_p;literal@ ne 0>
+<if @show_avail_p;literal@ true>
     <form method="post" action="@action_string@">
         <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
         <div><input type="hidden" name="region" value="@region@"></div>
Index: openacs-4/packages/new-portal/www/template-place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/new-portal/www/template-place-element.adp	22 May 2018 15:59:45 -0000	1.23
+++ openacs-4/packages/new-portal/www/template-place-element.adp	22 May 2018 17:30:02 -0000	1.24
@@ -98,7 +98,7 @@
 
 </multiple>
 
-<if @show_avail_p;literal@ ne 0>
+<if @show_avail_p;literal@ true>
 <form method=post action=@action_string@>
 
 @show_html;noquote@
Index: openacs-4/packages/new-portal/www/themes/deco-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/deco-theme.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/new-portal/www/themes/deco-theme.adp	22 May 2018 15:13:22 -0000	1.12
+++ openacs-4/packages/new-portal/www/themes/deco-theme.adp	22 May 2018 17:30:02 -0000	1.13
@@ -34,7 +34,7 @@
     <tbody>
     <tr>
     <td align="left" valign="middle" width="88%"  bgcolor="#eeeee7">
-	<if @link_hideable_p;literal@ eq "t" and @hide_links_p;literal@ eq "t">
+	<if @link_hideable_p;literal@ true and @hide_links_p;literal@ true>
           <strong>@name;noquote@</strong>
         </if><else>
           <a style="text-decoration: none" href="@link@"><strong>@name;noquote@</strong></a>
Index: openacs-4/packages/new-portal/www/themes/nada-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/nada-theme.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/new-portal/www/themes/nada-theme.adp	22 May 2018 15:13:22 -0000	1.9
+++ openacs-4/packages/new-portal/www/themes/nada-theme.adp	22 May 2018 17:30:02 -0000	1.10
@@ -32,7 +32,7 @@
     <tr>
     <td class="element-header-text-plain">
       <big>
-        <if @link_hideable_p;literal@ eq "t" and @hide_links_p;literal@ eq "t">
+        <if @link_hideable_p;literal@ true and @hide_links_p;literal@ true>
           <strong>@name;noquote@</strong>
         </if>
         <else>
Index: openacs-4/packages/new-portal/www/themes/simple-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/simple-theme.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp	22 May 2018 15:13:22 -0000	1.23
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp	22 May 2018 17:30:02 -0000	1.24
@@ -21,7 +21,7 @@
 <table class="element" border="0" cellpadding="1" cellspacing="0" width="100%">
 <tr>
   <td class="element-header-text">
-    <if @link_hideable_p;literal@ eq "t" and @hide_links_p;literal@ eq "t">
+    <if @link_hideable_p;literal@ true and @hide_links_p;literal@ true>
       <big><strong>@name;noquote@</strong></big>
     </if>
     <else>
@@ -48,8 +48,8 @@
       <a href="configure-element?element_id=@element_id@&amp;op=hide">
       <img border="0"  src="@dir@/x.gif" alt="hide"></a>
     </if>
-    <if @user_editable_p;literal@ eq "f" and @shadeable_p;literal@ eq "f" and
-     @hideable_p;literal@ eq "f">
+    <if @user_editable_p;literal@ false and @shadeable_p;literal@ false and
+     @hideable_p;literal@ false>
      &nbsp;
     </if>
   </td>
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/news/www/preview.adp	22 May 2018 15:59:45 -0000	1.23
+++ openacs-4/packages/news/www/preview.adp	22 May 2018 17:30:02 -0000	1.24
@@ -7,7 +7,7 @@
 
 <p>#news.lt_Your_news_item_will_b#</p>
 <p>
-  <if @news_admin_p;literal@ ne 0>
+  <if @news_admin_p;literal@ true>
    #news.It_will_go_live_on# @publish_date_pretty@.
     <if @permanent_p;literal@ true>
       #news.lt_And_be_live_until_rev#
Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	22 May 2018 15:59:45 -0000	1.6
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	22 May 2018 17:30:02 -0000	1.7
@@ -1,4 +1,4 @@
-<if @shaded_p;literal@ ne "t">
+<if @shaded_p;literal@ false>
 
   <if @items:rowcount@ gt 0>
 
Index: openacs-4/packages/news-portlet/www/news-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/news-portlet/www/news-portlet.adp	22 May 2018 15:59:45 -0000	1.20
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	22 May 2018 17:30:02 -0000	1.21
@@ -18,7 +18,7 @@
 
 %>
 
-  <if @shaded_p;literal@ ne "t">
+  <if @shaded_p;literal@ false>
     <if @inside_comm_p;literal@ true>
       <div style="padding-top:0.2em; padding-bottom:0.3em;">
         <div style="float:right;">
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp	7 Aug 2017 23:48:13 -0000	1.2
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp	22 May 2018 17:30:02 -0000	1.3
@@ -1,4 +1,4 @@
-<if @login_p;literal@ eq 1>
+<if @login_p;literal@ true>
     <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-top:8px;padding-bottom:0;">@photo;noquote@ <em class="glyphicon glyphicon-chevron-down"></em></a>
         <ul class="dropdown-menu">
Index: openacs-4/packages/static-portlet/www/static-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/static-portlet.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/static-portlet/www/static-portlet.adp	22 May 2018 15:59:45 -0000	1.12
+++ openacs-4/packages/static-portlet/www/static-portlet.adp	22 May 2018 17:30:02 -0000	1.13
@@ -18,7 +18,7 @@
 
 %>
 
-<if @config.shaded_p;literal@ ne "t">
+<if @config.shaded_p;literal@ false>
 <if @success_p;literal@ true>
 @content;noquote@
 </if>