Merge pull request #198 from openpolitics/candidates

Candidates

_layouts/homepage.html

@@ -8,6 +8,7 @@ <h1>The OpenPolitics Project</h1>
     <p>{{site.tagline}}</p>
     <p>
       <a href='manifesto' class='btn btn-primary btn-lg'>Help write the Manifesto</a>
+      <a href='candidates.html' class='btn btn-primary btn-lg'>Vote OpenPolitics in 2015</a>
     </p>
   </div>
 </div>

_layouts/main.html

@@ -42,7 +42,8 @@
               {% endfor %}
             </ul>
           </li>
-          <li><a href="http://votebot.openpolitics.org.uk">Open Votes</a></li>
+          <li><a href="http://votebot.openpolitics.org.uk">Votes</a></li>
+          <li><a href="{{site.baseurl}}candidates.html">Candidates</a></li>
           <li><a href="{{site.baseurl}}contributing.html">How to Contribute</a></li>
         </ul>
         {% if page.editable != false %}

candidates.html

@@ -0,0 +1,26 @@
+---
+title: Candidates
+layout: page
+published: true
+---
+
+This is a list of candidates who have announced that they will be standing in the 2015 elections, on the OpenPolitics Manifesto platform.
+
+<h2>UK Parliament</h2>
+
+<table class='table table-striped'>
+  <tr>
+    <th>Name</th>
+    <th>Constituency</th>
+    <th>Contact</th>
+  </tr>
+  <tr>
+    <td>James Smith</td>
+    <td>Horsham</td>
+    <td><a href='http://openhorsham.org.uk'>Open Horsham</a>, <a href='http://twitter.com/Floppy'>@Floppy</a></td>
+  </tr>
+</table>
+
+<h2>Standing</h2>
+
+If you want to stand on the OpenPolitics Manifesto in <em>your</em> area, <a href='https://github.com/openpolitics/manifesto/edit/gh-pages/candidates.html'>add yourself to the list here</a>!

contributing.md

@@ -32,7 +32,7 @@ All changes (aside from very minor ones) should remain open for discussion for a
 
 Any contributor can block a merge by including a 'thumbs-down' symbol, as long as they include constructive reasoning and alternative proposals. A change cannot be merged as long as there are blocks in place.
 
-Votes are counted by an automated script, which sets the GitHub build status on the pull request depending whether enough votes have been received. See the [Open Votes](http://votebot.openpolitics.org.uk) page for details and vote counts. Changes are merged by a [repository administrator](https://github.com/orgs/openpolitics/members) once consensus is reached.
+Votes are counted by an automated script, which sets the GitHub build status on the pull request depending whether enough votes have been received. See the [Votes](http://votebot.openpolitics.org.uk) page for details and vote counts. Changes are merged by a [repository administrator](https://github.com/orgs/openpolitics/members) once consensus is reached.
 
 Once an author has had a change merged in, they will become an existing contributor and thus can vote on new changes.