Index: openacs-4/packages/dotlrn-forums/www/dotlrn-forums-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/www/dotlrn-forums-admin-portlet.adp,v
diff -u -N -r1.8.8.1 -r1.8.8.2
--- openacs-4/packages/dotlrn-forums/www/dotlrn-forums-admin-portlet.adp	5 Aug 2016 14:11:57 -0000	1.8.8.1
+++ openacs-4/packages/dotlrn-forums/www/dotlrn-forums-admin-portlet.adp	18 Jan 2017 18:35:31 -0000	1.8.8.2
@@ -23,10 +23,10 @@
 <multiple name="forums">
   <li>
     <a href="@url@admin/forum-edit?forum_id=@forums.forum_id@" title="#dotlrn-forums.goto_forums_name#">@forums.name@</a>
-    <if @forums.enabled_p@ false><strong>(disabled)</strong></if>
+    <if @forums.enabled_p;literal@ false><strong>(disabled)</strong></if>
     <br>
     #dotlrn-forums.Auto_subscribe_label#:
-    <if @forums.autosubscribe_p@ true>
+    <if @forums.autosubscribe_p;literal@ true>
       <strong>#acs-kernel.common_yes#</strong> | <a href="@dotlrn_url@/unsubscribe-members?@forums.query_vars@" title="#dotlrn-forums.do_not_autosubscribe_members#">#acs-kernel.common_No#</a>
     </if>
     <else>
Index: openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.adp,v
diff -u -N -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.adp	5 Aug 2016 14:04:48 -0000	1.9.2.1
+++ openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.adp	18 Jan 2017 18:35:31 -0000	1.9.2.2
@@ -1,10 +1,10 @@
-<if @shaded_p@ true>
+<if @shaded_p;literal@ true>
   <br>
 </if>
 <else>
   <ul>
     <li>
-      <if @subscribe_p@ false>
+      <if @subscribe_p;literal@ false>
         <strong>#dotlrn-homework.Alert#</strong> | <a href="@toggle_url@" title="#dotlrn-homework.Do_not_alert#">#dotlrn-homework.Do_not_alert#</a>
       </if>
       <else>
Index: openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp	14 Jul 2015 22:36:42 -0000	1.2
+++ openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp	18 Jan 2017 18:35:31 -0000	1.2.2.1
@@ -1,4 +1,4 @@
-<if @shaded_p@ true>
+<if @shaded_p;literal@ true>
   <br>
 </if>
 <else>
Index: openacs-4/packages/dotlrn-homework/www/file-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-delete.adp,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/dotlrn-homework/www/file-delete.adp	5 Aug 2016 14:04:48 -0000	1.3.2.1
+++ openacs-4/packages/dotlrn-homework/www/file-delete.adp	18 Jan 2017 18:35:31 -0000	1.3.2.2
@@ -2,7 +2,7 @@
 <property name="doc(title)">#dotlrn-homework.Delete_title#</property>
 <property name="context_bar">@context_bar;literal@</property>
 
-<if @blocked_p@ eq "t">
+<if @blocked_p;literal@ true>
 
 <p>#dotlrn-homework.lt_This_file_has_version#
 
Index: openacs-4/packages/dotlrn-homework/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file.adp,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/dotlrn-homework/www/file.adp	3 Jul 2015 10:44:00 -0000	1.6
+++ openacs-4/packages/dotlrn-homework/www/file.adp	18 Jan 2017 18:35:31 -0000	1.6.2.1
@@ -3,27 +3,27 @@
 <property name="context_bar">@context_bar;literal@</property>
 
   <p>
-  [<if @show_all_versions_p@ true>
+  [<if @show_all_versions_p;literal@ true>
       <a href="file?file_id=@file_id@&amp;folder_id=@folder_id@&amp;show_all_versions_p=f">#dotlrn-homework.lt_Show_only_live_versio#</a>
    </if>
    <else>
      <a href="file?file_id=@file_id@&amp;folder_id=@folder_id@&amp;show_all_versions_p=t">#dotlrn-homework.Show_all_versions#</a>
    </else>
-  <if @write_file_p@ true>
+  <if @write_file_p;literal@ true>
     | <a href="@version_add_url@">#dotlrn-homework.Upload_a_new_version#</a>
     <if @correction_file_p@ not true>
     | <a href="@move_url@">#dotlrn-homework.Move#</a>
     </if>
   </if>
-  <if @delete_p@ true>
+  <if @delete_p;literal@ true>
     | <a href="file-delete?file_id=@file_id@">#dotlrn-homework.lt_Delete_this_file_incl#</a>
   </if>]
   <p>
 
 <table border="1" cellspacing="2" cellpadding="2">
   <tr>
     <td colspan="7">
-      <if @show_all_versions_p@ true>#dotlrn-homework.All_Versions_of_name#</if>
+      <if @show_all_versions_p;literal@ true>#dotlrn-homework.All_Versions_of_name#</if>
       <else>#dotlrn-homework.Live_version_of_name#</else>
     </td>
   </tr>
@@ -35,7 +35,7 @@
     <td>#dotlrn-homework.Modified#</td>
     <td>#dotlrn-homework.Version_Notes#</td>
     <td>
-      <if @action_exists_p@ true>
+      <if @action_exists_p;literal@ true>
         #dotlrn-homework.Action#
       </if>
     </td>
@@ -52,7 +52,7 @@
     <td>@version.last_modified@</td>
     <td>@version.description@</td>
     <td>
-      <if @version.delete_p@ true>
+      <if @version.delete_p;literal@ true>
           &nbsp;
           <a href="version-delete?version_id=@version.version_id@">#dotlrn-homework.delete#</a> 
       </if>
Index: openacs-4/packages/dotlrn-homework/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk.adp,v
diff -u -N -r1.8.6.1 -r1.8.6.2
--- openacs-4/packages/dotlrn-homework/www/folder-chunk.adp	5 Aug 2016 14:04:48 -0000	1.8.6.1
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk.adp	18 Jan 2017 18:35:31 -0000	1.8.6.2
@@ -27,11 +27,11 @@
       <p>
     </if>
     <table border="0" class="table-display" cellpadding="5" cellspacing="0" width="85%">
-      <if @show_header_p@ true>
+      <if @show_header_p;literal@ true>
         <tr class="table-header">
           <td>&nbsp;</td>
           <td>#dotlrn-homework.Title#</td>
-          <if @show_users_p@ true>
+          <if @show_users_p;literal@ true>
             <td>#dotlrn-homework.Student#</td>
           </if>
 	<else>
@@ -55,7 +55,7 @@
           <td align="left">@folders.spaces;noquote@<a href="@folders.download_url@"><img style="border:0" src="@file_storage_url@/graphics/file.gif"></a></td>
           <td><a href="@folders.download_url@">@folders.name@</a><br><if @folders.name@ ne @folders.title@><span style="color: \#999;">@folders.title@</span></if></td>
           <td>
-            <if @show_users_p@ true>
+            <if @show_users_p;literal@ true>
               @folders.file_owner_name@
             </if>
           </td>
@@ -65,7 +65,7 @@
                | <a href="@folders.upload_correction_url@">#dotlrn-homework.View#</a>
              </if>
              <if @folders.view_correction_details_url@ not nil>
-               | <a href="@folders.view_correction_details_url@">#dotlrn-homework.View_1#<if @admin_p@ true>#dotlrn-homework.lt_or_edit#</if> #dotlrn-homework.Comments#</a>
+               | <a href="@folders.view_correction_details_url@">#dotlrn-homework.View_1#<if @admin_p;literal@ true>#dotlrn-homework.lt_or_edit#</if> #dotlrn-homework.Comments#</a>
              </if>
           </small></td>
       </else>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -N -r1.39.4.1 -r1.39.4.2
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	18 Jul 2016 11:53:58 -0000	1.39.4.1
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	18 Jan 2017 18:35:31 -0000	1.39.4.2
@@ -31,8 +31,8 @@
       <li><a href="change-site-template?referer=@referer@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a></li>
       <li>
         #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
-          <if @members_can_spam_p@ true><strong>#dotlrn-portlet.All_members#</strong></if><else><a href="spam-policy-toggle?policy=all" title="#dotlrn-portlet.change_bm_policy_to_all_members#">#dotlrn-portlet.All_members#</a></else>
-          | <if @members_can_spam_p@ false><strong>#dotlrn-portlet.Only_admins#</strong></if><else><a href="spam-policy-toggle?policy=admins" title="#dotlrn-portlet.change_bm_policy_to_only_admins#">#dotlrn-portlet.Only_admins#</a></else>
+          <if @members_can_spam_p;literal@ true><strong>#dotlrn-portlet.All_members#</strong></if><else><a href="spam-policy-toggle?policy=all" title="#dotlrn-portlet.change_bm_policy_to_all_members#">#dotlrn-portlet.All_members#</a></else>
+          | <if @members_can_spam_p;literal@ false><strong>#dotlrn-portlet.Only_admins#</strong></if><else><a href="spam-policy-toggle?policy=admins" title="#dotlrn-portlet.change_bm_policy_to_only_admins#">#dotlrn-portlet.Only_admins#</a></else>
           #dotlrn-portlet.lt_can_send_bulk_mail_to#
       </li>
     </ul>
@@ -49,7 +49,7 @@
       <li><a href="member-email" title="#dotlrn-portlet.Edit_Welcome_Message#">#dotlrn-portlet.Edit_Welcome_Message#</a>
        - <if @member_email_enabled_p@ true"><strong>#acs-subsite.Enabled#</strong></if>
          <else><a href="member-email-toggle" title="#dotlrn-portlet.enable_welcome_message#">#acs-subsite.Enabled#</a></else> |
-         <if @member_email_enabled_p@ false><strong>#acs-subsite.Disabled#</strong></if>
+         <if @member_email_enabled_p;literal@ false><strong>#acs-subsite.Disabled#</strong></if>
          <else><a href="member-email-toggle" title="#dotlrn-portlet.disable_welcome_message#">#acs-subsite.Disabled#</a></else>
     </if>
     <else>
@@ -66,8 +66,8 @@
         |&nbsp;<if @join_policy@ eq "needs approval"><strong>#dotlrn-portlet.Needs_Approval#</strong></if><else><a href="join-policy-toggle?policy=needs%20approval" title="#dotlrn-portlet.set_policy_approval#">#dotlrn-portlet.Needs_Approval#</a></else>
       </li>
 </if>
-<if @subcommunity_p@ false>
-  <if @club_p@ false>
+<if @subcommunity_p;literal@ false>
+  <if @club_p;literal@ false>
     <if @create_limited_user_p@ true or @dotlrn_admin_p@ true >
       <li>
         <a href="@limited_user_add_url@" title="#dotlrn-portlet.lt_Create_a_new_Limited_#">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea# </li>
@@ -113,24 +113,24 @@
 </if>
 
 <comment>.LRN admin actions section</comment>
-<if @dotlrn_admin_p@ true>
+<if @dotlrn_admin_p;literal@ true>
 <ul>
   <li><a href="@dotlrn_admin_url@" title="#dotlrn-portlet.goto_admin_pretty_name#">@admin_pretty_name@</a>
     <ul>
       <li><a href="dotlrn-group-admin-faq" title="#dotlrn-portlet.goto_Administrator_FAQ#">#dotlrn-portlet.Administrator_FAQ#</a></li>
       <li><a href="clone" title="#dotlrn-portlet.Copy_this_group#">#dotlrn-portlet.Copy_this_group#</a></li>
-  <if @archived_p@ true>
+  <if @archived_p;literal@ true>
       <li><a href="@dotlrn_admin_url@/archived-communities" title="#dotlrn-portlet.goto_archived_communities#"><span style="color:red">#dotlrn-portlet.lt_This_group_is_archive#</span></a></li>
   </if>
   <else>
       <li><a href="subcommunity-archive" title="#dotlrn-portlet.Archive_this_group#">#dotlrn-portlet.Archive_this_group#</a></li>
   </else>
-  <if @club_p@ false>
+  <if @club_p;literal@ false>
       <li><a href="class-term-change?pretty_name=@pretty_name;noquote@" title="#dotlrn-portlet.Change_term_of_pretty_name#">#dotlrn-portlet.Change_term#</a></li>
   </if>
       <li>
         #dotlrn-portlet.lt_Guests_Can_View_Membership_Info# -
-  <if @guests_can_view_private_data_p@ true><strong>#acs-kernel.common_yes#</strong>&nbsp;|&nbsp;<a href="privacy-policy-toggle?policy=no" title="#dotlrn-portlet.Toggle_privacy_policy_to_no#">#acs-kernel.common_No#</a></if><else><a href="privacy-policy-toggle?policy=yes" title="#dotlrn-portlet.Toggle_privacy_policy_to_yes#">#acs-kernel.common_Yes#</a>&nbsp;|&nbsp;<strong>#acs-kernel.common_no#</strong></else>
+  <if @guests_can_view_private_data_p;literal@ true><strong>#acs-kernel.common_yes#</strong>&nbsp;|&nbsp;<a href="privacy-policy-toggle?policy=no" title="#dotlrn-portlet.Toggle_privacy_policy_to_no#">#acs-kernel.common_No#</a></if><else><a href="privacy-policy-toggle?policy=yes" title="#dotlrn-portlet.Toggle_privacy_policy_to_yes#">#acs-kernel.common_Yes#</a>&nbsp;|&nbsp;<strong>#acs-kernel.common_no#</strong></else>
       </li>
     </ul>
   </li>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v
diff -u -N -r1.19 -r1.19.8.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	15 May 2007 20:14:31 -0000	1.19
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	18 Jan 2017 18:35:31 -0000	1.19.8.1
@@ -20,15 +20,15 @@
 
 
 <if @config.shaded_p@ ne "t">
-<if @read_private_data_p@ eq 1>
+<if @read_private_data_p;literal@ true>
 <listtemplate name="users"></listtemplate>
 <if @spam_p@ true or @admin_p@ eq 1>
 <p>
 
-<if @spam_p@ true>
+<if @spam_p;literal@ true>
   <a href="@spam_url@" title="#dotlrn-portlet.Email_Members#" class="button">#dotlrn-portlet.Email_Members#</a>
 </if>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
   	<a href="members" title="#dotlrn-portlet.Sortmanage#" class="button">#dotlrn-portlet.Sortmanage#</a>
 </if>
 </p>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v
diff -u -N -r1.21 -r1.21.6.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	9 Nov 2008 23:29:24 -0000	1.21
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	18 Jan 2017 18:35:31 -0000	1.21.6.1
@@ -74,7 +74,7 @@
     </ul>
   </if>
 
-  <if @read_private_data_p@>
+  <if @read_private_data_p;literal@ true>
     <br>
     <a href="members" title="#dotlrn-portlet.Member_List#">#dotlrn-portlet.Member_List#</a>
   </if>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp,v
diff -u -N -r1.14 -r1.14.8.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp	15 May 2007 20:14:31 -0000	1.14
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp	18 Jan 2017 18:35:31 -0000	1.14.8.1
@@ -20,7 +20,7 @@
 
 <if @config.shaded_p@ ne "t">
 
-  <if @has_subcomm_p@ eq 1>
+  <if @has_subcomm_p;literal@ true>
 
     <ul>