Index: openacs-4/packages/oct-election/www/election.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/oct-election/www/election.adp	3 Jul 2015 11:19:02 -0000	1.5
+++ openacs-4/packages/oct-election/www/election.adp	9 Jan 2018 10:35:15 -0000	1.6
@@ -9,12 +9,12 @@
 <p>Forum cutoff date: @pretty_vote_forum_cutoff@
 <p>Check CVS Commit History for the las @cvs_history_days@ days
 <p>Ballots: @ballot_count@
-<if @admin_p@>
+<if @admin_p;literal@ true>
 <p>  <a href="election-edit?election_id=@election_id@">Edit</a></p>
 </if>
 <h2>Candidates</h2>
 <listtemplate name="candidates"></listtemplate>
-<if @admin_p@ and @past_start_p@ ne 1>
+<if @admin_p;literal@ true and @past_start_p;literal@ false>
 <p>
   <form action="candidate-add">
     <input type="hidden" name="election_id" value="@election_id@"/>
@@ -24,7 +24,7 @@
 </p>
 </if>
 
-<if @valid_voter_p@>
+<if @valid_voter_p;literal@ true>
   <form action="vote">
     <input type="hidden" name="election_id" value="@election_id@"/>
     <input type="submit" value="Vote"/>
Index: openacs-4/packages/oct-election/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/index.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/oct-election/www/index.adp	3 Jul 2015 11:19:02 -0000	1.4
+++ openacs-4/packages/oct-election/www/index.adp	9 Jan 2018 10:35:15 -0000	1.5
@@ -3,6 +3,6 @@
   <property name="context">"@context;noquote@"</property>
 
 <listtemplate name="elections"></listtemplate>
-<if @admin_p@>
+<if @admin_p;literal@ true>
 <p><a href="election-edit">Add an Election</a></p>
 </if>
\ No newline at end of file