Commit c39b3a77 authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch '3-show-nominees-at-active-elections' into 'master'

Resolve "Show Nominees at active elections"

Closes #3

See merge request t3o/election!2
parents cfad0caa 11c0fbb0
<f:layout name="Frontend"/>
<f:section name="Main">
<h1>
{election.title}
</h1>
<div>
{election.description}
</div>
<h2><f:translate key="view.fe.election.show.result"/></h2>
<table class="table table-hover">
<thead>
<tr>
<th>
<f:translate key="view.fe.election.show.nominee"/>
</th>
<th>
<f:translate key="view.fe.election.show.votes"/>
</th>
</tr>
</thead>
<tbody>
<f:for each="{results}" as="result">
<tr>
<td>
{result.nominee.lastName}, {result.nominee.firstName} {result.nominee.MiddleName}
</td>
<td>
<f:if condition="{election.ElectionFinished}">
<f:then>
<f:if condition="{result.relativevotes}">
{result.relativevotes}% ({result.votes} <f:translate key="view.fe.election.show.votes"/>)
</f:if>
</f:then>
<f:else>
<f:translate key="view.fe.election.show.active"/>
</f:else>
</f:if>
</td>
</tr>
</f:for>
</tbody>
</table>
<h1>
{election.title}
</h1>
<div>
{election.description}
</div>
<f:if condition="!{election.ElectionFinished}">
<f:then>
<h2>Current Voting</h2>
<table class="table table-hover">
<thead>
<tr>
<th>
<f:translate key="view.fe.election.show.nominee"/>
</th>
<th>
Status
</th>
</tr>
</thead>
<tbody>
<f:for each="{election.nominees}" as="nominee">
<tr>
<td>
{nominee.lastName}, {nominee.firstName} {nominee.MiddleName}
</td>
<td>
<f:translate key="view.fe.election.show.active"/>
</td>
</tr>
</f:for>
</tbody>
</table>
</f:then>
<f:else>
<h2>
<f:translate key="view.fe.election.show.result"/>
</h2>
<table class="table table-hover">
<thead>
<tr>
<th>
<f:translate key="view.fe.election.show.nominee"/>
</th>
<th>
<f:translate key="view.fe.election.show.votes"/>
</th>
</tr>
</thead>
<tbody>
<f:for each="{results}" as="result">
<tr>
<td>
{result.nominee.lastName}, {result.nominee.firstName} {result.nominee.MiddleName}
</td>
<td>
<f:if condition="{election.ElectionFinished}">
<f:then>
<f:if condition="{result.relativevotes}">
{result.relativevotes}% ({result.votes}
<f:translate key="view.fe.election.show.votes"/>
)
</f:if>
</f:then>
<f:else>
<f:translate key="view.fe.election.show.active"/>
</f:else>
</f:if>
</td>
</tr>
</f:for>
</tbody>
</table>
</f:else>
</f:if>
</f:section>
......@@ -18,5 +18,5 @@ $EM_CONF[$_EXTKEY] = array(
'author' => 'Oliver Eglseder, Stefan Busemann, Christoph Pascher',
'author_email' => 'php@vxvr.de, stefan.busemann@in2code.de, c.pascher@browserwerk.de',
'author_company' => 'TYPO3 Association',
'version' => '0.0.2',
'version' => '0.0.3',
);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment