Index: openacs-4/packages/dotlrn/www/communities-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/communities-chunk.tcl	7 Aug 2017 23:48:09 -0000	1.14
+++ openacs-4/packages/dotlrn/www/communities-chunk.tcl	15 Sep 2017 07:28:53 -0000	1.15
@@ -68,7 +68,7 @@
 	member_p {
 	    label "\#dotlrn.Actions\#"
 	    display_template {
-		<if @communities.member_p@ eq 0>
+		<if @communities.member_p;literal@ false>
 		   <center>
 		   <include src="/packages/dotlrn/www/register-link" url="register?community_id=@communities.community_id@&referer=@communities.referer@">
                    </center>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.49 -r1.50
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	7 Aug 2017 23:48:09 -0000	1.49
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	15 Sep 2017 07:28:53 -0000	1.50
@@ -19,7 +19,7 @@
 %>
 
 
-  <if @user_can_browse_p@ and @self_registration_p@>
+  <if @user_can_browse_p;literal@ true and @self_registration_p;literal@ true>
     <div style="text-align: right">
       <a href="@dotlrn_url@/manage-memberships" title="#dotlrn.lt_JoinDrop_a_Class_or_C#" class="button">#dotlrn.lt_JoinDrop_a_Class_or_C#</a>
     </div>
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	7 Aug 2017 23:48:09 -0000	1.23
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	15 Sep 2017 07:28:53 -0000	1.24
@@ -170,7 +170,7 @@
             #dotlrn.Pending_Approval#
             </if>
             <else>
-            <if @show_drop_button_p@ eq 1>
+            <if @show_drop_button_p;literal@ true>
             <include src="/packages/dotlrn/www/deregister-link" url="@member_classes.url@deregister-self-confirm" referer=@referer@>
             </if>
             </else>
@@ -206,7 +206,7 @@
             \[#dotlrn.Pending_Approval#\]
             </if>
             <else>
-            <if @show_drop_button_p@ eq 1>
+            <if @show_drop_button_p;literal@ true>
             <include src="/packages/dotlrn/www/deregister-link" url="@member_clubs.url@deregister-self-confirm" referer=@referer@>
             </if>
             </else>
@@ -279,7 +279,7 @@
         html {align left style "width:30%"}
         label "[_ dotlrn.class_instances_pretty_name]"
         display_template {
-            <if @swa_p@ eq 1><a href="@non_member_classes.url@" title="\\#dotlrn.goto_non_member_classes\\#">@non_member_classes.pretty_name@</a></if>
+            <if @swa_p;literal@ true><a href="@non_member_classes.url@" title="\\#dotlrn.goto_non_member_classes\\#">@non_member_classes.pretty_name@</a></if>
             <else>@non_member_classes.pretty_name@</else>
         }
     }
@@ -320,7 +320,7 @@
         html {align left style "width:30%"}
         label "[_ dotlrn.clubs_pretty_name]"
         display_template {
-            <if @swa_p@ eq 1><a href="@non_member_clubs.url@" title="\\#dotlrn.goto_non_member_clubs\\#">@non_member_clubs.pretty_name@</a></if>
+            <if @swa_p;literal@ true><a href="@non_member_clubs.url@" title="\\#dotlrn.goto_non_member_clubs\\#">@non_member_clubs.pretty_name@</a></if>
             <else>@non_member_clubs.pretty_name@</else>
         }
     }
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/dotlrn/www/members.tcl	7 Aug 2017 23:48:09 -0000	1.35
+++ openacs-4/packages/dotlrn/www/members.tcl	15 Sep 2017 07:28:53 -0000	1.36
@@ -91,7 +91,7 @@
         label ""
         html "align right"
         display_template {
-            <if @members.portrait_p@ true>
+            <if @members.portrait_p;literal@ true>
               <a href="@members.member_url@" title="#acs-subsite.lt_User_has_portrait_title#">
                 <img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" style="border:0">
               </a>
Index: openacs-4/packages/dotlrn-admin/www/admin/cockpit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/cockpit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-admin/www/admin/cockpit.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/cockpit.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -1,209 +1,209 @@
-<master>
-<% set user_id [ad_maybe_redirect_for_registration] %>
-<% permission::require_permission -object_id $user_id -privilege admin %>
-<h2>#dotlrn.Administration_Cockpit#</h2>
-<table width="90%" id="context-bar">
-<tr>
-<td width="40%" VALIGN="top">
-<listtemplate name="online_users"></listtemplate>
-#dotlrn.Total_count# @count@
-</td>
-<td width="20%" VALIGN="top">
-<ul>
-<li><h2>@admin_pretty_name@</h2>
-<ul>
-<li><a href="/dotlrn/?">My Space</a>
-<li><a href="/acs-admin/">OpenACS Admin</a>
-<li><a href="/dotlrn/admin">DotLRN Admin</a>
-<ul>
-  <li><a href="/dotlrn/admin/terms">#dotlrn.Terms#</a></li>
-  <li><a href="/dotlrn/admin/departments">#dotlrn.departments_pretty_plural#</a></li>
-  <li><a href="/dotlrn/admin/classes">#dotlrn.classes_pretty_plural#</a></li>
-  <li><a href="/dotlrn/admin/term?term_id=-1">#dotlrn.class_instances_pretty_plural#</a></li>
-  <li><a href="/dotlrn/admin/clubs">#dotlrn.clubs_pretty_plural#</a></li>
-  <li><a href="/dotlrn/admin/portal-templates">#dotlrn.portal_templates#</a></li>
-  <li><a href="/dotlrn/admin/archived-communities">#dotlrn.Archive#</a></li>
-  <li><a href="/dotlrn/admin/edit-preapproved-emails">#dotlrn.lt_Pre-approved_Email_Se#</a></li>
-</ul>
-</ul>
-<li><h2>Packages</h2>
-<ul>
-<li><a href="/acs-admin/install">Install Packages</a>
-<li><a href="/admin/applications/">Installed Applications</a>
-<li><a href="/acs-service-contract/">Service Contracts</a>
-</ul>
-<li><h2>Site Structure</h2>
-<ul>
-<li><a href="/admin/site-map/">Site Map</a>
-</ul>
-</ul>
-
-</td>
-<td width="20%" VALIGN="top">
-<ul>
-<li><h2>Documentation</h2>
-<ul>
-<li><a href="/doc/">Open ACS Documentation</a>
-<li><a href="/dotlrn/help">DotLRN Documentation</a>
-<li><a href="http://openacs.org/doc/openacs-HEAD/">CVS Head</a>
-<li><a href="http://openacs.org/packages/">Packages</a>
-</ul>
-<li><h2>User Managment</h2>
-<ul>
-<li><a href="/acs-admin/auth">Authorities</a>
-<li><a href="/acs-admin/users/">ACS Users</a>
-	<table width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="50%">
-			<form method="post" action="/acs-admin/users/one">
-			<input type="text" size="6" name="user_id" value="" />
-			<input type="submit" name="formbutton:ok" value="OK" />
-			</form>
-		</td>
-		<td width="50%">
-			<FORM METHOD="get" ACTION="/acs-admin/users/search">
-    			<input type="hidden" name="target" value="one" />
-    			<input type="hidden" name="only_authorized_p" value="0" />
-    			<input type="text" size="6" name="keyword" />
-                  	<input type="submit" value="Find" />
-  			</FORM>
-		</td>
-	</tr>
-	</table>
-<li><a href="/dotlrn/admin/users">DotLRN Users</a>
-	<table border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td>
-			<form method="post" action="/dotlrn/admin/user">
-			<input type="text" size="6" name="user_id" value="" />
-			<input type="submit" name="formbutton:ok" value="OK" />
-			</form>
-		</td>
-	</tr>
-	</table>
-<li><a href="/members/">Members</a>
-</ul>
-<li><h2>User Monitoring</h2>
-<ul>
-<li><a href="/acs-admin/monitor">Active HTTP-Connections</a> | <a href="/monitor/monitor">Current Requests</a>
-<li><a href="/shared/whos-online">User Online</a>
-</ul>
-<li><h2>System Monitor</h2>
-<ul>
-<li><a href="/procs-chunk.adp">Scheduled Procs</a>
-<li><a href="/acs-admin/cache">Cache Info</a>
-<li><a href="/acs-admin/cache/index">Util Memoize Caches</a>
-<li><a href="/acs-service-contract/">Service Contracts</a>
-<if @monitor_exists_p@>
-	<li><a href="@monitor_url@scheduled-procs">Scheduled Procs</a>
-	<li>Watch Errors - Last
-		<table><tr><td>
-		<FORM ACTION=@monitor_url@watchdog/index>    
-		<INPUT NAME=kbytes SIZE=4 value="200"><INPUT TYPE=SUBMIT VALUE="KB">
-		</FORM>
-		</td>
-		<td>
-		<FORM ACTION=@monitor_url@watchdog/index>
-		<INPUT NAME=num_minutes SIZE=4 value=""><INPUT TYPE=SUBMIT VALUE="min">
-		</FORM>
-		</td></tr></table>
-<li><a href="@monitor_url@filters">Filters</a>
-<li><a href="@monitor_url@top/">Set Monitor System</a>
-</if>
-<li><a href="http://uptime.openacs.org/">Uptime Monitor</a>
-</ul>
-</ul>
-</ul>
-</td>
-<td width="20%" VALIGN="top">
-<ul>
-<li><h2>Development</h2>
-<ul>
-<if @ds_exists_p@>
-	<li><a href="@ds_url@">Developer Support</a>(<a href="@ds_url@shell">Shell</a>)
-</if>
-<li><a href="http://openacs.org/bugtracker/openacs/">Bug Tracker</a>
-<li><a href="/acs-admin/apm">Package Manager</a>
-<li><a href="/api-doc/">API Browser</a>
-		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="50%">
-				   <table>
-				     <tr bgcolor="#DDDDDD">
-				      <form action="/api-doc/proc-search" method="get">
-				      <td valign="top">
-				       <b>OpenACS Tcl API Search</b>
-				       <input type="text" size="16" name="query_string" value=""/><br />
-				       <input type="submit" value="All" name="search_type" />
-				       <input type="submit" value="Best" name="search_type" />
-				       <p><a href="/api-doc/proc-browse">Browse OpenACS Tcl API</a></p>
-				      </td>
-				      <td>       
-				       <table cellspacing="0" cellpadding="0">
-				         <tr><td align="right">Name contains:</td>
-				           <td><input type="radio" name="name_weight" value="5" checked="checked" /> </td></tr>
-				         <tr><td align="right">Exact name:</td>
-				           <td><input type="radio" name="name_weight" value="exact" /></td></tr>
-				         <tr><td align="right">&nbsp;</td><td>&nbsp;</td></tr>
-				         <tr><td align="right">Parameters:</td>
-				           <td><input type="checkbox" name="param_weight" value="3" checked="checked" /></td></tr>
-				         <tr><td align="right">Documentation:</td>
-				           <td><input type="checkbox" name="doc_weight" value="2" checked="checked" /></td></tr>
-				         <tr><td align="right">Source:</td>
-				           <td><input type="checkbox" name="source_weight" value="1" /></td></tr>
-				       </table>
-				      </td>
-				      </form>
-				     </tr>				
-				  <tr bgcolor="#DDDDDD">
-				   <form action="/api-doc/tcl-proc-view" method="get">
-				   <td colspan="2">
-				    <b>AOLserver Tcl API Search</b>
-				    <input type="text" size="6" name="tcl_proc" />
-				    <input type="submit" value="Go" /><br />
-				    (enter <em>exact</em> procedure name)<br />
-				    <a href="http://www.aolserver.com/docs/devel/tcl/api/">Browse AOLserver Tcl API</a>
-				   </td>
-				   </form>
-				  </tr>
-				  <tr bgcolor="#DDDDDD">
-				  <form action="/api-doc/tcl-doc-search" method="get">
-				   <td colspan="2">
-				    <b>Tcl Documentation Search</b>
-				    <input type="text" size="6" name="tcl_proc" />
-				    <input type="submit" value="Go" /><br />
-				    (enter <em>exact</em> procedure name)<br />
-				    <a href="http://tcl.tk/man/tcl8.3/TclCmd/contents.htm">Browse the Tcl documentation</a>
-				   </td>
-				   </form>
-				  </tr>				 
-				   <tr bgcolor="#DDDDDD">
-				   <form action="http://www.postgresql.org/search.cgi" method="get">
-				    <td colspan="2">
-				       <b>PostgreSQL 7.3 Search</b>
-				       <input type="hidden" name="ul" value="http://www.postgresql.org/docs/7.3/static/" />
-				       <input type="text" size="6" name="q" />
-				       <input type="submit" value="Go" /><br />
-				     	<a href="http://www.postgresql.org/docs/7.3/interactive/index.html">Browse the PostgreSQL 7.3 documentation</a>
-				    </td>
-				    </form>
-				   </tr>
-				</table>
-			</td>
-		</tr>
-		</table>
-<li><a href="/acs-lang/admin/">i18n Administration</a>
-<li><a href="http://translate.openacs.org">Translation Server</a>
-<li><a href="/test/admin">Automated Testing</a>
-<li><a href="http://test.openacs.org/">Test Servers</a>
-<li><a href="http://openacs.org/projects/dotlrn/download/">DotLRN-Download</a>
-<li><a href="http://openacs.org/forums/">Forums</a>
-<ul>
-<li><a href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS Forum</a>
-<li><a href="http://openacs.org/forums/forum-view?forum_id=14017">dotLRN Forum</a>
-</ul>
-</ul>
-</ul>
-</td>
-</tr>
+<master>
+<% set user_id [ad_maybe_redirect_for_registration] %>
+<% permission::require_permission -object_id $user_id -privilege admin %>
+<h2>#dotlrn.Administration_Cockpit#</h2>
+<table width="90%" id="context-bar">
+<tr>
+<td width="40%" VALIGN="top">
+<listtemplate name="online_users"></listtemplate>
+#dotlrn.Total_count# @count@
+</td>
+<td width="20%" VALIGN="top">
+<ul>
+<li><h2>@admin_pretty_name@</h2>
+<ul>
+<li><a href="/dotlrn/?">My Space</a>
+<li><a href="/acs-admin/">OpenACS Admin</a>
+<li><a href="/dotlrn/admin">DotLRN Admin</a>
+<ul>
+  <li><a href="/dotlrn/admin/terms">#dotlrn.Terms#</a></li>
+  <li><a href="/dotlrn/admin/departments">#dotlrn.departments_pretty_plural#</a></li>
+  <li><a href="/dotlrn/admin/classes">#dotlrn.classes_pretty_plural#</a></li>
+  <li><a href="/dotlrn/admin/term?term_id=-1">#dotlrn.class_instances_pretty_plural#</a></li>
+  <li><a href="/dotlrn/admin/clubs">#dotlrn.clubs_pretty_plural#</a></li>
+  <li><a href="/dotlrn/admin/portal-templates">#dotlrn.portal_templates#</a></li>
+  <li><a href="/dotlrn/admin/archived-communities">#dotlrn.Archive#</a></li>
+  <li><a href="/dotlrn/admin/edit-preapproved-emails">#dotlrn.lt_Pre-approved_Email_Se#</a></li>
+</ul>
+</ul>
+<li><h2>Packages</h2>
+<ul>
+<li><a href="/acs-admin/install">Install Packages</a>
+<li><a href="/admin/applications/">Installed Applications</a>
+<li><a href="/acs-service-contract/">Service Contracts</a>
+</ul>
+<li><h2>Site Structure</h2>
+<ul>
+<li><a href="/admin/site-map/">Site Map</a>
+</ul>
+</ul>
+
+</td>
+<td width="20%" VALIGN="top">
+<ul>
+<li><h2>Documentation</h2>
+<ul>
+<li><a href="/doc/">Open ACS Documentation</a>
+<li><a href="/dotlrn/help">DotLRN Documentation</a>
+<li><a href="http://openacs.org/doc/openacs-HEAD/">CVS Head</a>
+<li><a href="http://openacs.org/packages/">Packages</a>
+</ul>
+<li><h2>User Managment</h2>
+<ul>
+<li><a href="/acs-admin/auth">Authorities</a>
+<li><a href="/acs-admin/users/">ACS Users</a>
+	<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td width="50%">
+			<form method="post" action="/acs-admin/users/one">
+			<input type="text" size="6" name="user_id" value="" />
+			<input type="submit" name="formbutton:ok" value="OK" />
+			</form>
+		</td>
+		<td width="50%">
+			<FORM METHOD="get" ACTION="/acs-admin/users/search">
+    			<input type="hidden" name="target" value="one" />
+    			<input type="hidden" name="only_authorized_p" value="0" />
+    			<input type="text" size="6" name="keyword" />
+                  	<input type="submit" value="Find" />
+  			</FORM>
+		</td>
+	</tr>
+	</table>
+<li><a href="/dotlrn/admin/users">DotLRN Users</a>
+	<table border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td>
+			<form method="post" action="/dotlrn/admin/user">
+			<input type="text" size="6" name="user_id" value="" />
+			<input type="submit" name="formbutton:ok" value="OK" />
+			</form>
+		</td>
+	</tr>
+	</table>
+<li><a href="/members/">Members</a>
+</ul>
+<li><h2>User Monitoring</h2>
+<ul>
+<li><a href="/acs-admin/monitor">Active HTTP-Connections</a> | <a href="/monitor/monitor">Current Requests</a>
+<li><a href="/shared/whos-online">User Online</a>
+</ul>
+<li><h2>System Monitor</h2>
+<ul>
+<li><a href="/procs-chunk.adp">Scheduled Procs</a>
+<li><a href="/acs-admin/cache">Cache Info</a>
+<li><a href="/acs-admin/cache/index">Util Memoize Caches</a>
+<li><a href="/acs-service-contract/">Service Contracts</a>
+<if @monitor_exists_p;literal@ true>
+	<li><a href="@monitor_url@scheduled-procs">Scheduled Procs</a>
+	<li>Watch Errors - Last
+		<table><tr><td>
+		<FORM ACTION=@monitor_url@watchdog/index>    
+		<INPUT NAME=kbytes SIZE=4 value="200"><INPUT TYPE=SUBMIT VALUE="KB">
+		</FORM>
+		</td>
+		<td>
+		<FORM ACTION=@monitor_url@watchdog/index>
+		<INPUT NAME=num_minutes SIZE=4 value=""><INPUT TYPE=SUBMIT VALUE="min">
+		</FORM>
+		</td></tr></table>
+<li><a href="@monitor_url@filters">Filters</a>
+<li><a href="@monitor_url@top/">Set Monitor System</a>
+</if>
+<li><a href="http://uptime.openacs.org/">Uptime Monitor</a>
+</ul>
+</ul>
+</ul>
+</td>
+<td width="20%" VALIGN="top">
+<ul>
+<li><h2>Development</h2>
+<ul>
+<if @ds_exists_p;literal@ true>
+	<li><a href="@ds_url@">Developer Support</a>(<a href="@ds_url@shell">Shell</a>)
+</if>
+<li><a href="http://openacs.org/bugtracker/openacs/">Bug Tracker</a>
+<li><a href="/acs-admin/apm">Package Manager</a>
+<li><a href="/api-doc/">API Browser</a>
+		<table width="100%" border="0" cellspacing="0" cellpadding="0">
+		<tr>
+			<td width="50%">
+				   <table>
+				     <tr bgcolor="#DDDDDD">
+				      <form action="/api-doc/proc-search" method="get">
+				      <td valign="top">
+				       <b>OpenACS Tcl API Search</b>
+				       <input type="text" size="16" name="query_string" value=""/><br />
+				       <input type="submit" value="All" name="search_type" />
+				       <input type="submit" value="Best" name="search_type" />
+				       <p><a href="/api-doc/proc-browse">Browse OpenACS Tcl API</a></p>
+				      </td>
+				      <td>       
+				       <table cellspacing="0" cellpadding="0">
+				         <tr><td align="right">Name contains:</td>
+				           <td><input type="radio" name="name_weight" value="5" checked="checked" /> </td></tr>
+				         <tr><td align="right">Exact name:</td>
+				           <td><input type="radio" name="name_weight" value="exact" /></td></tr>
+				         <tr><td align="right">&nbsp;</td><td>&nbsp;</td></tr>
+				         <tr><td align="right">Parameters:</td>
+				           <td><input type="checkbox" name="param_weight" value="3" checked="checked" /></td></tr>
+				         <tr><td align="right">Documentation:</td>
+				           <td><input type="checkbox" name="doc_weight" value="2" checked="checked" /></td></tr>
+				         <tr><td align="right">Source:</td>
+				           <td><input type="checkbox" name="source_weight" value="1" /></td></tr>
+				       </table>
+				      </td>
+				      </form>
+				     </tr>				
+				  <tr bgcolor="#DDDDDD">
+				   <form action="/api-doc/tcl-proc-view" method="get">
+				   <td colspan="2">
+				    <b>AOLserver Tcl API Search</b>
+				    <input type="text" size="6" name="tcl_proc" />
+				    <input type="submit" value="Go" /><br />
+				    (enter <em>exact</em> procedure name)<br />
+				    <a href="http://www.aolserver.com/docs/devel/tcl/api/">Browse AOLserver Tcl API</a>
+				   </td>
+				   </form>
+				  </tr>
+				  <tr bgcolor="#DDDDDD">
+				  <form action="/api-doc/tcl-doc-search" method="get">
+				   <td colspan="2">
+				    <b>Tcl Documentation Search</b>
+				    <input type="text" size="6" name="tcl_proc" />
+				    <input type="submit" value="Go" /><br />
+				    (enter <em>exact</em> procedure name)<br />
+				    <a href="http://tcl.tk/man/tcl8.3/TclCmd/contents.htm">Browse the Tcl documentation</a>
+				   </td>
+				   </form>
+				  </tr>				 
+				   <tr bgcolor="#DDDDDD">
+				   <form action="http://www.postgresql.org/search.cgi" method="get">
+				    <td colspan="2">
+				       <b>PostgreSQL 7.3 Search</b>
+				       <input type="hidden" name="ul" value="http://www.postgresql.org/docs/7.3/static/" />
+				       <input type="text" size="6" name="q" />
+				       <input type="submit" value="Go" /><br />
+				     	<a href="http://www.postgresql.org/docs/7.3/interactive/index.html">Browse the PostgreSQL 7.3 documentation</a>
+				    </td>
+				    </form>
+				   </tr>
+				</table>
+			</td>
+		</tr>
+		</table>
+<li><a href="/acs-lang/admin/">i18n Administration</a>
+<li><a href="http://translate.openacs.org">Translation Server</a>
+<li><a href="/test/admin">Automated Testing</a>
+<li><a href="http://test.openacs.org/">Test Servers</a>
+<li><a href="http://openacs.org/projects/dotlrn/download/">DotLRN-Download</a>
+<li><a href="http://openacs.org/forums/">Forums</a>
+<ul>
+<li><a href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS Forum</a>
+<li><a href="http://openacs.org/forums/forum-view?forum_id=14017">dotLRN Forum</a>
+</ul>
+</ul>
+</ul>
+</td>
+</tr>
 </table>
\ No newline at end of file
Index: openacs-4/packages/dotlrn-admin/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-admin/www/admin/index.adp	8 Aug 2006 21:26:31 -0000	1.2
+++ openacs-4/packages/dotlrn-admin/www/admin/index.adp	15 Sep 2017 07:38:10 -0000	1.3
@@ -42,7 +42,7 @@
   <li><a href="@parameters_url@">#dotlrn.edit_parameters#</a></li>
   <li><a href="@parameters_d_url@">#dotlrn.edit_community_parameters#</a></li>
   <p>
-  <if @oacs_site_wide_admin_p@ true>
+  <if @oacs_site_wide_admin_p;literal@ true>
     <li><a href="/acs-admin/">OpenACS Site-Wide Administration</a></li>
   </if>
   </p>
Index: openacs-4/packages/dotlrn-admin/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-admin/www/admin/user.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -29,23 +29,23 @@
   <li>
     #dotlrn.Person_name#
     @first_names@ @last_name@
-  <if @oacs_site_wide_admin_p@ true> 
+  <if @oacs_site_wide_admin_p;literal@ true> 
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
   </if>
   </li>
 
   <li>
     #dotlrn.Email#
     <a href="mailto:@email@">@email@</a>
-  <if @oacs_site_wide_admin_p@ true>
+  <if @oacs_site_wide_admin_p;literal@ true>
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
   </if> 
   </li>
 
   <li>
     #dotlrn.Screen_name#
     @screen_name@
-  <if @oacs_site_wide_admin_p@ true>
+  <if @oacs_site_wide_admin_p;literal@ true>
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
   </if>
   </li>
@@ -72,7 +72,7 @@
   </li>
 </else>
 
-<if @portrait_p@ eq 1>
+<if @portrait_p;literal@ true>
   <li>
     #dotlrn.Portrait# <a href="/shared/portrait?user_id=@user_id@">@portrait_title@</a>
   </li>
@@ -81,7 +81,7 @@
   <li>
     #dotlrn.Member_state#
     @member_state@
-  <if @oacs_site_wide_admin_p@ true> 
+  <if @oacs_site_wide_admin_p;literal@ true> 
     @change_state_links;noquote@
   </if>
   </li>
@@ -90,7 +90,7 @@
 
 <h3>#dotlrn.dotLRN_Information#</h3>
 
-<if @dotlrn_user_p@>
+<if @dotlrn_user_p;literal@ true>
 
 <ul>
 
@@ -101,13 +101,13 @@
 
   <li>
     #dotlrn.Access_level#
-    <if @can_browse_p@>#dotlrn.Full# [ <small><a href="browse-toggle?user_id=@user_id@&can_browse_p=0&referer=@return_url@">#dotlrn.Limited#</a> </small>]</if><else>#dotlrn.Limited# [ <small><a href="browse-toggle?user_id=@user_id@&can_brow
+    <if @can_browse_p;literal@ true>#dotlrn.Full# [ <small><a href="browse-toggle?user_id=@user_id@&can_browse_p=0&referer=@return_url@">#dotlrn.Limited#</a> </small>]</if><else>#dotlrn.Limited# [ <small><a href="browse-toggle?user_id=@user_id@&can_brow
 se_p=1&referer=@return_url@">#dotlrn.Full#</a> </small>]</else>
   </li>
 
   <li>
     #dotlrn.Guest#
-    <if @guest_p@ eq t>#dotlrn.Yes# [ <small><a href="guest-toggle?user_id=@user_id@&guest_p=f&referer=@return_url@">#dotlrn.No#</a> </small>]</if><else>#dotlrn.No# [ <small><a href="guest-toggle?user_id=@user_id@&guest_p=t&referer=@return_url@">#dotlrn.Yes#</a> </small>]</else>
+    <if @guest_p;literal@ true>#dotlrn.Yes# [ <small><a href="guest-toggle?user_id=@user_id@&guest_p=f&referer=@return_url@">#dotlrn.No#</a> </small>]</if><else>#dotlrn.No# [ <small><a href="guest-toggle?user_id=@user_id@&guest_p=t&referer=@return_url@">#dotlrn.Yes#</a> </small>]</else>
   </li>
 
   <li>
@@ -191,11 +191,11 @@
 
 <ul>
   <li><a href="password-update?@export_edit_vars@">#dotlrn.lt_Update_this_users_pas#</a></li>
-  <if @portrait_p@>
+  <if @portrait_p;literal@ true>
     <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
   </if>
 
- <if @oacs_site_wide_admin_p@ true>
+ <if @oacs_site_wide_admin_p;literal@ true>
   <li><a href="/acs-admin/users/become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
  </if> 
 </ul>
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp	8 Aug 2006 21:26:31 -0000	1.2
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp	15 Sep 2017 07:38:10 -0000	1.3
@@ -44,7 +44,7 @@
     <else>
     <th align="left">#dotlrn.Access#</th>
     <th align="left">#dotlrn.Guest#</th>
-    <if @oacs_site_wide_admin_p@ true>
+    <if @oacs_site_wide_admin_p;literal@ true>
     <th align="left">#dotlrn.Site-wide_Admin#</th>
     </if>
     </else>
@@ -75,7 +75,7 @@
 <if @type@ eq "pending">
     <td align="left">
 
-    <if @oacs_site_wide_admin_p@ true>
+    <if @oacs_site_wide_admin_p;literal@ true>
     <% # We had to escape to Tcl to get the desired behavior. AG %>
     <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
     <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
@@ -88,14 +88,14 @@
      #dotlrn.NA#
      </if>
      <else>
-     <if @users.guest_p@ eq t>#dotlrn.Yes#</if><else>#dotlrn.No#</else>
+     <if @users.guest_p;literal@ true>#dotlrn.Yes#</if><else>#dotlrn.No#</else>
      </else>
     </td>
 
-<if @oacs_site_wide_admin_p@ true>
+<if @oacs_site_wide_admin_p;literal@ true>
  <td align="center">
   <if @user_id@ ne @users.user_id@>
-    <if @users.site_wide_admin_p@ true>
+    <if @users.site_wide_admin_p;literal@ true>
       <b>#dotlrn.Yes#</b> | <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=@referer@" title="#dotlrn.Revoke_site_wide_admin#">#dotlrn.No#</a>
     </if>
     <else>
Index: openacs-4/packages/dotlrn-bootstrap3-theme/lib/themes/bootstrap3-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/lib/themes/bootstrap3-theme.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-bootstrap3-theme/lib/themes/bootstrap3-theme.adp	20 Feb 2017 09:49:14 -0000	1.1
+++ openacs-4/packages/dotlrn-bootstrap3-theme/lib/themes/bootstrap3-theme.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -1,9 +1,9 @@
 <div class="panel panel-default portlet">
     <div class="panel-heading">
     
-        <if @shadeable_p@ eq "t">     
+        <if @shadeable_p;literal@ true>     
             <a href="@configure_element_url@">
-              <if @shaded_p@ eq "t">
+              <if @shaded_p;literal@ true>
                 <span style="float:right;color:#666;"><i class="glyphicon glyphicon-plus"></i> #dotlrn-bootstrap3-theme.maximize_portlet#</span>
               </if>
               <else>
Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp	2 Nov 2005 20:30:21 -0000	1.10
+++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp	15 Sep 2017 07:38:10 -0000	1.11
@@ -8,7 +8,7 @@
 
 <table>
 <if @index@ eq "yes">
-   <if @admin_p@ eq 1>
+   <if @admin_p;literal@ true>
    <div align="left">
         <a href="dt-admin/course-info?course_id=@course_id@&course_name=@name@&course_key=@course_key@&index=yes" title="#dotlrn-catalog.admin_this#"><img border=0 src=images/admin.gif></a> 
    </div>
@@ -66,7 +66,7 @@
         <td><b>#dotlrn-catalog.asm#:</b></td><td>@asm@</td>
     </tr>
 </if>
-<if @category_p@ eq "1">
+<if @category_p;literal@ true>
     <if @index@ not eq "yes">
         <tr><td></td>
 	   <td>
@@ -109,7 +109,7 @@
   <if @obj_n@ not eq "0">
   </if>
   <else>
-     <if @admin_p@ eq 1>
+     <if @admin_p;literal@ true>
         <if @index@ not eq "yes">
           <h3>#dotlrn-catalog.dotlrn_assoc#:</h3>
           &nbsp;&nbsp;&nbsp;#dotlrn-catalog.no# 
Index: openacs-4/packages/dotlrn-catalog/lib/dotlrn-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/dotlrn-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-catalog/lib/dotlrn-chunk.adp	15 Feb 2005 16:54:21 -0000	1.3
+++ openacs-4/packages/dotlrn-catalog/lib/dotlrn-chunk.adp	15 Sep 2017 07:38:10 -0000	1.4
@@ -20,7 +20,7 @@
 	       <if @users.rel_type@ eq "dotlrn_instructor_rel">
 	        <li>
 	          <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
-	 	  <if @email_p@ eq 1>
+	 	  <if @email_p;literal@ true>
 	            (<%= [email_image::get_user_email -user_id $users(user_id)] %>)
 		  </if>
                   <else>
@@ -40,7 +40,7 @@
 	      <if @users.rel_type@ eq "dotlrn_ta_rel">
 		<li>
 	        <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
- 	  	<if @email_p@ eq 1>
+ 	  	<if @email_p;literal@ true>
 	          (<%= [email_image::get_user_email -user_id $users(user_id)] %>)
 		</if>
                 <else>
@@ -61,7 +61,7 @@
 	       <if @users.rel_type@ eq "dotlrn_ca_rel">
 	         <li>
 	         <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
-	         <if @email_p@ eq 1>
+	         <if @email_p;literal@ true>
 	           (<%= [email_image::get_user_email -user_id $users(user_id)] %>) 
 		 </if>
                  <else>
Index: openacs-4/packages/dotlrn-catalog/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-catalog/www/index.adp	23 Feb 2005 20:35:47 -0000	1.5
+++ openacs-4/packages/dotlrn-catalog/www/index.adp	15 Sep 2017 07:38:10 -0000	1.6
@@ -10,7 +10,7 @@
 }
 </STYLE>
 
-<if @create_p@ eq 1>
+<if @create_p;literal@ true>
     <div align="right"><a href="dt-admin/course-list"><img border=0 src=images/admin.gif></a></div>
 </if>
 
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.adp	3 Mar 2005 22:32:16 -0000	1.7
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-list.adp	15 Sep 2017 07:38:10 -0000	1.8
@@ -28,7 +28,7 @@
 </center>
 <br>
 <a class=button href="course-add-edit?return_url=@return_url@">#dotlrn-catalog.new_course#</a>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
 
 
 
Index: openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp	12 May 2006 19:16:38 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp	15 Sep 2017 07:38:10 -0000	1.8
@@ -1,7 +1,7 @@
   <if @method@ eq "invoice">
     <blockquote>
 
-      This order was <if @scholarship_p@><b>partially</b> </if>paid by <b>invoice</b>.
+      This order was <if @scholarship_p;literal@ true><b>partially</b> </if>paid by <b>invoice</b>.
       
       <ul>
 	<b>Payments</b>
@@ -26,7 +26,7 @@
   </if>
   
   <if @method@ eq "scholarship">
-    <if @scholarship_p@>
+    <if @scholarship_p;literal@ true>
     <if @gc_amount@ eq @total_price@>
       <blockquote>This order was <b>fully</b> paid by <b>scholarship</b>.
     </if>
@@ -44,7 +44,7 @@
   </if>
 
   <if @method@ eq "cc">
-    <if @scholarship_p@>
+    <if @scholarship_p;literal@ true>
       <blockquote>This order was <b>partially</b> paid by <b>credit card</b>.
     </if>
     <else>
@@ -86,7 +86,7 @@
   </if>
   <else>
     <if @method@ in "cash" "lockbox" "check">
-      <blockquote>This order was <b><if @scholarship_p@>partially</if><else>fully</else></b> paid by <b>check</b>.</blockquote>
+      <blockquote>This order was <b><if @scholarship_p;literal@ true>partially</if><else>fully</else></b> paid by <b>check</b>.</blockquote>
     </if>
     <if @method@ eq "cc">
       <blockquote>No credit card transactions</blockquote>
Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.adp	6 Apr 2007 14:00:45 -0000	1.9
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.adp	15 Sep 2017 07:38:10 -0000	1.10
@@ -8,12 +8,12 @@
 
 <table cellpadding="3" cellspacing="3" border="0">
   <tr>
-<if @show_filters_p@>
+<if @show_filters_p;literal@ true>
     <td class="list-filter-pane-big" valign="top" width="20%">
       <listfilters name="course_list" style="course-filters"></listfilters> 
     </td> </if>
     <td valign="top">
-<if @show_filters_p@>	<listfilters name="course_list" style="listed-filters"></listfilters></if>
+<if @show_filters_p;literal@ true>	<listfilters name="course_list" style="listed-filters"></listfilters></if>
 	<br />
 	<listtemplate name="course_list" style="@list_style@"></listtemplate>
     </td>
Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl,v
diff -u -r1.87 -r1.88
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl	31 Jan 2007 18:02:39 -0000	1.87
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl	15 Sep 2017 07:38:10 -0000	1.88
@@ -327,11 +327,11 @@
 	    display_template {
 		<if @course_list.section_id@ not nil>
 		<b>@course_list.section_name@</b>
-		<if @admin_p@ eq 1>
+		<if @admin_p;literal@ true>
 		<a href="@course_list.section_edit_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.edit]</a> 
 		</if>
-		<if @admin_p@>
-		<if @course_list.toggle_display_url@ not nil><if @course_list.display_section_p@ eq "f">[_ dotlrn-ecommerce.This_section_is_hidden] <a href="@course_list.toggle_display_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.Show_this_section]</a></if><else><a href="@course_list.toggle_display_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.Hide_this_section]</else></a><br /></if>
+		<if @admin_p;literal@ true>
+		<if @course_list.toggle_display_url@ not nil><if @course_list.display_section_p;literal@ false>[_ dotlrn-ecommerce.This_section_is_hidden] <a href="@course_list.toggle_display_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.Show_this_section]</a></if><else><a href="@course_list.toggle_display_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.Hide_this_section]</else></a><br /></if>
 		</if>
 		<if @course_list.show_description_p@ eq "t" and @course_list.description@ not nil>
 		<br />
@@ -341,8 +341,8 @@
 		<if @course_list.sessions@ not nil and @course_list.show_sessions_p@ eq "t"><br />@course_list.sessions;noquote@</if>
 		<if @course_list.section_zones@ not nil><br />@course_list.section_zones;noquote@</if>
 		<if @course_list.instructor_names@ not nil><br />@course_list.instructor_names;noquote@</if>
-		<if @course_list.prices@ not nil and @course_list.show_price_p@ true><br /><if @allow_free_registration_p@ and @course_list.price@ lt 0.01>[_ dotlrn-ecommerce.lt_There_is_no_fee_for_t]</if><else>@course_list.prices;noquote@</else></if>
-		<if @course_list.show_participants_p@ eq "t">
+		<if @course_list.prices@ not nil and @course_list.show_price_p@ true><br /><if @allow_free_registration_p;literal@ true and @course_list.price@ lt 0.01>[_ dotlrn-ecommerce.lt_There_is_no_fee_for_t]</if><else>@course_list.prices;noquote@</else></if>
+		<if @course_list.show_participants_p;literal@ true>
 		<br />@course_list.attendees;noquote@ [_ dotlrn-ecommerce.participant]<if @course_list.attendees@ gt 1>s</if>
 		<if @course_list.available_slots@ not nil and @course_list.available_slots@ gt 0>,<br />@course_list.available_slots;noquote@ [_ dotlrn-ecommerce.available]</if>
 		<if @course_list.available_slots@ le 0>
@@ -377,8 +377,8 @@
 		<if @course_list.section_id@ not nil>
 		<div style="float: left">
 		<if @course_list.prices@ ne "">
-		<if @allow_other_registration_p@>
-		<if @offer_code_p@ and @course_list.has_discount_p@ and @course_list.available_slots@ gt 0>
+		<if @allow_other_registration_p;literal@ true>
+		<if @offer_code_p;literal@ true and @course_list.has_discount_p@ and @course_list.available_slots@ gt 0>
 
 		<if @course_list.assessment_id@ eq "" or @course_list.assessment_id@ eq -1>
 
@@ -401,7 +401,7 @@
 		<else>
                 <if @course_list.member_p@ ne 1 and @course_list.pending_p@ ne 1 and @course_list.waiting_p@ ne 1 and @course_list.waiting_p@ ne 2 and @course_list.approved_p@ ne 1>
 
-		<if @offer_code_p@ and @course_list.has_discount_p@ and @course_list.available_slots@ gt 0>
+		<if @offer_code_p;literal@ true and @course_list.has_discount_p@ and @course_list.available_slots@ gt 0>
 
 		<if @course_list.assessment_id@ eq "" or @course_list.assessment_id@ eq -1>
 
@@ -428,10 +428,10 @@
 		<a href="@course_list.shopping_cart_add_url;noquote@" class="button">[_ dotlrn-ecommerce.register]</a>
 		</if>
 		
-		<if @course_list.pending_p@ eq 1>
+		<if @course_list.pending_p;literal@ true>
 		   <font color="red">[_ dotlrn-ecommerce.application_pending]</font>
 		</if>
-		<if @course_list.waiting_p@ eq 1>
+		<if @course_list.waiting_p;literal@ true>
 		   <font color="red">[_ dotlrn-ecommerce.lt_You_are_number_course]</font>
 		</if>
 		<if @course_list.asm_url@ not nil>
@@ -445,7 +445,7 @@
 		</if>
 		</div>
 
-		<if @course_list.approved_p@ eq 1>
+		<if @course_list.approved_p;literal@ true>
 		<div align="center" style="float: right">
 		
   		   <if @course_list.member_state@ eq "request approved">
@@ -455,7 +455,7 @@
 		   [_ dotlrn-ecommerce.lt_A_place_is_now_availa]<p />
 		   </else>
 
-		<if @offer_code_p@ and @course_list.has_discount_p@>
+		<if @offer_code_p;literal@ true and @course_list.has_discount_p;literal@ true>
 		<p />
 		<form action="ecommerce/offer-code-set">
 		<input type="hidden" name="product_id" value="@course_list.product_id@" />
@@ -485,7 +485,7 @@
 	label "Group by"
 	type multivar
 	values {
-	    {{ <b><a href="@course_list.course_key@">@course_list.course_name@</a></b> <if @admin_p@ eq 1><a href="@course_list.course_edit_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.edit]</a> <a href="@course_list.section_add_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.add_section]</a></if>
+	    {{ <b><a href="@course_list.course_key@">@course_list.course_name@</a></b> <if @admin_p;literal@ true><a href="@course_list.course_edit_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.edit]</a> <a href="@course_list.section_add_url;noquote@" class="admin-button">[_ dotlrn-ecommerce.add_section]</a></if>
 		<br />@course_list.course_grades@
 		<p>
 		@course_list.course_info;noquote@
Index: openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp	26 Aug 2005 12:35:17 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp	15 Sep 2017 07:38:10 -0000	1.8
@@ -21,26 +21,26 @@
 
           <tr>
             <multiple name="items">
-              <if @items.beginning_of_week_p@ true>
+              <if @items.beginning_of_week_p;literal@ true>
                 <tr>
               </if>
 
-              <if @items.outside_month_p@ true>
+              <if @items.outside_month_p;literal@ true>
                 <td class="cal-month-day-inactive">&nbsp;</td>
               </if>     
               <else>
-                <if @items.today_p@ true>
-                  <td class="cal-month-today" <if @add_p@> onclick="javascript:location.href='@items.add_url@';"</if>>
+                <if @items.today_p;literal@ true>
+                  <td class="cal-month-today" <if @add_p;literal@ true> onclick="javascript:location.href='@items.add_url@';"</if>>
                 </if>
                 <else>
-                  <td class="cal-month-day" <if @add_p@>onclick="javascript:location.href='@items.add_url@';"</if>>
+                  <td class="cal-month-day" <if @add_p;literal@ true>onclick="javascript:location.href='@items.add_url@';"</if>>
                 </else>
                   <if @items.day_url@ not nil><a href="@items.day_url@">@items.day_number@</a></if><else>@items.day_number@</else>
 	
                   <group column="day_number">
                     <if @items.event_name@ true>
                       <div class="cal-month-event">
-                        <if @items.time_p@ true>
+                        <if @items.time_p;literal@ true>
 				<if @items.fontcolor@ not nil><font color="@items.fontcolor@"><b>@items.ansi_start_time@</b></font></if><else>@items.ansi_start_time@</else>				
 			</if>
                         <a href=@items.event_url@>** @items.calendar_name@ **</a>
@@ -50,7 +50,7 @@
                   </group>
                 </td>
               </else>
-              <if @items.end_of_week_p@ true>
+              <if @items.end_of_week_p;literal@ true>
                 </tr>
               </if>
             </multiple>
Index: openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.adp	9 Jun 2006 19:29:22 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -44,7 +44,7 @@
 	  </td>
 	</tr>
 
-	<if @internal_account_p@>
+	<if @internal_account_p;literal@ true>
 	  <tr class="form-element">
 	    
 	    <td class="form-label">
@@ -83,7 +83,7 @@
     <listtemplate name="applications_registered"></listtemplate>
   </else>
 
-  <if @registered_exists_p@ eq 1>
+  <if @registered_exists_p;literal@ true>
     <p />
     <h3>#dotlrn-ecommerce.lt_The_following_users_p#</h3>
     <p />
Index: openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.tcl	9 Jun 2006 19:29:22 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/application-bulk-payments.tcl	15 Sep 2017 07:38:10 -0000	1.2
@@ -202,7 +202,7 @@
 	    label "[_ dotlrn-ecommerce.Regular_Price]"
 	    html { align center }
 	    display_template {
-		<if @applications.free_p@>
+		<if @applications.free_p;literal@ true>
 		Free
 		</if>
 		<else>
Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp	23 Jan 2006 08:04:42 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp	15 Sep 2017 07:38:10 -0000	1.8
@@ -23,7 +23,7 @@
   <a href="home" class="button">#dotlrn-ecommerce.Go_to_My_Account#</a> &nbsp;&nbsp;&nbsp;
 -->
 
-<if @admin_p@>
+<if @admin_p;literal@ true>
     <ul>
       <li> <a
 	  href="admin/process-purchase-course?user_id=@patron_id@">#dotlrn-ecommerce.lt_Purchase_another_Cour#</a> #dotlrn-ecommerce.lt_for_the_current_purch#</li>
Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v
diff -u -r1.60 -r1.61
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	19 Jul 2007 01:34:46 -0000	1.60
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	15 Sep 2017 07:38:10 -0000	1.61
@@ -185,7 +185,7 @@
 set elements [list section_name [list \
 	    label "[_ dotlrn-ecommerce.Section]" \
 	    display_template {
-		<if @admin_p@>
+		<if @admin_p;literal@ true>
 		<a href="@applications.section_edit_url;noquote@">@applications.section_name@ (@applications.course_name@)</a>
 		</if>
 		<else>
@@ -213,7 +213,7 @@
 	person_name {
 	    label "[_ dotlrn-ecommerce.Participant]"
 	    display_template {
-		<if @admin_p@>
+		<if @admin_p;literal@ true>
 		<a href="@applications.person_url;noquote@">@applications.person_name@</a>
 		</if>
 		<else>
@@ -296,7 +296,7 @@
 		</if>
 		<elseif @applications.member_state@ ne "approved">
 		<a href="@applications.reject_url;noquote@" class="button">[_ dotlrn-ecommerce.Cancel]</a>
-		<if @admin_p@>
+		<if @admin_p;literal@ true>
 		<a href="@applications.register_url;noquote@" class="button">[_ dotlrn-ecommerce.Register]</a>
 		</if>
 		</elseif>
Index: openacs-4/packages/dotlrn-ecommerce/www/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/contextbar.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/contextbar.adp	4 Jun 2005 10:05:18 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/contextbar.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -1 +1 @@
-<p>@context_bar;noquote@ <if @ec_admin_p@>[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name;noquote@">Administer</a>&nbsp;] </if></p>
+<p>@context_bar;noquote@ <if @ec_admin_p;literal@ true>[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name;noquote@">Administer</a>&nbsp;] </if></p>
Index: openacs-4/packages/dotlrn-ecommerce/www/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-ecommerce/www/home.adp	12 Apr 2006 19:11:14 -0000	1.12
+++ openacs-4/packages/dotlrn-ecommerce/www/home.adp	15 Sep 2017 07:38:10 -0000	1.13
@@ -67,7 +67,7 @@
 	  <li><a href="@whos_online_url@">#acs-subsite.Whos_Online_link_label#</a></li>
 	</ul>
 
-	<if @invisible_p@ true>
+	<if @invisible_p;literal@ true>
 	  #acs-subsite.Currently_invisible_msg#
 	  <ul class="action-links">
 	    <li><a href="@make_visible_url@">#acs-subsite.Make_yourself_visible_label#</a></li>
@@ -94,7 +94,7 @@
 	    <li>#dotlrn-ecommerce.You_have_no_orders#</li>
 	  </else>
 	</ul>
-	<if @applications_p@>
+	<if @applications_p;literal@ true>
 	  <h2>#dotlrn-ecommerce.Your_Applications#</h2>
 	</if>
 	<else>
@@ -105,7 +105,7 @@
 
 	    <multiple name="sessions">
 	      
-	      <if @admin_p@ eq 1>
+	      <if @admin_p;literal@ true>
 		<li> <a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> <if @user_id@ ne @sessions.participant_id@>(@sessions.name@)</if>
 	      </if>
 	      <else>
Index: openacs-4/packages/dotlrn-ecommerce/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/index.adp	6 Sep 2006 19:26:57 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/index.adp	15 Sep 2017 07:38:10 -0000	1.5
@@ -10,7 +10,7 @@
 }
 </STYLE>
 
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
     <div align="right"><a href="admin"><img border=0 src=/dotlrn-catalog/images/admin.gif></a></div>
 </if>
 <if @view@ eq "calendar"><include src="/packages/dotlrn-ecommerce/lib/cal-view"></if><else>
Index: openacs-4/packages/dotlrn-ecommerce/www/one-course.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/one-course.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-ecommerce/www/one-course.adp	1 Feb 2007 07:55:38 -0000	1.5
+++ openacs-4/packages/dotlrn-ecommerce/www/one-course.adp	15 Sep 2017 07:38:10 -0000	1.6
@@ -14,7 +14,7 @@
 </multiple>
 </if>
 </multiple>
-<if @admin_p@>
+<if @admin_p;literal@ true>
 <p>Admin: <a href="@course_edit_url@">#dotlrn-ecommerce.edit#</a></p>
 </if>
 
@@ -24,17 +24,17 @@
 <multiple name="sections">
 <div style="clear:both; padding-bottom:20px; padding-right:10px; padding-left:10px; padding-top:0px; margin:5px; border:1px solid; width:300px;">
 <h3>@sections.section_name@</h3>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
 <p>Admin: <a href="@sections.section_edit_url;noquote@" class="admin-button">#dotlrn-ecommerce.edit#</a>
-	<if @sections.toggle_display_url@ not nil><if @sections.display_section_p@ eq "f">#dotlrn-ecommerce.This_section_is_hidden# <a href="@sections.toggle_display_url;noquote@" class="admin-button">#dotlrn-ecommerce.Show_this_section#</a></if><else><a href="@sections.toggle_display_url;noquote@" class="admin-button">#dotlrn-ecommerce.Hide_this_section#</else></a></if></p>	
+	<if @sections.toggle_display_url@ not nil><if @sections.display_section_p;literal@ false>#dotlrn-ecommerce.This_section_is_hidden# <a href="@sections.toggle_display_url;noquote@" class="admin-button">#dotlrn-ecommerce.Show_this_section#</a></if><else><a href="@sections.toggle_display_url;noquote@" class="admin-button">#dotlrn-ecommerce.Hide_this_section#</else></a></if></p>	
 
 </if>
 <p>@sections.description;noquote@</p>
 		<if @sections.sessions@ not nil and @sections.show_sessions_p@ eq "t"><br />@sections.sessions;noquote@</if>
 		<if @sections.section_zones@ not nil><br />@sections.section_zones;noquote@</if>
 		<if @sections.instructor_names@ not nil><br />@sections.instructor_names;noquote@</if>
-		<if @sections.prices@ not nil and @sections.show_price_p@ true><br /><if @allow_free_registration_p@ and @sections.price@ lt 0.01>#dotlrn-ecommerce.lt_There_is_no_fee_for_t#</if><else>@sections.prices;noquote@</else></if>
-		<if @sections.show_participants_p@ eq "t">
+		<if @sections.prices@ not nil and @sections.show_price_p@ true><br /><if @allow_free_registration_p;literal@ true and @sections.price@ lt 0.01>#dotlrn-ecommerce.lt_There_is_no_fee_for_t#</if><else>@sections.prices;noquote@</else></if>
+		<if @sections.show_participants_p;literal@ true>
 		<br />@sections.attendees;noquote@ #dotlrn-ecommerce.participant#<if @sections.attendees@ gt 1>s</if>
 		<if @sections.available_slots@ not nil and @sections.available_slots@ gt 0>,<br />@sections.available_slots;noquote@ #dotlrn-ecommerce.available#</if>
 		<if @sections.available_slots@ le 0>
@@ -53,8 +53,8 @@
 		<p>
 		<div style="float: left">
 		<if @sections.prices@ ne "">
-		<if @allow_other_registration_p@>
-		<if @offer_code_p@ and @sections.has_discount_p@ and @sections.available_slots@ gt 0>
+		<if @allow_other_registration_p;literal@ true>
+		<if @offer_code_p;literal@ true and @sections.has_discount_p@ and @sections.available_slots@ gt 0>
 
 		<if @sections.assessment_id@ eq "" or @sections.assessment_id@ eq -1>
 
@@ -76,7 +76,7 @@
 		</if>
 		<else>
                 <if @sections.member_p@ ne 1 and @sections.pending_p@ ne 1 and @sections.waiting_p@ ne 1 and @sections.waiting_p@ ne 2 and @sections.approved_p@ ne 1>
-		<if @offer_code_p@ and @sections.has_discount_p@ and @sections.available_slots@ gt 0>
+		<if @offer_code_p;literal@ true and @sections.has_discount_p@ and @sections.available_slots@ gt 0>
 
 		<if @sections.assessment_id@ eq "" or @sections.assessment_id@ eq -1>
 
@@ -102,10 +102,10 @@
 		<a href="@sections.shopping_cart_add_url;noquote@" class="button">[_ dotlrn-ecommerce.register]</a>
 		</if>
 		
-		<if @sections.pending_p@ eq 1>
+		<if @sections.pending_p;literal@ true>
 		   <font color="red">[_ dotlrn-ecommerce.application_pending]</font>
 		</if>
-		<if @sections.waiting_p@ eq 1>
+		<if @sections.waiting_p;literal@ true>
 		   <font color="red">[_ dotlrn-ecommerce.lt_You_are_number_course]</font>
 		</if>
 		<if @sections.asm_url@ not nil>
@@ -119,7 +119,7 @@
 		</if>
 		</div>
 
-		<if @sections.approved_p@ eq 1>
+		<if @sections.approved_p;literal@ true>
 		<div align="center" style="float: right">
 		
   		   <if @sections.member_state@ eq "request approved">
@@ -129,7 +129,7 @@
 		   [_ dotlrn-ecommerce.lt_A_place_is_now_availa]<p />
 		   </else>
 
-		<if @offer_code_p@ and @sections.has_discount_p@>
+		<if @offer_code_p;literal@ true and @sections.has_discount_p;literal@ true>
 		<p />
 		<form action="ecommerce/offer-code-set">
 		<input type="hidden" name="product_id" value="@sections.product_id@" />
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.adp	6 Sep 2006 19:38:28 -0000	1.9
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.adp	15 Sep 2017 07:38:10 -0000	1.10
@@ -4,7 +4,7 @@
 
 <table cellpadding=0 cellspacing=0>
 <if @index@ eq "yes">
-   <if @admin_p@ eq 1>
+   <if @admin_p;literal@ true>
    <div align="left">
         <a href="dt-admin/course-info?course_id=@course_id@&course_name=@name@&course_key=@course_key@&index=yes" title="#dotlrn-catalog.admin_this#"><img border=0 src=images/admin.gif></a> 
    </div>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	19 Apr 2007 16:01:38 -0000	1.27
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	15 Sep 2017 07:38:10 -0000	1.28
@@ -36,8 +36,8 @@
 <h2>#dotlrn-ecommerce.Administrative_Setup#</h2>
 
 <ul>
-<if @scholarship_installed_p@ eq "1"><li><a href=../Administration/sch/>#dotlrn-ecommerce.Scholarship_Funds#</a></if>
-<if @expenses_installed_p@ eq "1"><li><a href="../Administration/expenses/admin/">#dotlrn-ecommerce.Expenses#</a></if>
+<if @scholarship_installed_p;literal@ true><li><a href=../Administration/sch/>#dotlrn-ecommerce.Scholarship_Funds#</a></if>
+<if @expenses_installed_p;literal@ true><li><a href="../Administration/expenses/admin/">#dotlrn-ecommerce.Expenses#</a></if>
 <li>#dotlrn-ecommerce.Instructors# - [ <a href=@instructor_community_url@>#dotlrn.Community#</a> | <a href=@instructor_community_url@/members>#dotlrn-ecommerce.List#</a> ]
 <li>#dotlrn-ecommerce.Assistant_Instuctors# - [ <a href=@assistant_community_url@>#dotlrn.Community#</a> | <a href=@assistant_community_url@/members>#dotlrn-ecommerce.List#</a> ]
 <li><a href="../Administration/categories/cadmin/object-map?object_id=@cc_package_id@">#dotlrn-ecommerce.lt_Manage_Category_Trees#</a>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp	6 Apr 2007 15:19:55 -0000	1.19
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp	15 Sep 2017 07:38:10 -0000	1.20
@@ -42,20 +42,20 @@
 <a href="@assessment_results_url;noquote@" class="button">Results Summary</a>
 </if>
 
-<if @show_public_pages_p@>
+<if @show_public_pages_p;literal@ true>
 <br /><br />
 <h2>#dotlrn-ecommerce.Public_Pages#</h2>
 <include src="/packages/file-storage/lib/folder-admin" folder_id="@section_folder_id@" base_url="@public_pages_url@">
 </if>
 
-<if @attendance_show_p@>
+<if @attendance_show_p;literal@ true>
 <br />
 <h2>#dotlrn-ecommerce.lt_Sessions_and_Attendan#</h2>
 <include src=/packages/attendance/lib/cp-attendance community_id=@community_id@ package_id=@community_package_id@>
 </if>
 
 
-<if @expensetracking_show_p@>
+<if @expensetracking_show_p;literal@ true>
 <h2>#dotlrn-ecommerce.Expense_Tracking#</h2>
 
 <include src=/packages/expense-tracking/lib/cp-expense-tracking community_id=@community_id@ package_id=@community_package_id@>
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp	6 Sep 2005 08:53:35 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp	15 Sep 2017 07:38:10 -0000	1.8
@@ -2,7 +2,7 @@
 
 <!-- following from billing.adp -->
 
-  <if @invalid_cc_p@>
+  <if @invalid_cc_p;literal@ true>
     <property name="title">#dotlrn-ecommerce.lt_Completing_Your_Order_1#</property>
 
     <h2>#dotlrn-ecommerce.lt_Sorry_There_seems_to_#</h2>
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-progress.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-progress.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-progress.adp	23 Jun 2005 12:28:21 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-progress.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -5,7 +5,7 @@
       <td align="center"<if @step@ ge 1>class="altback"</if>><if @step@ ge 1><strong></if><code>---></code><if @step@ ge 1></strong></if></td>
       <td align="center"<if @step@ ge 2>class="altback"</if>><if @step@ ge 2><strong></if>Verify order<if @step@ ge 2></strong></if></td>
       <td align="center"<if @step@ ge 2>class="altback"</if>><if @step@ ge 2><strong></if><code>---></code><if @step@ ge 2></strong></if></td>
-      <if @express_shipping_avail_p@>
+      <if @express_shipping_avail_p;literal@ true>
 	<td align="center"<if @step@ ge 3>class="altback"</if>><if @step@ ge 3><strong></if>Shipping method<if @step@ ge 3></strong></if></td>
         <td align="center"<if @step@ ge 3>class="altback"</if>><if @step@ ge 3><strong></if><code>---></code><if @step@ ge 3></strong></if></td>
       </if>
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp	23 Jan 2006 08:04:41 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp	15 Sep 2017 07:38:10 -0000	1.7
@@ -23,7 +23,7 @@
     <if @relations:rowcount@ gt 0>
       <p />
       <h3>
-	<if @admin_p@>
+	<if @admin_p;literal@ true>
 	  #dotlrn-ecommerce.lt_Users_related_to_the_#
 	</if>
 	<else>
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.adp	25 Jul 2005 18:19:21 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.adp	15 Sep 2017 07:38:10 -0000	1.5
@@ -12,7 +12,7 @@
   </div>
   
   <p />
-  <if @admin_p@ eq 1>
+  <if @admin_p;literal@ true>
   <a href="@shopping_cart_add_url;noquote@" class="button">#dotlrn-ecommerce.Continue#</a> &nbsp;&nbsp;&nbsp;
   </if>
   <a href="@request_url;noquote@" class="button">#dotlrn-ecommerce.lt_Hold_slot_and_wait_fo#</a> &nbsp;&nbsp;&nbsp;
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart.adp	27 Apr 2006 21:58:15 -0000	1.12
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart.adp	15 Sep 2017 07:38:10 -0000	1.13
@@ -7,13 +7,13 @@
   <property name="current_location">shopping-cart</property>
 
   <if @user_id@ ne 0>
-    <if @admin_p@>
+    <if @admin_p;literal@ true>
 	You are processing an order for @first_names@ @last_name@. (To change the purchaser,  
     </if>
     <else>	
     #dotlrn-ecommerce.lt_for_first_names_last_#,
     </else>
-    <a href="<if @admin_p@>../admin/process-purchase-all</if><else>../</else>">#dotlrn-ecommerce.click_here#</a>)
+    <a href="<if @admin_p;literal@ true>../admin/process-purchase-all</if><else>../</else>">#dotlrn-ecommerce.click_here#</a>)
   </if>
 
 <if @suppress_membership_p@ ne 1>
@@ -75,7 +75,7 @@
 	<td>@in_cart.price;noquote@</td>
 	<if @product_counter@ gt 1><td align="right">@in_cart.line_subtotal;noquote@</td>
 	</if>
-	<if @in_cart.has_discount_p@>
+	<if @in_cart.has_discount_p;literal@ true>
 	  <td nowrap>
 	    <form method=post action=offer-code-set>
 	      <input type="hidden" name="user_id" value="@user_id@" />
@@ -119,7 +119,7 @@
 	    <td align="right">@total_reg_shipping_price@</td><td>standard</td>
 	  </tr>
 
-	  <if @offer_express_shipping_p@ true>
+	  <if @offer_express_shipping_p;literal@ true>
 	    <tr>
 	      <if @product_counter@ gt 1>
 		<td colspan="4">
@@ -132,7 +132,7 @@
 	    </tr>
 	  </if>
 
-	  <if @offer_pickup_option_p@ true>
+	  <if @offer_pickup_option_p;literal@ true>
 	    <tr>
 	      <if @product_counter@ gt 1>
 		<td colspan="4">
@@ -177,6 +177,6 @@
 <if @donation_category_id@ not nil>
       <li> <a href="donations?user_id=@user_id@">#dotlrn-ecommerce.Make_a_donation#</a> </li>
 </if>
-      <li> <a href="<if @admin_p@ and @user_id@ ne @viewing_user_id@>../admin/process-purchase-course?user_id=@user_id@</if><else>../</else>">#dotlrn-ecommerce.lt_Purchase__another_Cou#</a> </li>
+      <li> <a href="<if @admin_p;literal@ true and @user_id@ ne @viewing_user_id@>../admin/process-purchase-course?user_id=@user_id@</if><else>../</else>">#dotlrn-ecommerce.lt_Purchase__another_Cou#</a> </li>
     </ul>
   </blockquote>
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/thank-you.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/thank-you.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/thank-you.adp	5 Jul 2005 23:57:38 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/thank-you.adp	15 Sep 2017 07:38:10 -0000	1.3
@@ -4,7 +4,7 @@
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <ul>
-    <if @admin_p@>
+    <if @admin_p;literal@ true>
       <li> <a
 	  href="../admin/process-purchase-course?user_id=@user_id@">#dotlrn-ecommerce.lt_Purchase_another_Cour#</a> #dotlrn-ecommerce.lt_for_the_current_purch#</li>
       <li> <a
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp	11 Aug 2005 01:03:09 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp	15 Sep 2017 07:38:10 -0000	1.5
@@ -5,8 +5,8 @@
     <h3>#dotlrn-ecommerce.The_section_is_full#</h3>
     <p />
     <ul>
-      <if @admin_p@>
-	<if @allow_override_p@>
+      <if @admin_p;literal@ true>
+	<if @allow_override_p;literal@ true>
 	  <li>#dotlrn-ecommerce.lt_You_may_continue_with# <a href="@shopping_cart_add_url;noquote@" class="button">#dotlrn-ecommerce.Continue#</a></li>
 	</if>
 	<li>#dotlrn-ecommerce.lt_Or_put_this_purchase_# <a href="@request_url;noquote@" class="button">#dotlrn-ecommerce.lt_Go_on_the_waiting_lis#</a></li>
Index: openacs-4/packages/dotlrn-ecommerce/www/manage/course-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/manage/course-info.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/manage/course-info.adp	2 Sep 2008 21:54:48 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/manage/course-info.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -4,7 +4,7 @@
 
 <table cellpadding=0 cellspacing=0>
 <if @index@ eq "yes">
-   <if @admin_p@ eq 1>
+   <if @admin_p;literal@ true>
    <div align="left">
         <a href="dt-admin/course-info?course_id=@course_id@&course_name=@name@&course_key=@course_key@&index=yes" title="#dotlrn-catalog.admin_this#"><img border=0 src=images/admin.gif></a> 
    </div>
@@ -57,7 +57,7 @@
     </td>
 </tr>
 </if>
-<if @asm@ not eq #dotlrn-catalog.not_associated# and @package_admin_p@>
+<if @asm@ not eq #dotlrn-catalog.not_associated# and @package_admin_p;literal@ true>
     <tr><td></td>
         <td><b>#dotlrn-catalog.asm#:</b></td><td><a href="@asm_url@">@asm@</a></td>
     </tr>
@@ -123,7 +123,7 @@
 <h3>Sections</h3>
 
 <listtemplate name=section_list></listtemplate>
-<if @package_admin_p@>
+<if @package_admin_p;literal@ true>
 <h3>Email Templates</h3>
 <a href="email-templates?community_id=@template_community_id@">Administer Email Templates</a>
 </if>
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/manage/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/manage/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/manage/index.adp	2 Sep 2008 21:54:48 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/manage/index.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -10,7 +10,7 @@
     <input type="submit" value="#dotlrn-catalog.search#" />
 </form>
 <br>
-<if @admin_p@><a class=button href="course-add-edit">#dotlrn-catalog.new_course#</a>
+<if @admin_p;literal@ true><a class=button href="course-add-edit">#dotlrn-catalog.new_course#</a>
 <br></if>
 <br>
 
Index: openacs-4/packages/dotlrn-ecommerce/www/manage/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/manage/one-section.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/manage/one-section.adp	2 Sep 2008 21:54:48 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/manage/one-section.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -34,7 +34,7 @@
 	</ul>
 <!-- <a href="ecommerce/index?section_id=@section_id@">#dotlrn-ecommerce.Order_Summary#</a> -->
 
-<if @assessment_id@ not nil and @package_admin_p@>
+<if @assessment_id@ not nil and @package_admin_p;literal@ true>
 #dotlrn-ecommerce.lt_Application_assessmen#<br />
 <a href="@assessment_select_url;noquote@" class="button">#dotlrn-ecommerce.Select_1#</a> 
 <a href="@assessment_edit_url;noquote@" class="button">#dotlrn-ecommerce.Edit_Application#</a> 
@@ -43,20 +43,20 @@
 <a href="@assessment_results_url;noquote@" class="button">Results Summary</a>
 </if>
 
-<if @show_public_pages_p@>
+<if @show_public_pages_p;literal@ true>
 <br /><br />
 <h2>#dotlrn-ecommerce.Public_Pages#</h2>
 <include src="/packages/file-storage/lib/folder-admin" folder_id="@section_folder_id@" base_url="@public_pages_url@">
 </if>
 
-<if @attendance_show_p@>
+<if @attendance_show_p;literal@ true>
 <br />
 <h2>#dotlrn-ecommerce.lt_Sessions_and_Attendan#</h2>
 <include src=/packages/attendance/lib/cp-attendance community_id=@community_id@ package_id=@community_package_id@>
 </if>
 
 
-<if @expensetracking_show_p@>
+<if @expensetracking_show_p;literal@ true>
 <h2>#dotlrn-ecommerce.Expense_Tracking#</h2>
 
 <include src=/packages/expense-tracking/lib/cp-expense-tracking community_id=@community_id@ package_id=@community_package_id@>
Index: openacs-4/packages/dotlrn-ecommerce/www/pages/fs-cms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/pages/fs-cms.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/pages/fs-cms.adp	26 Jul 2005 00:51:53 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/pages/fs-cms.adp	15 Sep 2017 07:38:10 -0000	1.2
@@ -1,7 +1,7 @@
 <master>
 <property name="title">@current_item.title;noquote@</property>
 <property name="blackbackground_p">@blackbackground_p@</property>
-<if @index_p@ true>
+<if @index_p;literal@ true>
 <multiple name="sections">
 <table border=0 cellpadding=0 cellspacing=0>
 <tr><td><div class=darkGreen>@sections.folder_label@</div></td></tr>
@@ -10,7 +10,7 @@
 </table>
 <ul class=greendot>
 <group column="folder_id">
-<li><if @sections.pdf_p@ eq 1><img src="/graphics/csm/acrobat.gif" border=1 style="border-color:#AAA" /></if>
+<li><if @sections.pdf_p;literal@ true><img src="/graphics/csm/acrobat.gif" border=1 style="border-color:#AAA" /></if>
       <a class=whitelink href="@sections.item_path@"><span style="font-size: 10pt">@sections.item_label@</span></a></li>
 </group>
 </ul>