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

Resolve "Show Nominees at active elections"

Closes #3

See merge request t3o/election!2

Resources/Private/Templates/FeElection/Show.html

@@ -7,7 +7,39 @@
     <div>
         {election.description}
     </div>
-	<h2><f:translate key="view.fe.election.show.result"/></h2>
+    <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>
@@ -29,7 +61,9 @@
                             <f:if condition="{election.ElectionFinished}">
                                 <f:then>
                                     <f:if condition="{result.relativevotes}">
-									{result.relativevotes}% ({result.votes} <f:translate key="view.fe.election.show.votes"/>)
+                                        {result.relativevotes}% ({result.votes}
+                                        <f:translate key="view.fe.election.show.votes"/>
+                                        )
                                     </f:if>
                                 </f:then>
                                 <f:else>
@@ -41,4 +75,6 @@
                 </f:for>
                 </tbody>
             </table>
+        </f:else>
+    </f:if>
 </f:section>

ext_emconf.php

@@ -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',
 );