Author: nigelj
Date: 2008-05-29 10:32:35 +0000 (Thu, 29 May 2008)
New Revision: 36
Modified:
trunk/elections/templates/about.html
trunk/elections/templates/ballot.html
trunk/elections/templates/confirm.html
trunk/elections/templates/results.html
Log:
Template changes, why have info links if they goto self, I think this is the cause of the
500 errors
Modified: trunk/elections/templates/about.html
===================================================================
--- trunk/elections/templates/about.html 2008-05-29 07:32:26 UTC (rev 35)
+++ trunk/elections/templates/about.html 2008-05-29 10:32:35 UTC (rev 36)
@@ -10,10 +10,10 @@
<!-- Also need to list eligable voting groups... -->
<h1>${election.name}</h1>
<p>${election.info}</p>
- <p><a href="${candidates[0].election.url}">[More
Information]</a></p>
+ <p py:if="election.url"><a
href="${election.url}">[More Information]</a></p>
<table border="1" cellpadding="1">
<tr py:for="candidate in candidates">
- <td>${candidate.name} <small><a
href="${candidate.url}">[info]</a></small></td>
+ <td>${candidate.name} <small py:if="candidate.url"><a
href="${candidate.url}">[info]</a></small></td>
</tr>
<!-- This link is okay, but one should appear if the election has public results
-->
<tr>
Modified: trunk/elections/templates/ballot.html
===================================================================
--- trunk/elections/templates/ballot.html 2008-05-29 07:32:26 UTC (rev 35)
+++ trunk/elections/templates/ballot.html 2008-05-29 10:32:35 UTC (rev 36)
@@ -9,11 +9,11 @@
<body>
<h1>${election.name}</h1>
<p>${election.info}</p>
- <p><a href="${election.url}">[More
Information]</a></p>
+ <p py:if="election.url"><a
href="${election.url}">[More Information]</a></p>
<form action="${tg.url('/vote/' + str(election.id))}"
method="post">
<table border="1" cellpadding="1">
<tr py:for="candidate in candidates">
- <td>${candidate.name} <small><a
href="${candidate.url}">[info]</a></small></td>
+ <td>${candidate.name} <small py:if="candidate.url"><a
href="${candidate.url}">[info]</a></small></td>
<td><input type="text" name="${candidate.id}"
value="" /></td>
</tr>
<tr>
Modified: trunk/elections/templates/confirm.html
===================================================================
--- trunk/elections/templates/confirm.html 2008-05-29 07:32:26 UTC (rev 35)
+++ trunk/elections/templates/confirm.html 2008-05-29 10:32:35 UTC (rev 36)
@@ -9,11 +9,11 @@
<body>
<h1>Confirm Vote in ${election.name}</h1>
<p>${election.info}</p>
- <p><a href="${election.url}">[More
Information]</a></p>
+ <p py:if="election.url"><a
href="${election.url}">[More Information]</a></p>
<form action="${tg.url('/vote/' + str(election.id))}"
method="post">
<table border="1" cellpadding="1">
<tr py:for="candidate in candidates">
- <td>${candidate.name} <small><a
href="${candidate.url}">[info]</a></small></td>
+ <td>${candidate.name} <small py:if="candidate.url"><a
href="${candidate.url}">[info]</a></small></td>
<td><input type="text" name="${candidate.id}"
value="${voteinfo[candidate.id]}" readonly="readonly"
/></td>
</tr>
<tr>
Modified: trunk/elections/templates/results.html
===================================================================
--- trunk/elections/templates/results.html 2008-05-29 07:32:26 UTC (rev 35)
+++ trunk/elections/templates/results.html 2008-05-29 10:32:35 UTC (rev 36)
@@ -9,10 +9,10 @@
<body>
<h1>${election.name} Results</h1>
<p>${election.info}</p>
- <p><a href="${election.url}">[More
Information]</a></p>
+ <p py:if="candidate.url"><a
href="${election.url}">[More Information]</a></p>
<table border="1" cellpadding="1">
<tr py:for="candcount in votecount">
- <td>${candcount.candidate.name} <small><a
href="${candcount.candidate.url}">[info]</a></small></td>
+ <td>${candcount.candidate.name} <small
py:if="candcount.candidate.url"><a
href="${candcount.candidate.url}">[info]</a></small></td>
<td>${candcount.novotes}</td>
</tr>
</table>
Show replies by date