Skip to content
This repository has been archived by the owner on Jun 29, 2019. It is now read-only.

Commit

Permalink
Merge pull request #9 from Zockyzock/patch-3
Browse files Browse the repository at this point in the history
Update home.html
  • Loading branch information
HardlySoftly authored Nov 11, 2016
2 parents 8566ca2 + 545e4c6 commit 957b928
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions webapp/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
<td id="main">
<div id="intro">
<h1>Player Councilor Election & Balance Vote</h1>
<p>Hi everyone,</p>
<p>I want to apologise to everyone for the election of a Player Councilor having been delayed once again. I have decided to set up a vote myself now to avoid further delay and hope this is in the interest of everyone.</p>
<p>A massive thanks go to Softly, Downlord and Aulex that provided the technical infrastructure for the vote, without them this vote would not be possible without Visionik.</p>
<p>Additionally to the election of the Player Councilor, this also allows me to create a vote about the direction and structure of the balance team that you can also decide about now.</p>
<p>Both votes will be open until the 27th November.</p>
<p><a href="/login" style="color: orange; vcolor: red">You can vote here</a></p>
<p><br>-- Zock</p>
<p>Hello everyone -</p>
<p>There are two votes here. One for the Players Councilor, and one about how the Balance Team will be formed in the future.</p>
<p>Voting will be open until November 27th.</p>
<p>Many thanks to Softly, Aulex, Downlord, and brutus5000 for the new solution we’re using to enable these votes.</p>
<p><a href="/login" style="color: orange; vcolor: red">You can vote here</a></p>
</div>


Expand Down Expand Up @@ -50,7 +48,7 @@ <h2></h2>
<div id="aeont1maa" class="card">
<h3><img src="/static/img/balance.png">Balance Team Vote</h3>
<p>This vote will decide how the balance team will be formed in the future. We can let the balance team be elected by the community or continue the approach of the past years to let the balance councilor appoint the team based on who he considers suitable.</p>
<p>You can find Blackheart's post that asks for an elected team <a href="http://forums.faforever.com/viewtopic.php?f=67&t=13130">here</a>, and my and other responses <a href="http://forums.faforever.com/viewtopic.php?f=67&t=13130&start=40#p135382">in the same thread</a>.</p>
<p>You can find Blackheart's post that asks for an elected team <a href="http://forums.faforever.com/viewtopic.php?f=67&t=13130">here</a>, and Zock's and other responses <a href="http://forums.faforever.com/viewtopic.php?f=67&t=13130&start=40#p135382">in the same thread</a>.</p>
<p>An appointed team would continue the current approach to balancing, while an elected team would work as following:
<ul>
<li>The team will consist of five members elected by the community</li>
Expand Down

0 comments on commit 957b928

Please sign in to comment.